Merge branch 'main' into spark

src/Game.cpp

@@ -23,6 +23,8 @@ namespace ZL
 
 	static bool g_exitBgAnimating = false;
 
+	float x = 0;
+
 	Eigen::Quaternionf generateRandomQuaternion(std::mt19937& gen)
 	{
 
@@ -107,6 +109,7 @@ namespace ZL
 		, glContext(nullptr)
 		, newTickCount(0)
 		, lastTickCount(0)
+		, planetObject(renderer, taskManager, mainThreadHandler)
 	{
 		projectiles.reserve(maxProjectiles);
 		for (int i = 0; i < maxProjectiles; ++i) {
@@ -307,17 +310,24 @@ namespace ZL
 
 
 		//Load texture
-		spaceshipTexture = std::make_unique<Texture>(CreateTextureDataFromPng("resources/DefaultMaterial_BaseColor_shine.png", CONST_ZIP_FILE));
-		spaceshipBase = LoadFromTextFile02("resources/spaceship006.txt", CONST_ZIP_FILE);
-		spaceshipBase.RotateByMatrix(Eigen::Quaternionf(Eigen::AngleAxisf(M_PI / 2.0, Eigen::Vector3f::UnitY())).toRotationMatrix());// QuatFromRotateAroundY(M_PI / 2.0).toRotationMatrix());
 
+		//spaceshipTexture = std::make_unique<Texture>(CreateTextureDataFromPng("resources/DefaultMaterial_BaseColor_shine.png", CONST_ZIP_FILE));
+		//spaceshipBase = LoadFromTextFile02("resources/spaceship006.txt", CONST_ZIP_FILE);
+		//spaceshipBase.RotateByMatrix(Eigen::Quaternionf(Eigen::AngleAxisf(M_PI / 2.0, Eigen::Vector3f::UnitY())).toRotationMatrix());// QuatFromRotateAroundY(M_PI / 2.0).toRotationMatrix());
+		
 		//spaceshipTexture = std::make_unique<Texture>(CreateTextureDataFromPng("./resources/cap_D.png", CONST_ZIP_FILE));
 		//spaceshipBase = LoadFromTextFile02("./resources/spaceship006x.txt", CONST_ZIP_FILE);
 		//spaceshipBase.RotateByMatrix(Eigen::Quaternionf(Eigen::AngleAxisf(-M_PI / 2.0, Eigen::Vector3f::UnitY())).toRotationMatrix());// QuatFromRotateAroundY(M_PI / 2.0).toRotationMatrix());
 
+		spaceshipTexture = std::make_unique<Texture>(CreateTextureDataFromPng("resources/MainCharacter_Base_color_sRGB.png", CONST_ZIP_FILE));
+		spaceshipBase = LoadFromTextFile02("resources/spaceshipnew001.txt", CONST_ZIP_FILE);
+		spaceshipBase.RotateByMatrix(Eigen::Quaternionf(Eigen::AngleAxisf(M_PI, Eigen::Vector3f::UnitY())).toRotationMatrix());// QuatFromRotateAroundY(M_PI / 2.0).toRotationMatrix());
 
+		spaceshipBase.Move(Vector3f{ 1.2, 0, -5 });
 		//spaceshipBase.Move(Vector3f{ -0.52998, -13, 0 });
 		//spaceshipBase.Move(Vector3f{ -0.52998, -10, 10 });
+		//spaceshipBase.Move(Vector3f{ -0.52998, 0, 10 });
+
 
 		spaceship.AssignFrom(spaceshipBase);
 		spaceship.RefreshVBO();
@@ -361,8 +371,6 @@ namespace ZL
 		std::cout << "Init step 6 " << std::endl;
 		planetObject.init();
 
-		planetObject.taskManager = &taskManager;
-
 		std::cout << "Init step 7 " << std::endl;
 		//rockTexture = std::make_unique<Texture>(CreateTextureDataFromPng("./resources/rock.png", CONST_ZIP_FILE));
 
@@ -455,8 +463,8 @@ namespace ZL
 
 		renderer.LoadIdentity();
 		renderer.TranslateMatrix({ 0,0, -1.0f * Environment::zoom });
+		renderer.TranslateMatrix({ 0, -6.f, 0 }); //Ship camera offset
 
-		renderer.TranslateMatrix({ 0, -Environment::zoom * 0.03f, 0 });
 		if (shipAlive) {
 			glBindTexture(GL_TEXTURE_2D, spaceshipTexture->getTexID());
 			renderer.DrawVertexRenderStruct(spaceship);
@@ -471,7 +479,10 @@ namespace ZL
 		}
 
 		if (shipAlive) {
+			renderer.PushMatrix();
+			renderer.TranslateMatrix({ 0, 0, 16 });
 			sparkEmitter.draw(renderer, Environment::zoom, Environment::width, Environment::height);
+			renderer.PopMatrix();
 			projectileEmitter.draw(renderer, Environment::zoom, Environment::width, Environment::height);
 		}
 
@@ -999,15 +1010,18 @@ namespace ZL
 				if (event.key.keysym.sym == SDLK_o)
 				{
 					Environment::shipVelocity += 50.f;
+					//x = x + 2.0;
 				}
 				if (event.key.keysym.sym == SDLK_l)
 				{
 					Environment::shipVelocity -= 50.f;
+					//x = x - 2.0;
 				}
 			}
 #endif
 		}
 		render();
+		mainThreadHandler.processMainThreadTasks();
 	}
 
 	void Game::handleDown(int mx, int my)