X-Git-Url: https://git.localhorst.tv/?a=blobdiff_plain;f=src%2Finterface.hpp;h=9f43f4f6f662b6ba10b71d0706ebf5b202e9887b;hb=e53a0e2e711a7d8bd9b0ddacd1360aa14370643f;hp=7bfd7155cc3823e335fd7d0cf69964a2121fbfbc;hpb=f90ec88e6728ce865bcf892c810a36abd90d9001;p=blank.git

diff --git a/src/interface.hpp b/src/interface.hpp
index 7bfd715..9f43f4f 100644
--- a/src/interface.hpp
+++ b/src/interface.hpp
@@ -3,11 +3,14 @@
 
 #include "block.hpp"
 #include "controller.hpp"
+#include "geometry.hpp"
 #include "hud.hpp"
 #include "model.hpp"
 #include "shader.hpp"
+#include "timer.hpp"
 
 #include <SDL.h>
+#include <glm/glm.hpp>
 
 
 namespace blank {
@@ -30,20 +33,23 @@ public:
 
 	Interface(const Config &, World &);
 
-	void Handle(const SDL_KeyboardEvent &);
+	void HandlePress(const SDL_KeyboardEvent &);
+	void HandleRelease(const SDL_KeyboardEvent &);
 	void Handle(const SDL_MouseMotionEvent &);
-	void Handle(const SDL_MouseButtonEvent &);
+	void HandlePress(const SDL_MouseButtonEvent &);
+	void HandleRelease(const SDL_MouseButtonEvent &);
 	void Handle(const SDL_MouseWheelEvent &);
-	void Handle(const SDL_WindowEvent &);
+	void Handle(const SDL_WindowEvent &) noexcept;
 
 	void FaceBlock();
 	void TurnBlock();
 
 	void PickBlock();
 	void PlaceBlock();
-	void RemoveBlock();
+	void RemoveBlock() noexcept;
 
 	void PrintBlockInfo();
+	void PrintChunkInfo();
 	void PrintLightInfo();
 	void PrintSelectionInfo();
 	void Print(const Block &);
@@ -53,13 +59,17 @@ public:
 
 	void Update(int dt);
 
-	void Render(DirectionalLighting &);
+	void Render(DirectionalLighting &) noexcept;
+
+private:
+	void CheckAim();
 
 private:
 	World &world;
 	FPSController ctrl;
 	HUD hud;
 
+	Ray aim;
 	Chunk *aim_chunk;
 	int aim_block;
 	glm::vec3 aim_normal;
@@ -69,10 +79,13 @@ private:
 
 	Config config;
 
+	IntervalTimer place_timer;
+	IntervalTimer remove_timer;
+
 	Block remove;
 	Block selection;
 
-	bool front, back, left, right, up, down;
+	glm::tvec3<int> fwd, rev;
 
 };