Merge pull request #36 from DianaVasiliu/diana

Added multiple lives

Author: DianaVasiliu

OpenRocket/OpenRocket/Constants.cpp

@@ -32,3 +32,5 @@ const float Constants::bulletSpeed = 0.1;
 const double Constants::bulletSpawnCooldown = 0.1;
 const float Constants::bulletRadius = 2.5f;
 const int Constants::nrOfBulletsPerFrame = 8;
+const int Constants::maxLives = 3;
+const double Constants::timeToEscapeAsteroid = 1;

OpenRocket/OpenRocket/Constants.h

@@ -30,4 +30,6 @@ class Constants
     static const double bulletSpawnCooldown;
     static const float bulletRadius;
     static const int nrOfBulletsPerFrame;
+    static const int maxLives;
+    static const double timeToEscapeAsteroid;
 };

OpenRocket/OpenRocket/Game.cpp

@@ -64,6 +64,7 @@ Game::Game(int initial_pos_x, int initial_pos_y) :
 	maxY = height / 2;
 
 	InitializeGlew();
+	CreateHeartBuffers();
 	CreateBackgroundBuffers();
 	CreateRocketBuffers();
 	CreateAsteroidBuffers();
@@ -165,11 +166,15 @@ void Game::FireAnimation() {
 
 void Game::RenderFunction(void) {
 	Rocket* rocket = Rocket::getInstance();
+
+	glClearColor(0.0f, 0.0f, 0.0f, 1.0f);
+	glClear(GL_COLOR_BUFFER_BIT);
+
 	if (rocket->getIsDead()) {
+		// TODO: render a png with the text GAME OVER
+		//glutSwapBuffers();
 		return;
 	}
-	glClearColor(0.0f, 0.0f, 0.0f, 1.0f);
-	glClear(GL_COLOR_BUFFER_BIT);
 
 	if (rotationAngle > 360.f) {
 		rotationAngle = 0.0f;
@@ -243,16 +248,26 @@ void Game::RenderFunction(void) {
 		glBindVertexArray(bulletVao);
 		glDrawArrays(GL_POLYGON, 0, Constants::nrOfVerticesPerCircle);
 	}	
+
 	rocket->RocketAsteroidsCollision(asteroids);
+	
+	glm::mat4 heartMatrix = glm::scale(glm::mat4(1.0f), glm::vec3(4.7f, 4.7f, 1.0f));
+	heartMatrix = backgroundMatrix * heartMatrix;
+
+	glm::mat4 heartTranslateMatrix = glm::translate(glm::mat4(1.0f), glm::vec3(10.0f, 0.0f, 0.0f));
+	for (int i = 0; i < rocket->getRemainingLives(); i++) {
+		if (i != 0) {
+			heartMatrix = heartMatrix * heartTranslateMatrix;
+		}
+		glUniformMatrix4fv(myMatrixLocation, 1, GL_FALSE, &heartMatrix[0][0]);
+		glBindVertexArray(heartVao);
+		glDrawArrays(GL_POLYGON, 0, 14);
+	}
 
 	glutPostRedisplay();
 	glFlush();
 }
 
-bool colliding(Rocket rocket, Asteroid asteroid)
-{
-	return false;
-}
 void Game::CreateBackgroundBuffers() {
 
 	const int nrOfVertices = 1000 * 5;
@@ -391,21 +406,18 @@ void Game::CreateAsteroidBuffers() {
 	GLfloat Vertices[1000];
 	for (int k = 0; k < Constants::nrOfVerticesPerCircle; k++) {
 		float theta = Constants::TWO_PI * k / Constants::nrOfVerticesPerCircle;
-		//cout << "angle " << float(Constants::TWO_PI * float(k)) / float(Constants::nrOfVerticesPerCircle) << "\n";
 		float x = cos(theta);
 		float y = sin(theta);
 		// varfurile corespunzatoare cercului
 		Vertices[9 * k] = x;
 		Vertices[9 * k + 1] = y;
 		Vertices[9 * k + 2] = 0.0f;
 		Vertices[9 * k + 3] = 1.0f;
-		//cout << 4*k << " " << Vertices[4 * k] << " " << Vertices[4 * k + 1] << " " << Vertices[4 * k + 2] << " " << Vertices[4 * k + 3] << "\n";
 
 		Vertices[9 * k + 4] = 1.0f;
 		Vertices[9 * k + 5] = 0.0f;
 		Vertices[9 * k + 6] = 0.0f;
-
-		//cout << (float)k / 18 << " ";
+  
 		Vertices[9 * k + 7] = (sin(theta) + 1) / 2;
 		Vertices[9 * k + 8] = (cos(theta) + 1)/ 2;
 	}
@@ -435,6 +447,7 @@ void Game::CreateAsteroidBuffers() {
 	glEnableVertexAttribArray(2);
 	glVertexAttribPointer(2, 2, GL_FLOAT, GL_FALSE, 9 * sizeof(GLfloat), (GLvoid*)(7 * sizeof(GLfloat)));
 }
+
 void Game::UpdateAsteroids() {
 	auto end = std::remove_if(asteroids.begin(),
 		asteroids.end(),
@@ -481,6 +494,7 @@ void Game::GenerateAsteroids(int nrOfAsteroids) {
 		this->asteroids.push_back(Game::GenerateSingleAsteroid());
 	}
 }
+
 void Game::LoadTexture(GLuint &texture, const char* imageName)
 {
 	glGenTextures(1, &texture);
@@ -499,6 +513,7 @@ void Game::LoadTexture(GLuint &texture, const char* imageName)
 	SOIL_free_image_data(image);
 	glBindTexture(GL_TEXTURE_2D, 0);
 }
+
 void Game::loadTextures() {
 	for (auto& imageName : Constants::textureImages) {
 		GLuint texture;
@@ -572,3 +587,53 @@ void Game::UpdateBullets() {
 
 	bullets.erase(end, bullets.end());
 }
+
+void Game::CreateHeartBuffers() {
+	
+	GLfloat Vertices[] = {
+		7.0f, 3.7f, 0.0f, 1.0f,
+		
+		8.0f, 4.5f, 0.0f, 1.0f,
+		9.6f, 6.0f, 0.0f, 1.0f,
+		10.4f, 7.5f, 0.0f, 1.0f,
+		10.0f, 9.0f, 0.0f, 1.0f,
+		8.7f, 9.8f, 0.0f, 1.0f,
+		7.8f, 9.7f, 0.0f, 1.0f,
+		
+		7.0f, 8.9f, 0.0f, 1.0f,
+		
+		6.2f, 9.7f, 0.0f, 1.0f,
+		5.3f, 9.8f, 0.0f, 1.0f,
+		4.0f, 9.0f, 0.0f, 1.0f,
+		3.6f, 7.5f, 0.0f, 1.0f,
+		4.4f, 6.0f, 0.0f, 1.0f,
+		6.0f, 4.5f, 0.0f, 1.0f,
+	};
+
+	const int verticesCount = sizeof(Vertices) / sizeof(GLfloat);
+
+	GLfloat Colors[verticesCount];
+
+	for (int i = 0; i < verticesCount; i += 4) {
+		Colors[i] = 1.0f;
+		Colors[i + 1] = 0.0f;
+		Colors[i + 2] = 0.0f;
+		Colors[i + 3] = 1.0f;
+	}
+
+	glGenBuffers(1, &heartVbo);
+	glBindBuffer(GL_ARRAY_BUFFER, heartVbo);
+	glBufferData(GL_ARRAY_BUFFER, sizeof(Vertices), Vertices, GL_STATIC_DRAW);
+
+	glGenVertexArrays(1, &heartVao);
+	glBindVertexArray(heartVao);
+
+	glVertexAttribPointer(0, 4, GL_FLOAT, GL_FALSE, 0, 0);
+	glEnableVertexAttribArray(0);
+
+	glGenBuffers(1, &heartColorBufferId);
+	glBindBuffer(GL_ARRAY_BUFFER, heartColorBufferId);
+	glBufferData(GL_ARRAY_BUFFER, sizeof(Colors), Colors, GL_STATIC_DRAW);
+	glVertexAttribPointer(1, 4, GL_FLOAT, GL_FALSE, 0, 0);
+	glEnableVertexAttribArray(1);
+}

OpenRocket/OpenRocket/Game.h

@@ -65,6 +65,10 @@ class Game {
 	GLuint squareVbo;
 	GLuint squareColorBufferId;
 
+	GLuint heartVao;
+	GLuint heartVbo;
+	GLuint heartColorBufferId;
+
 	int width;
 	int height;
 	int codCol;
@@ -113,6 +117,7 @@ class Game {
 	void CreateRocketBuffers();
 	void CreateAsteroidBuffers();
 	void CreateBulletBuffers();
+	void CreateHeartBuffers();
 
 	void moveRocket(int key, int x, int y);
 

OpenRocket/OpenRocket/Rocket.cpp

@@ -4,23 +4,12 @@
 #include "Rocket.h"
 #include <GL/glew.h>
 #include <GL/freeglut.h>
+#include <GLFW/glfw3.h>
 
 Rocket* Rocket::instance = nullptr;
 
-void displayMatrix(glm::mat4 matrix)
-{
-	//cout << "intra aici";
-	for (int ii = 0; ii < 4; ii++)
-	{
-		for (int jj = 0; jj < 4; jj++)
-			cout << matrix[ii][jj] << "  ";
-		cout << endl;
-	};
-	cout << "\n";
-
-};
-
-Rocket::Rocket() 
+Rocket::Rocket() :
+	remainingLives(Constants::maxLives)
 {
 	frontTriangle.top = { 800.f, 210.f, 0.f, 1.f };
 	frontTriangle.left = { 790.f, 175.f, 0.0f, 1.f };
@@ -235,8 +224,17 @@ void Rocket::RocketAsteroidsCollision(vector<Asteroid*> asteroids)
 		if (condition1 || condition2 || condition3 || condition4 || condition5 || condition6 || 
 			condition7 || condition8 || condition9 || condition10 || condition11 || condition12 )
 		{
-			cout << "coliziunee\n";
-			isDead = true;
+			double now = glfwGetTime();
+
+			if (now - lastCollisionTime > Constants::timeToEscapeAsteroid) {
+				lastCollisionTime = glfwGetTime();
+				remainingLives--;
+				cout << "Lives left: " << remainingLives << "\n";
+			}
+
+			if (remainingLives == 0) {
+				isDead = true;
+			}
 		}
 
 	}

OpenRocket/OpenRocket/Rocket.h

@@ -48,7 +48,9 @@ class Rocket {
 
 	float moveAmount = 20;
 
+	int remainingLives;
 	bool isDead = false;
+	double lastCollisionTime;
 
 public:
 	Triangle frontTriangle;
@@ -78,6 +80,10 @@ class Rocket {
 		return bulletStartY;
 	}
 
+	int getRemainingLives() {
+		return remainingLives;
+	}
+
 	void setBulletStartX(float x) {
 		bulletStartX = x;
 	}