merge

src/Environment.cpp

@@ -10,26 +10,20 @@
 #endif
 namespace ZL {
 
+	
+
 int Environment::windowHeaderHeight = 0;
 int Environment::width = 0;
 int Environment::height = 0;
-float Environment::zoom = 36.f;
+float Environment::zoom = DEFAULT_ZOOM;
 
 
-bool Environment::leftPressed = false;
-bool Environment::rightPressed = false;
-bool Environment::upPressed = false;
-bool Environment::downPressed = false;
-
-bool Environment::settings_inverseVertical = false;
-
 SDL_Window* Environment::window = nullptr;
 
 bool Environment::showMouse = false;
 
 bool Environment::exitGameLoop = false;
 
-Eigen::Matrix3f Environment::shipMatrix = Eigen::Matrix3f::Identity();
 Eigen::Matrix3f Environment::inverseShipMatrix = Eigen::Matrix3f::Identity();
 
 
@@ -37,10 +31,7 @@ bool Environment::tapDownHold = false;
 Eigen::Vector2f Environment::tapDownStartPos = { 0, 0 };
 Eigen::Vector2f Environment::tapDownCurrentPos = { 0, 0 };
 
-Eigen::Vector3f Environment::shipPosition = {0,0,45000.f};
-
-float Environment::shipVelocity = 0.f;
-
+ClientState Environment::shipState;
 
 const float Environment::CONST_Z_NEAR = 5.f;
 const float Environment::CONST_Z_FAR = 5000.f;