X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fui%2FInterface.hpp;h=72db5d13eb94fbea290c434e8eae260234925cb3;hb=38a4cffc0b6aa58e49d24c06aad7bee14cb6515d;hp=0c140fb88ff40ad18357cd3b42cfce17fbfda5e2;hpb=b7d09e1e35ef90282c97509e0020b20db3c7ea9f;p=blank.git

diff --git a/src/ui/Interface.hpp b/src/ui/Interface.hpp
index 0c140fb..72db5d1 100644
--- a/src/ui/Interface.hpp
+++ b/src/ui/Interface.hpp
@@ -1,37 +1,50 @@
 #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 <SDL.h>
+#include <string>
 #include <glm/glm.hpp>
+#include <SDL.h>
 
 
 namespace blank {
 
-class Chunk;
-class DirectionalLighting;
+class Entity;
+class Environment;
+class Viewport;
 class World;
 
 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;
 
 		bool keyboard_disabled = false;
 		bool mouse_disabled = false;
+		bool audio_disabled = false;
 		bool visual_disabled = false;
 	};
 
-	Interface(const Config &, World &);
+	Interface(const Config &, Environment &, World &, const Player &);
+
+	const Player &GetPlayer() noexcept { return player; }
 
 	void HandlePress(const SDL_KeyboardEvent &);
 	void HandleRelease(const SDL_KeyboardEvent &);
@@ -39,44 +52,66 @@ public:
 	void HandlePress(const SDL_MouseButtonEvent &);
 	void HandleRelease(const SDL_MouseButtonEvent &);
 	void Handle(const SDL_MouseWheelEvent &);
-	void Handle(const SDL_WindowEvent &) noexcept;
 
 	void FaceBlock();
 	void TurnBlock();
 
+	void ToggleCollision();
+
 	void PickBlock();
 	void PlaceBlock();
 	void RemoveBlock() noexcept;
 
-	void PrintBlockInfo();
-	void PrintChunkInfo();
-	void PrintLightInfo();
-	void PrintSelectionInfo();
-	void Print(const Block &);
-
 	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(DirectionalLighting &) noexcept;
+	void Render(Viewport &) noexcept;
 
 private:
 	void CheckAim();
+	void UpdateOutline();
 
 private:
+	Environment &env;
 	World &world;
+	Player player;
 	FPSController ctrl;
 	HUD hud;
 
 	Ray aim;
-	Chunk *aim_chunk;
-	int aim_block;
-	glm::vec3 aim_normal;
+	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;
@@ -85,7 +120,12 @@ private:
 	Block remove;
 	Block selection;
 
-	glm::tvec3<int> fwd, rev;
+	Sound place_sound;
+	Sound remove_sound;
+
+	glm::ivec3 fwd, rev;
+
+	bool debug;
 
 };