remove move branching from interface

[blank.git] / src / interface.hpp

diff --git a/src/interface.hpp b/src/interface.hpp
index ed417086504a8f8b86d97f648abe4349d3692e83..1f4bb9034baf8028a2bb0dd4386ea6165d40d92b 100644 (file)
--- a/src/interface.hpp
+++ b/src/interface.hpp
@@ -8,6 +8,7 @@
 #include "shader.hpp"
 
 #include <SDL.h>
+#include <glm/glm.hpp>
 
 
 namespace blank {
@@ -18,7 +19,17 @@ 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;
+
+               bool keyboard_disabled = false;
+               bool mouse_disabled = false;
+               bool visual_disabled = false;
+       };
+
+       Interface(const Config &, World &);
 
        void Handle(const SDL_KeyboardEvent &);
        void Handle(const SDL_MouseMotionEvent &);
@@ -26,10 +37,19 @@ public:
        void Handle(const SDL_MouseWheelEvent &);
        void Handle(const SDL_WindowEvent &);
 
+       void FaceBlock();
+       void TurnBlock();
+
        void PickBlock();
        void PlaceBlock();
        void RemoveBlock();
 
+       void PrintBlockInfo();
+       void PrintChunkInfo();
+       void PrintLightInfo();
+       void PrintSelectionInfo();
+       void Print(const Block &);
+
        void SelectNext();
        void SelectPrevious();
 
@@ -49,14 +69,12 @@ private:
        OutlineModel outline;
        glm::mat4 outline_transform;
 
-       float move_velocity;
-       float pitch_sensitivity;
-       float yaw_sensitivity;
+       Config config;
 
        Block remove;
        Block selection;
 
-       bool front, back, left, right, up, down;
+       glm::tvec3<int> fwd, rev;
 
 };