Minor refactoring

src/Game.h

@@ -12,7 +12,7 @@
 
 namespace ZL {
 
-
+	
 	struct BoxCoords
 	{
 		Vector3f pos;
@@ -29,9 +29,11 @@ namespace ZL {
 		void update();
 		void render();
 
-
 		bool shouldExit() const { return Environment::exitGameLoop; }
 
+		Renderer renderer;
+		TaskManager taskManager;
+		MainThreadHandler mainThreadHandler;
 	private:
 		void processTickCount();
 		void drawScene();
@@ -48,42 +50,16 @@ namespace ZL {
 
 		SDL_Window* window;
 		SDL_GLContext glContext;
-		Renderer renderer;
+		
+		
 
 		size_t newTickCount;
 		size_t lastTickCount;
 
-		//std::shared_ptr<Texture> rockTexture;
-
-
-
 		std::vector<BoxCoords> boxCoordsArr;
 		std::vector<VertexRenderStruct> boxRenderArr;
 
 
-		//std::shared_ptr<Texture> buttonTexture;
-		//VertexRenderStruct button;
-
-		//std::shared_ptr<Texture> musicVolumeBarTexture;
-		//VertexRenderStruct musicVolumeBar;
-
-		//std::shared_ptr<Texture> musicVolumeBarButtonTexture;
-		//VertexRenderStruct musicVolumeBarButton;
-
-
-		//bool isDraggingVolume = false;
-		/*
-		float velocitySlider = 0.0f;
-		float volumeBarMinX = 1190.0f;
-		float volumeBarMaxX = 1200.0f;
-		float volumeBarMinY = 100.0f;
-		float volumeBarMaxY = 600.0f;*/
-		//float musicVolumeBarButtonButtonCenterX = 1195.0f;
-		//float musicVolumeBarButtonButtonRadius = 25.0f;
-		//void UpdateVolumeFromMouse(int mouseX, int mouseY);
-		//void UpdateVolumeKnob();
-
-
 		static const size_t CONST_TIMER_INTERVAL = 10;
 		static const size_t CONST_MAX_TIME_INTERVAL = 1000;
 
@@ -111,8 +87,7 @@ namespace ZL {
 		int maxProjectiles = 32;
 		std::vector<Vector3f> shipLocalEmissionPoints;
 
-		TaskManager taskManager;
-
+		
 		bool shipAlive = true;
 		bool gameOver = false;
 		std::vector<bool> boxAlive;