X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fui%2FInterface.hpp;h=aa040a1ede174e63a20708bdb1208fe0118e4896;hb=b066e776622f96e906600a0c4a08de392bd03676;hp=72db5d13eb94fbea290c434e8eae260234925cb3;hpb=e1209ec25c4cc91e13889876106f56bd51aa96e2;p=blank.git

diff --git a/src/ui/Interface.hpp b/src/ui/Interface.hpp
index 72db5d1..aa040a1 100644
--- a/src/ui/Interface.hpp
+++ b/src/ui/Interface.hpp
@@ -1,50 +1,24 @@
 #ifndef BLANK_UI_INTERFACE_HPP_
 #define BLANK_UI_INTERFACE_HPP_
 
-#include "FixedText.hpp"
-#include "HUD.hpp"
-#include "MessageBox.hpp"
-#include "../app/FPSController.hpp"
-#include "../app/IntervalTimer.hpp"
-#include "../audio/Sound.hpp"
-#include "../model/geometry.hpp"
-#include "../model/OutlineModel.hpp"
-#include "../world/Block.hpp"
-#include "../world/EntityCollision.hpp"
-#include "../world/Player.hpp"
-#include "../world/WorldCollision.hpp"
+#include "../app/Config.hpp"
 
-#include <string>
-#include <glm/glm.hpp>
 #include <SDL.h>
+#include <glm/glm.hpp>
 
 
 namespace blank {
 
-class Entity;
-class Environment;
-class Viewport;
-class World;
+struct ClientController;
+class Keymap;
+struct PlayerController;
 
 class Interface {
 
 public:
-	struct Config {
-		std::string player_name = "default";
-
-		float move_velocity = 0.005f;
-		float pitch_sensitivity = -0.0025f;
-		float yaw_sensitivity = -0.001f;
+	Interface(Config &, const Keymap &, PlayerController &, ClientController &);
 
-		bool keyboard_disabled = false;
-		bool mouse_disabled = false;
-		bool audio_disabled = false;
-		bool visual_disabled = false;
-	};
-
-	Interface(const Config &, Environment &, World &, const Player &);
-
-	const Player &GetPlayer() noexcept { return player; }
+	void SetInventorySlots(int num) { num_slots = num; }
 
 	void HandlePress(const SDL_KeyboardEvent &);
 	void HandleRelease(const SDL_KeyboardEvent &);
@@ -53,79 +27,20 @@ public:
 	void HandleRelease(const SDL_MouseButtonEvent &);
 	void Handle(const SDL_MouseWheelEvent &);
 
-	void FaceBlock();
-	void TurnBlock();
-
-	void ToggleCollision();
-
-	void PickBlock();
-	void PlaceBlock();
-	void RemoveBlock() noexcept;
-
-	void SelectNext();
-	void SelectPrevious();
-
-	void ToggleAudio();
-	void ToggleVisual();
-
-	void ToggleDebug();
-	void UpdateCounter();
-	void UpdatePosition();
-	void UpdateOrientation();
-	void UpdateBlockInfo();
-	void UpdateEntityInfo();
-
-	void PostMessage(const char *);
-	void PostMessage(const std::string &msg) {
-		PostMessage(msg.c_str());
-	}
-
-	void Update(int dt);
-
-	void Render(Viewport &) noexcept;
-
 private:
-	void CheckAim();
-	void UpdateOutline();
+	void UpdateMovement();
+	void InvAbs(int slot);
+	void InvRel(int delta);
 
 private:
-	Environment &env;
-	World &world;
-	Player player;
-	FPSController ctrl;
-	HUD hud;
-
-	Ray aim;
-	WorldCollision aim_world;
-	EntityCollision aim_entity;
-
-	OutlineModel outline;
-	glm::mat4 outline_transform;
-
-	FixedText counter_text;
-	FixedText position_text;
-	FixedText orientation_text;
-	FixedText block_text;
-	FixedText entity_text;
-	Block last_block;
-	Entity *last_entity;
-	MessageBox messages;
-	IntervalTimer msg_timer;
-
-	Config config;
-
-	IntervalTimer place_timer;
-	IntervalTimer remove_timer;
-
-	Block remove;
-	Block selection;
-
-	Sound place_sound;
-	Sound remove_sound;
+	Config &config;
+	const Keymap &keymap;
+	PlayerController &player_ctrl;
+	ClientController &client_ctrl;
 
 	glm::ivec3 fwd, rev;
-
-	bool debug;
+	int slot;
+	int num_slots;
 
 };