Calculate and show score

Author: DianaVasiliu

OpenRocket/OpenRocket/Game.cpp

@@ -50,6 +50,7 @@ Game* Game::getInstance() {
 
 Game::Game(int initial_pos_x, int initial_pos_y) :
 	nrOfStars(Constants::nrOfStars),
+	score(0),
 	width(Constants::maxX),
 	height(Constants::maxY),
 	maxX(Constants::maxX),
@@ -205,8 +206,11 @@ void Game::RenderFunction(void) {
 
 	float posX = rocket->getPositionX();
 	float posY = rocket->getPositionY();
+	glm::mat4 scaleMatrix = glm::scale(glm::mat4(1.0f), glm::vec3(1.0f / maxX, 1.0f / maxY, 1.0f));
+	glm::mat4 translateMatrix = glm::translate(glm::mat4(1.0f), glm::vec3(-maxX, -maxY, 0.0f));
 	glm::mat4 rocketTranslateMatrix = glm::translate(glm::mat4(1.0f), glm::vec3(posX, posY, 0.0f));
-	glm::mat4 matrix = backgroundScaleMatrix * backgroundTranslateMatrix * rocketTranslateMatrix;
+
+	glm::mat4 matrix = scaleMatrix * translateMatrix * rocketTranslateMatrix;
 	rocket->setRocketMatrix(matrix);
 
 	myMatrixLocation = glGetUniformLocation(ProgramId, "myMatrix");
@@ -232,8 +236,7 @@ void Game::RenderFunction(void) {
 		glBindTexture(GL_TEXTURE_2D, Game::textures[asteroid->getTextureIndex()]);
 		glm::mat4 asteroidMatrix = glm::scale(glm::mat4(1.0f), glm::vec3(asteroid->getRadius(), asteroid->getRadius(), 1.0));
 		glm::mat4 animateMatrix = glm::translate(glm::mat4(1.0f), glm::vec3(0.0, - asteroid->getTranslatedDistance(), 0.0)); // controleaza translatia de-a lungul lui Oy
-		glm::mat4 asteroidTranslateMatrix = glm::translate(glm::mat4(1.0f), glm::vec3(asteroid->getX(), asteroid->getY(), 0.0));
-		asteroidMatrix = backgroundMatrix *  animateMatrix * asteroidTranslateMatrix * asteroidMatrix;
+		asteroidMatrix = backgroundMatrix *  animateMatrix * glm::translate(glm::mat4(1.0f), glm::vec3(asteroid->getX(), asteroid->getY(), 0.0)) * asteroidMatrix;
 		asteroid->setAsteroidMatrix(asteroidMatrix);
 		glUniformMatrix4fv(myMatrixLocation, 1, GL_FALSE, &asteroidMatrix[0][0]);
 		glBindVertexArray(asteroidVao);
@@ -242,16 +245,14 @@ void Game::RenderFunction(void) {
 
 	glDisable(GL_TEXTURE_2D);
 	glUseProgram(ProgramId);
-
 	myMatrixLocation = glGetUniformLocation(ProgramId, "myMatrix");
 
 	Game::UpdateBullets();
 
 	for (auto& bullet : bullets) {
 		glm::mat4 bulletMatrix = glm::scale(glm::mat4(1.0f), glm::vec3(bullet->getRadius(), bullet->getRadius(), 1.0f));
 		glm::mat4 animateMatrix = glm::translate(glm::mat4(1.0f), glm::vec3(0.0, bullet->getY(), 0.0));
-		glm::mat4 bulletTranslateMatrix = glm::translate(glm::mat4(1.0f), glm::vec3(bullet->getX(), bullet->getY(), 0.0));
-		bulletMatrix = backgroundMatrix * animateMatrix * bulletTranslateMatrix * bulletMatrix;
+		bulletMatrix = backgroundMatrix * animateMatrix * glm::translate(glm::mat4(1.0f), glm::vec3(bullet->getX(), bullet->getY(), 0.0)) * bulletMatrix;
 
 		bullet->bulletMatrix = bulletMatrix;
 		glUniformMatrix4fv(myMatrixLocation, 1, GL_FALSE, &bulletMatrix[0][0]);
@@ -589,8 +590,7 @@ double distance(glm::vec4 p1, glm::vec4 p2) {
 }
 
 void Game::BulletAsteroidCollision() {
-	vector<int> eraseAsteroids;
-	vector<int> eraseBullets;
+
 	for (int i = 0; i < int(bullets.size()); i++) {
 		for (int j = 0; j < int(asteroids.size()); j++) {
 			glm::vec4 currentBulletCenter = bullets[i]->bulletMatrix * Bullet::bulletCenter;
@@ -605,6 +605,7 @@ void Game::BulletAsteroidCollision() {
 			if (distance(currentAsteroidCenter, currentBulletCenter) < currentBulletRadius + currentAsteroidRadius) {
 				bullets[i]->setToBeDeleted(true);
 				asteroids[j]->setToBeDeleted(true);
+				score++;
 			}
 		}
 	}

OpenRocket/OpenRocket/Game.h

@@ -80,6 +80,7 @@ class Game {
 	GLuint TextureProgramId;
 
 	int nrOfStars;
+	int score;
 
 	int colorCode;
 	int initPosX;
@@ -116,6 +117,7 @@ class Game {
 	int getWidth() const { return width; }
 	int getInitPosX() const { return initPosX; }
 	int getInitPosY() const { return initPosY; }
+	int getScore() const { return score; }
 
 	void CreateBackgroundBuffers();
 	void CreateRocketBuffers();

OpenRocket/OpenRocket/Rocket.cpp

@@ -234,6 +234,9 @@ void Rocket::RocketAsteroidsCollision(vector<Asteroid*> asteroids)
 
 			if (remainingLives == 0) {
 				isDead = true;
+
+				Game* game = Game::getInstance();
+				std::cout << "Your score is: " << game->getScore() / 2 << "\n";
 			}
 		}