minor optimizations in chunk

[blank.git] / src / interface.hpp

diff --git a/src/interface.hpp b/src/interface.hpp
index a4b7a92cef1cf10c1d9c79d30ab0ff72e9cf818f..9f43f4f6f662b6ba10b71d0706ebf5b202e9887b 100644 (file)
--- 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 {
@@ -18,33 +21,55 @@ class World;
 class Interface {
 
 public:
-       explicit Interface(World &);
+       struct Config {
+               float move_velocity = 0.005f;
+               float pitch_sensitivity = -0.0025f;
+               float yaw_sensitivity = -0.001f;
 
-       void Handle(const SDL_KeyboardEvent &);
+               bool keyboard_disabled = false;
+               bool mouse_disabled = false;
+               bool visual_disabled = false;
+       };
+
+       Interface(const Config &, World &);
+
+       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 &);
 
        void SelectNext();
        void SelectPrevious();
 
        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;
@@ -52,14 +77,15 @@ private:
        OutlineModel outline;
        glm::mat4 outline_transform;
 
-       float move_velocity;
-       float pitch_sensitivity;
-       float yaw_sensitivity;
+       Config config;
+
+       IntervalTimer place_timer;
+       IntervalTimer remove_timer;
 
        Block remove;
        Block selection;
 
-       bool front, back, left, right, up, down;
+       glm::tvec3<int> fwd, rev;
 
 };