Merge branch 'master' into bianca

Author: DianaVasiliu

.gitignore

@@ -30,7 +30,6 @@ glm/
 *.lai
 *.la
 *.a
-*.lib
 
 # Executables
 *.exe

OpenRocket/OpenRocket/Asteroid.cpp

@@ -1,8 +1,8 @@
 #include "Asteroid.h"
 #include "Constants.h"
 
-glm::vec4 Asteroid::circlePoint = { 1.0f, 0.0f, 0.f, 1.f };
-glm::vec4 Asteroid::circleCenter = { 0.f, 0.0f, 0.f, 1.f };
+glm::vec4 Asteroid::circlePoint = { 1.0f, 0.0f, 0.0f, 1.0f };
+glm::vec4 Asteroid::circleCenter = { 0.0f, 0.0f, 0.0f, 1.0f };
 
 Asteroid::Asteroid(float radius = 40.0f, int nrOfVertices = 16, glm::vec4 coordinates = glm::vec4(0.0f,0.0f, 0.0f, 0.0f), 
 	glm::vec4 colors = glm::vec4(0.0f, 0.0f,0.0f,0.0f)) : 
@@ -11,7 +11,9 @@ Asteroid::Asteroid(float radius = 40.0f, int nrOfVertices = 16, glm::vec4 coordi
 	coordinates(coordinates), 
 	colors(colors), 
 	translatedDistance(0), 
-	currentZone(Constants::SAFE) {
+	currentZone(Constants::SAFE),
+	asteroidMatrix(glm::mat4(1.0f))
+{
 	textureIndex = rand() % Constants::nrOfTextures;
 };
 
@@ -27,7 +29,7 @@ bool Asteroid::inLowerHalf() {
 	return !this->belowViewport() && this->isInViewport() && this->getRealY() < Constants::height;
 }
 
-string Asteroid::getCurrentZone() {
+string Asteroid::getCurrentZone() const {
 	return this->currentZone;
 }
 
@@ -41,11 +43,11 @@ void Asteroid::updateState() {
 	}
 }
 
-float Asteroid::getX() { 
+float Asteroid::getX() const { 
 	return this->coordinates.x; 
 }
 
-float Asteroid::getRealY() { 
+float Asteroid::getRealY() const { 
 	return this->coordinates.y - this->translatedDistance; 
 }
 
@@ -56,10 +58,19 @@ void Asteroid::setX(float newXOffset) {
 void Asteroid::setY(float newYOffset) { 
 	this->coordinates.y = newYOffset;
 }
-int Asteroid::getTextureIndex() {
+
+int Asteroid::getTextureIndex() const {
 	return this->textureIndex;
 }
-float Asteroid::getTranslatedDistance() { return this->translatedDistance; }
+
+void Asteroid::setAsteroidMatrix(glm::mat4 matrix) { asteroidMatrix = matrix; }
+
+glm::mat4 Asteroid::getAsteroidMatrix() const { return asteroidMatrix; }
+
+float Asteroid::getTranslatedDistance() const { return this->translatedDistance; }
+
 void Asteroid::setTranslatedDistance(float distance) { this->translatedDistance = distance; }
-float Asteroid::getRadius() { return this->radius; }
-float Asteroid::getY() { return this->coordinates.y; }
+
+float Asteroid::getRadius() const { return this->radius; }
+
+float Asteroid::getY() const { return this->coordinates.y; }

OpenRocket/OpenRocket/Asteroid.h

@@ -22,34 +22,34 @@ class Asteroid {
 	string currentZone;
 	int textureIndex;
 	bool toBeDeleted = false;
+  
 public:
 	glm::mat4 asteroidMatrix;
 	static glm::vec4 circlePoint;
 	static glm::vec4 circleCenter;
-public:
+
 	Asteroid(float, int, glm::vec<4, float, (glm::qualifier)0>, glm::vec<4, float, (glm::qualifier)0>);
 	~Asteroid() { };
 
 	bool isInViewport();
 	void updateState();
 	bool inLowerHalf();
-	bool belowViewport();
-  
-	string getCurrentZone();
-	void setCurrentZone(string);
+	bool belowViewport();  
 
-	float getX();
-	float getY();
-	float getRadius();
-	float getTranslatedDistance();
-	int getTextureIndex();
-	glm::mat4 getAsteroidMatrix() { return asteroidMatrix; }
-	bool getToBeDeleted() { return toBeDeleted; }
+	bool getToBeDeleted() const { return toBeDeleted; }
+	float getX() const;
+	float getY() const;
+	float getRadius() const;
+	float getTranslatedDistance() const;
+	int getTextureIndex() const;
+	glm::mat4 getAsteroidMatrix() const;
+	string getCurrentZone() const;
+	float getRealY() const;
 
 	void setX(float);
-	float getRealY();
 	void setY(float);
 	void setTranslatedDistance(float);
-	void setAsteroidMatrix(glm::mat4 matrix) { asteroidMatrix = matrix; }
 	void setToBeDeleted(bool t) { toBeDeleted = t; }
+	void setAsteroidMatrix(glm::mat4);
+	void setCurrentZone(string);
 };

OpenRocket/OpenRocket/Bullet.cpp

@@ -15,5 +15,33 @@ bool Bullet::aboveViewport() {
 	return this->y > Constants::height;
 }
 
-glm::vec4 Bullet::bulletCenter = { 0.0f, 0.0f, 0.f, 1.f };
-glm::vec4 Bullet::bulletPoint = { 0.0f, 0.0f, 0.f, 1.f };
+glm::vec4 Bullet::bulletCenter = { 0.0f, 0.0f, 0.0f, 1.0f };
+glm::vec4 Bullet::bulletPoint = { 0.0f, 0.0f, 0.0f, 1.0f };
+
+float Bullet::getRadius() const {
+	return radius;
+}
+
+float Bullet::getX() const {
+	return x;
+}
+
+float Bullet::getY() const {
+	return y;
+}
+
+float Bullet::getTranslatedDistance() const {
+	return translatedDistance;
+}
+
+void Bullet::setX(float x) {
+	this->x = x;
+}
+
+void Bullet::setY(float y) {
+	this->y = y;
+}
+
+void Bullet::setTranslatedDistance(float distance) {
+	translatedDistance = distance;
+}

OpenRocket/OpenRocket/Bullet.h

@@ -11,43 +11,24 @@ class Bullet {
 	float y;
 	bool toBeDeleted = false;
 public:
-	Bullet(float radius, float posX, float posY);
-	~Bullet();
-
-	float getRadius() const {
-		return radius;
-	}
-
-	float getX() const {
-		return x;
-	}
-
-	float getY() const {
-		return y;
-	}
-
-	float getTranslatedDistance() const {
-		return translatedDistance;
-	}
-
+	Bullet(float, float, float);
+	~Bullet() {}
+
+	float getRadius() const;
+	float getX() const;
+	float getY() const;
+	float getTranslatedDistance() const;
+  
 	bool getToBeDeleted() { return toBeDeleted; }
-
-	void setX(float x) {
-		this->x = x;
-	}
-
-	void setY(float y) {
-		this->y = y;
-	}
-
-	void setTranslatedDistance(float distance) {
-		translatedDistance = distance;
-	}
-
 	void setToBeDeleted(bool t) { toBeDeleted = t; }
 
-	bool aboveViewport();
 	static glm::vec4 bulletCenter;
 	static glm::vec4 bulletPoint;
 	glm::mat4 bulletMatrix;
-};
+
+	void setX(float);
+	void setY(float);
+	void setTranslatedDistance(float);
+
+	bool aboveViewport();
+};

OpenRocket/OpenRocket/Constants.cpp

@@ -1,15 +1,15 @@
 #include "Constants.h"
 
 const char* Constants::title = "Open Rocket";
-const float Constants::PI = 3.141592;
+const float Constants::PI = 3.141592f;
 const int Constants::width = 800;
 const int Constants::height = 450;
 const int Constants::nrOfStars = 1000;
 const int Constants::maxX = 1600;
 const int Constants::maxY = 900;
 const int Constants::nrOfAsteroids = 20;
 const int Constants::nrOfAsteroidsPerFrame = 10;
-const float Constants::TWO_PI = 6.28;
+const float Constants::TWO_PI = 6.28f;
 const int Constants::nrOfVerticesPerCircle = 18;
 const float Constants::distanceBetweenAsteroids = 150.0f;
 const float Constants::asteroidMovingUnit = 0.15f;
@@ -18,8 +18,8 @@ const float Constants::maxYDistance = 4 * Constants::height;
 const std::string Constants::xCoord = "x";
 const std::string Constants::yCoord = "y";
 const std::string Constants::RED = "Red Zone";
-const std::string Constants::SAFE= "Safe Zone";
-const std::vector<const char*> Constants::textureImages{
+const std::string Constants::SAFE = "Safe Zone";
+const std::vector<const char*> Constants::textureImages {
 	"blueAsteroid.png",
 	"brightOrangeAsteroid.png",
 	"darkBlueAsteroid.png",
@@ -28,7 +28,9 @@ const std::vector<const char*> Constants::textureImages{
 	"turquoiseAsteroid.png"
 };
 const int Constants::nrOfTextures = 6;
-const float Constants::bulletSpeed = 0.1;
+const float Constants::bulletSpeed = 0.1f;
 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.0;

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;
 };