Merge pull request #44 from DianaVasiliu/diana

Add gameplay / demo

Author: DianaVasiliu

OpenRocket/OpenRocket/Asteroid.cpp

@@ -87,3 +87,11 @@ float Asteroid::getRadius() const {
 float Asteroid::getY() const { 
 	return this->coordinates.y; 
 }
+
+void Asteroid::setToBeDeleted(bool t) { 
+	toBeDeleted = t; 
+}
+
+bool Asteroid::getToBeDeleted() const { 
+	return toBeDeleted; 
+}

OpenRocket/OpenRocket/Asteroid.h

@@ -36,7 +36,7 @@ class Asteroid {
 	bool inLowerHalf();
 	bool belowViewport();  
 
-	bool getToBeDeleted() const { return toBeDeleted; }
+	bool getToBeDeleted() const;
 	float getX() const;
 	float getY() const;
 	float getRadius() const;
@@ -49,7 +49,7 @@ class Asteroid {
 	void setX(float);
 	void setY(float);
 	void setTranslatedDistance(float);
-	void setToBeDeleted(bool t) { toBeDeleted = t; }
+	void setToBeDeleted(bool);
 	void setAsteroidMatrix(glm::mat4);
 	void setCurrentZone(string);
 };

OpenRocket/OpenRocket/Bullet.cpp

@@ -43,3 +43,11 @@ void Bullet::setY(float y) {
 void Bullet::setTranslatedDistance(float distance) {
 	translatedDistance = distance;
 }
+
+bool Bullet::getToBeDeleted() const { 
+	return toBeDeleted; 
+}
+
+void Bullet::setToBeDeleted(bool t) { 
+	toBeDeleted = t; 
+}

OpenRocket/OpenRocket/Bullet.h

@@ -19,16 +19,15 @@ class Bullet {
 	float getX() const;
 	float getY() const;
 	float getTranslatedDistance() const;  
-	bool getToBeDeleted() { return toBeDeleted; }
-
-	static glm::vec4 bulletCenter;
-	static glm::vec4 bulletPoint;
-	glm::mat4 bulletMatrix;
+	bool getToBeDeleted() const;
 
 	void setX(float);
 	void setY(float);
 	void setTranslatedDistance(float);
-	void setToBeDeleted(bool t) { toBeDeleted = t; }
+	void setToBeDeleted(bool);
 
+	static glm::vec4 bulletCenter;
+	static glm::vec4 bulletPoint;
+	glm::mat4 bulletMatrix;
 	bool aboveViewport();
 };

OpenRocket/OpenRocket/Game.cpp

@@ -727,10 +727,10 @@ void Game::CreateHeartBuffers() {
 
 void Game::CreateGameOverBuffers() {
 	GLfloat Vertices[] = {
-		0.0f, 0.0f, 0.0f, 1.0f,								0.0f, 0.0f, 0.0f,		0.0f, 0.0f,
-		Constants::maxX, 0.0f, 0.0f, 1.0f,					0.0f, 0.0f, 0.0f,		1.0f, 0.0f,
-		Constants::maxX, Constants::maxY, 0.0f, 1.0f,		0.0f, 0.0f, 0.0f,		1.0f, 1.0f,
-		0.0f, Constants::maxY, 0.0f, 1.0f,					0.0f, 0.0f, 0.0f,		0.0f, 1.0f,
+		0.0f, 0.0f, 0.0f, 1.0f,												0.0f, 0.0f, 0.0f,		0.0f, 0.0f,
+		(GLfloat)Constants::maxX, 0.0f, 0.0f, 1.0f,							0.0f, 0.0f, 0.0f,		1.0f, 0.0f,
+		(GLfloat)Constants::maxX,(GLfloat)Constants::maxY, 0.0f, 1.0f,		0.0f, 0.0f, 0.0f,		1.0f, 1.0f,
+		0.0f,(GLfloat)Constants::maxY, 0.0f, 1.0f,							0.0f, 0.0f, 0.0f,		0.0f, 1.0f,
 	};
 
 	glGenVertexArrays(1, &gameOverVao);

README.md

@@ -2,10 +2,13 @@
 
 ## Basic idea
 
--   the player will control a rocket using the keyboard
--   there will be asteroids, that must be avoided by the player
--   the asteroids will move along one axis
--   (extra) the rocket will have an attack and can destroy the asteroids
+A rocket on a mission in space must escape a wave of dangerous asteroids. To finish the mission and get home safe, the rocket can either avoid asteroids or destroy them with its weapon. If the rocket collides with an asteroid, it loses one life, but if it remains without lives, it explodes and the game ends.
+
+## Gameplay
+
+<p align="center">
+  <img src="demo.gif" alt="Demo" width="80%"/>
+</p>
 
 ## Libraries