merge

src/Game.h

@@ -7,6 +7,8 @@
 #include "planet/PlanetObject.h"
 #include "UiManager.h"
 #include "Projectile.h"
+#include "utils/TaskManager.h"
+#include <queue>
 
 namespace ZL {
 
@@ -40,6 +42,10 @@ namespace ZL {
 
 		void fireProjectiles();
 
+		void handleDown(int mx, int my);
+		void handleUp(int mx, int my);
+		void handleMotion(int mx, int my);
+
 		SDL_Window* window;
 		SDL_GLContext glContext;
 		Renderer renderer;
@@ -66,12 +72,12 @@ namespace ZL {
 
 
 		//bool isDraggingVolume = false;
-
-		float musicVolume = 0.0f;
+		/*
+		float velocitySlider = 0.0f;
 		float volumeBarMinX = 1190.0f;
 		float volumeBarMaxX = 1200.0f;
 		float volumeBarMinY = 100.0f;
-		float volumeBarMaxY = 600.0f;
+		float volumeBarMaxY = 600.0f;*/
 		//float musicVolumeBarButtonButtonCenterX = 1195.0f;
 		//float musicVolumeBarButtonButtonRadius = 25.0f;
 		//void UpdateVolumeFromMouse(int mouseX, int mouseY);
@@ -103,6 +109,11 @@ namespace ZL {
 		uint64_t lastProjectileFireTime = 0;
 		int maxProjectiles = 32;
 		std::vector<Vector3f> shipLocalEmissionPoints;
+
+		TaskManager taskManager;
+
+
+
 	};