merge

src/Environment.h

@@ -6,9 +6,12 @@
 #include "render/OpenGlExtensions.h"
 #endif
 #include <Eigen/Dense>
+#include "network/ClientState.h"
 
 namespace ZL {
 
+    constexpr float DEFAULT_ZOOM = 36.f;
+
 class Environment {
 public:
     static int windowHeaderHeight;
@@ -16,14 +19,6 @@ public:
     static int height;
     static float zoom;
 
-    static bool leftPressed;
-    static bool rightPressed;
-    static bool upPressed;
-    static bool downPressed;
-
-    static bool settings_inverseVertical;
-
-    static Eigen::Matrix3f shipMatrix;
     static Eigen::Matrix3f inverseShipMatrix;
 
     static SDL_Window* window;
@@ -31,13 +26,11 @@ public:
     static bool showMouse;
     static bool exitGameLoop;
 
-
     static bool tapDownHold;
     static Eigen::Vector2f tapDownStartPos;
     static Eigen::Vector2f tapDownCurrentPos;
 
-    static Eigen::Vector3f shipPosition;
-    static float shipVelocity;
+    static ClientState shipState;
 
     static const float CONST_Z_NEAR;
     static const float CONST_Z_FAR;