Merge, adding ship vertical shift

resources/config/explosion_config.json

@@ -0,0 +1,15 @@
+{
+    "emissionPoints": [
+      { "position": [0.0, 0.0, 0.0] }
+    ],
+    "texture": "resources/spark_white.png",
+    "speedRange": [10.0, 30.0],
+    "zSpeedRange": [-1.0, 1.0],
+    "scaleRange": [0.5, 1.0],
+    "lifeTimeRange": [200.0, 800.0],
+    "emissionRate": 50.0,
+    "maxParticles": 5,
+    "particleSize": 0.5,
+    "biasX": 0.1,
+    "shaderProgramName": "default"
+  }

resources/config/game_over.json

@@ -0,0 +1,55 @@
+{
+  "root": {
+    "type": "LinearLayout",
+    "orientation": "vertical",
+    "align": "center",
+    "x": 0,
+    "y": 0,
+    "width": 1920,
+    "height": 1080,
+    "background": {
+      "color": [0, 0, 0, 0.7]
+    },
+    "children": [
+      {
+        "type": "Button",
+        "name": "gameOverText",
+        "x": 350,
+        "y": 400,
+        "width": 600,
+        "height": 150,
+        "textures": {
+          "normal": "resources/gameover.png",
+          "hover": "resources/gameover.png",
+          "pressed": "resources/gameover.png"
+        }
+      },
+      {
+        "type": "Button",
+        "name": "restartButton",
+        "x": 350,
+        "y": 300,
+        "width": 300,
+        "height": 80,
+        "textures": {
+          "normal": "resources/shoot_normal.png",
+          "hover": "resources/shoot_normal.png",
+          "pressed": "resources/shoot_normal.png"
+        }
+      },
+      {
+        "type": "Button",
+        "name": "gameOverExitButton",
+        "x": 650,
+        "y": 300,
+        "width": 300,
+        "height": 80,
+        "textures": {
+          "normal": "resources/sand2.png",
+          "hover": "resources/sand2.png",
+          "pressed": "resources/sand2.png"
+        }
+      }
+    ]
+  }
+}

resources/config/ui.json

@@ -27,7 +27,7 @@
 				{
 				  "type": "Button",
 				  "name": "playButton",
-				  "x": 100,
+				  "x": -1000,
 				  "y": 500,
 				  "width": 200,
 				  "height": 50,
@@ -56,7 +56,7 @@
 				{
 				  "type": "Button",
 				  "name": "settingsButton",
-				  "x": 100,
+				  "x": -1000,
 				  "y": 400,
 				  "width": 200,
 				  "height": 50,
@@ -89,7 +89,7 @@
 				{
 				  "type": "Button",
 				  "name": "exitButton",
-				  "x": 100,
+				  "x": -1000,
 				  "y": 300,
 				  "width": 200,
 				  "height": 50,

src/Environment.cpp

@@ -13,7 +13,8 @@ namespace ZL {
 int Environment::windowHeaderHeight = 0;
 int Environment::width = 0;
 int Environment::height = 0;
-float Environment::zoom = 18.f;
+float Environment::zoom = 36.f;
+
 
 bool Environment::leftPressed = false;
 bool Environment::rightPressed = false;

src/Game.cpp

@@ -23,6 +23,8 @@ namespace ZL
 
 	static bool g_exitBgAnimating = false;
 
+	float x = 0;
+
 	Eigen::Quaternionf generateRandomQuaternion(std::mt19937& gen)
 	{
 
@@ -204,6 +206,8 @@ namespace ZL
 
 		bool cfgLoaded = sparkEmitter.loadFromJsonFile("resources/config/spark_config.json", renderer, CONST_ZIP_FILE);
 		bool projCfgLoaded = projectileEmitter.loadFromJsonFile("resources/config/spark_projectile_config.json", renderer, CONST_ZIP_FILE);
+		bool explosionCfgLoaded = explosionEmitter.loadFromJsonFile("resources/config/explosion_config.json", renderer, CONST_ZIP_FILE);
+		explosionEmitter.setEmissionPoints(std::vector<Vector3f>());
 		projectileEmitter.setEmissionPoints(std::vector<Vector3f>());
 		uiManager.loadFromFile("resources/config/ui.json", renderer, CONST_ZIP_FILE);
 
@@ -305,17 +309,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();
@@ -342,6 +353,7 @@ namespace ZL
 			boxRenderArr[i].RefreshVBO();
 		}
 
+		boxAlive.resize(boxCoordsArr.size(), true);
 
 		std::cout << "Init step 4 " << std::endl;
 
@@ -452,21 +464,33 @@ 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 });
-		glBindTexture(GL_TEXTURE_2D, spaceshipTexture->getTexID());
-		renderer.DrawVertexRenderStruct(spaceship);
+		if (shipAlive) {
+			glBindTexture(GL_TEXTURE_2D, spaceshipTexture->getTexID());
+			renderer.DrawVertexRenderStruct(spaceship);
+		}
 		glEnable(GL_BLEND);
 		glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+
 		for (const auto& p : projectiles) {
 			if (p && p->isActive()) {
 				p->draw(renderer);
 			}
 		}
 
+		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);
+		}
+
+		if (showExplosion) {
+			explosionEmitter.draw(renderer, Environment::zoom, Environment::width, Environment::height);
+		}
 
-		sparkEmitter.draw(renderer, Environment::zoom, Environment::width, Environment::height);
-		projectileEmitter.draw(renderer, Environment::zoom, Environment::width, Environment::height);
 		glDisable(GL_BLEND);
 		renderer.PopMatrix();
 		renderer.PopProjectionMatrix();
@@ -496,6 +520,7 @@ namespace ZL
 
 		for (int i = 0; i < boxCoordsArr.size(); i++)
 		{
+			if (!boxAlive[i]) continue;
 			renderer.PushMatrix();
 
 			renderer.LoadIdentity();
@@ -670,6 +695,76 @@ namespace ZL
 			sparkEmitter.update(static_cast<float>(delta));
 			projectileEmitter.update(static_cast<float>(delta));
 
+			explosionEmitter.update(static_cast<float>(delta));
+			if (shipAlive) {
+				float distToSurface = planetObject.distanceToPlanetSurface(Environment::shipPosition);
+				if (distToSurface <= 0.0f) {
+					Vector3f localForward = { 0,0,-1 };
+					Vector3f worldForward = (Environment::shipMatrix * localForward).normalized();
+					const float backDistance = 400.0f;
+					Environment::shipPosition = Environment::shipPosition - worldForward * backDistance;
+
+					shipAlive = false;
+					gameOver = true;
+					Environment::shipVelocity = 0.0f;
+					showExplosion = true;
+
+					explosionEmitter.setUseWorldSpace(false);
+					explosionEmitter.setEmissionPoints(std::vector<Vector3f>{ Vector3f{ 0.0f,0.0f,0.0f } });
+					explosionEmitter.emit();
+
+					std::cerr << "GAME OVER: collision with planet (moved back and exploded)\n";
+
+					if (!uiGameOverShown) {
+						if (uiManager.pushMenuFromFile("resources/config/game_over.json", this->renderer, CONST_ZIP_FILE)) {
+							uiManager.setButtonCallback("restartButton", [this](const std::string& name) {
+								this->shipAlive = true;
+								this->gameOver = false;
+								this->uiGameOverShown = false;
+								this->showExplosion = false;
+								this->explosionEmitter.setEmissionPoints(std::vector<Vector3f>());
+								Environment::shipPosition = Vector3f{ 0, 0, 45000.f };
+								Environment::shipVelocity = 0.0f;
+								uiManager.popMenu();
+								std::cerr << "Game restarted\n";
+								});
+
+							uiManager.setButtonCallback("gameOverExitButton", [this](const std::string& name) {
+								Environment::exitGameLoop = true;
+								});
+
+							uiGameOverShown = true;
+						}
+						else {
+							std::cerr << "Failed to load game_over.json\n";
+						}
+					}
+				}
+			}
+
+			for (int i = 0; i < boxCoordsArr.size(); ++i) {
+				if (!boxAlive[i]) continue;
+				Vector3f boxWorld = boxCoordsArr[i].pos + Vector3f{ 0.0f, 0.0f, 45000.0f };
+				Vector3f diff = Environment::shipPosition - boxWorld;
+				float thresh = shipCollisionRadius + boxCollisionRadius;
+				if (diff.squaredNorm() <= thresh * thresh) {
+					boxAlive[i] = false;
+
+					boxRenderArr[i].data.PositionData.clear();
+					boxRenderArr[i].vao.reset();
+					boxRenderArr[i].positionVBO.reset();
+					boxRenderArr[i].texCoordVBO.reset();
+					showExplosion = true;
+
+					Vector3f rel = boxWorld - Environment::shipPosition;
+					Vector3f camPos = Environment::inverseShipMatrix * rel;
+					explosionEmitter.setUseWorldSpace(true);
+					explosionEmitter.setEmissionPoints(std::vector<Vector3f>{ boxWorld });
+					explosionEmitter.emit();
+
+					std::cerr << "Box destroyed at index " << i << std::endl;
+				}
+			}
 			uiManager.update(static_cast<float>(delta));
 			//#endif
 			lastTickCount = newTickCount;
@@ -815,10 +910,12 @@ 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

src/Game.h

@@ -100,6 +100,7 @@ namespace ZL {
 
 		SparkEmitter sparkEmitter;
 		SparkEmitter projectileEmitter;
+		SparkEmitter explosionEmitter;
 		PlanetObject planetObject;
 		UiManager uiManager;
 
@@ -112,7 +113,13 @@ namespace ZL {
 
 		TaskManager taskManager;
 
-
+		bool shipAlive = true;
+		bool gameOver = false;
+		std::vector<bool> boxAlive;
+		float shipCollisionRadius = 3.5f;
+		float boxCollisionRadius = 2.0f;
+		bool uiGameOverShown = false;
+		bool showExplosion = false;
 
 	};
 

src/SparkEmitter.cpp

@@ -13,10 +13,10 @@ namespace ZL {
 
 	using json = nlohmann::json;
 
-
 	SparkEmitter::SparkEmitter()
 		: emissionRate(100.0f), isActive(true), drawDataDirty(true), maxParticles(200),
-		shaderProgramName("default"), particleSize(0.04f), biasX(0.3f), configured(false) {
+		shaderProgramName("default"), particleSize(0.04f), biasX(0.3f), configured(false),
+		useWorldSpace(false) {
 		particles.resize(maxParticles);
 		drawPositions.reserve(maxParticles * 6);
 		drawTexCoords.reserve(maxParticles * 6);
@@ -28,7 +28,8 @@ namespace ZL {
 	SparkEmitter::SparkEmitter(const std::vector<Vector3f>& positions, float rate)
 		: emissionPoints(positions), emissionRate(rate), isActive(true),
 		drawDataDirty(true), maxParticles(positions.size() * 100),
-		shaderProgramName("default"), particleSize(0.04f), biasX(0.3f), configured(false) {
+		shaderProgramName("default"), particleSize(0.04f), biasX(0.3f), configured(false),
+		useWorldSpace(false) {
 		particles.resize(maxParticles);
 		drawPositions.reserve(maxParticles * 6);
 		drawTexCoords.reserve(maxParticles * 6);
@@ -42,7 +43,8 @@ namespace ZL {
 		float rate)
 		: emissionPoints(positions), texture(tex), emissionRate(rate),
 		isActive(true), drawDataDirty(true), maxParticles(positions.size() * 100),
-		shaderProgramName("default"), particleSize(0.04f), biasX(0.3f), configured(false) {
+		shaderProgramName("default"), particleSize(0.04f), biasX(0.3f), configured(false),
+		useWorldSpace(false) {
 		particles.resize(maxParticles);
 		drawPositions.reserve(maxParticles * 6);
 		drawTexCoords.reserve(maxParticles * 6);
@@ -71,7 +73,15 @@ namespace ZL {
 
 		for (const auto& particle : particles) {
 			if (particle.active) {
-				sortedParticles.push_back({ &particle, particle.position(2) });
+				Vector3f posCam;
+				if (useWorldSpace) {
+					Vector3f rel = particle.position - Environment::shipPosition;
+					posCam = Environment::inverseShipMatrix * rel;
+				}
+				else {
+					posCam = particle.position;
+				}
+				sortedParticles.push_back({ &particle, posCam(2) });
 			}
 		}
 
@@ -82,25 +92,33 @@ namespace ZL {
 
 		for (const auto& [particlePtr, depth] : sortedParticles) {
 			const auto& particle = *particlePtr;
-			Vector3f pos = particle.position;
+			Vector3f posCam;
+			if (useWorldSpace) {
+				Vector3f rel = particle.position - Environment::shipPosition;
+				posCam = Environment::inverseShipMatrix * rel;
+			}
+			else {
+				posCam = particle.position;
+			}
+
 			float size = particleSize * particle.scale;
 
-			drawPositions.push_back({ pos(0) - size, pos(1) - size, pos(2) });
+			drawPositions.push_back({ posCam(0) - size, posCam(1) - size, posCam(2) });
 			drawTexCoords.push_back({ 0.0f, 0.0f });
 
-			drawPositions.push_back({ pos(0) - size, pos(1) + size, pos(2) });
+			drawPositions.push_back({ posCam(0) - size, posCam(1) + size, posCam(2) });
 			drawTexCoords.push_back({ 0.0f, 1.0f });
 
-			drawPositions.push_back({ pos(0) + size, pos(1) + size, pos(2) });
+			drawPositions.push_back({ posCam(0) + size, posCam(1) + size, posCam(2) });
 			drawTexCoords.push_back({ 1.0f, 1.0f });
 
-			drawPositions.push_back({ pos(0) - size, pos(1) - size, pos(2) });
+			drawPositions.push_back({ posCam(0) - size, posCam(1) - size, posCam(2) });
 			drawTexCoords.push_back({ 0.0f, 0.0f });
 
-			drawPositions.push_back({ pos(0) + size, pos(1) + size, pos(2) });
+			drawPositions.push_back({ posCam(0) + size, posCam(1) + size, posCam(2) });
 			drawTexCoords.push_back({ 1.0f, 1.0f });
 
-			drawPositions.push_back({ pos(0) + size, pos(1) - size, pos(2) });
+			drawPositions.push_back({ posCam(0) + size, posCam(1) - size, posCam(2) });
 			drawTexCoords.push_back({ 1.0f, 0.0f });
 		}
 
@@ -139,8 +157,8 @@ namespace ZL {
 		renderer.EnableVertexAttribArray(vPositionName);
 		renderer.EnableVertexAttribArray(vTexCoordName);
 
-		float aspectRatio = static_cast<float>(screenWidth) / static_cast<float>(screenHeight);
-		renderer.PushPerspectiveProjectionMatrix(1.0 / 1.5, aspectRatio, Environment::CONST_Z_NEAR, Environment::CONST_Z_FAR);
+		//float aspectRatio = static_cast<float>(screenWidth) / static_cast<float>(screenHeight);
+		//renderer.PushPerspectiveProjectionMatrix(1.0 / 1.5, aspectRatio, Environment::CONST_Z_NEAR, Environment::CONST_Z_FAR);
 
 		glBindTexture(GL_TEXTURE_2D, texture->getTexID());
 
@@ -148,13 +166,13 @@ namespace ZL {
 		glBlendFunc(GL_SRC_ALPHA, GL_ONE);
 
 		renderer.PushMatrix();
-		renderer.LoadIdentity();
-		renderer.TranslateMatrix({ 0, 0, -1.0f * zoom });
+		//renderer.LoadIdentity();
+		//renderer.TranslateMatrix({ 0, 0, -1.0f * zoom });
 
 		renderer.DrawVertexRenderStruct(sparkQuad);
 
 		renderer.PopMatrix();
-		renderer.PopProjectionMatrix();
+		//renderer.PopProjectionMatrix();
 
 		glDisable(GL_BLEND);
 

src/SparkEmitter.h

@@ -51,6 +51,7 @@ namespace ZL {
 
 		bool configured;
 		void prepareDrawData();
+		bool useWorldSpace;
 
 	public:
 		SparkEmitter();
@@ -67,6 +68,7 @@ namespace ZL {
 		void setParticleSize(float size) { particleSize = size; }
 		void setBiasX(float bias) { biasX = bias; }
 
+		void setUseWorldSpace(bool use) { useWorldSpace = use; }
 		bool loadFromJsonFile(const std::string& path, Renderer& renderer, const std::string& zipFile = "");
 
 		void update(float deltaTimeMs);