Merge branch 'master' into diana

Author: DianaVasiliu

OpenRocket/OpenRocket/Asteroid.cpp

@@ -12,6 +12,7 @@ Asteroid::Asteroid(float radius = 40.0f, int nrOfVertices = 16, glm::vec4 coordi
 	colors(colors), 
 	translatedDistance(0), 
 	currentZone(Constants::SAFE) {
+	textureIndex = rand() % Constants::nrOfTextures;
 };
 
 bool Asteroid::isInViewport() {
@@ -55,19 +56,10 @@ void Asteroid::setX(float newXOffset) {
 void Asteroid::setY(float newYOffset) { 
 	this->coordinates.y = newYOffset;
 }
-
-float Asteroid::getTranslatedDistance() { 
-	return this->translatedDistance; 
-}
-
-void Asteroid::setTranslatedDistance(float distance) { 
-	this->translatedDistance = distance; 
-}
-
-float Asteroid::getRadius() { 
-	return this->radius; 
-}
-
-float Asteroid::getY() { 
-	return this->coordinates.y;
+int Asteroid::getTextureIndex() {
+	return this->textureIndex;
 }
+float Asteroid::getTranslatedDistance() { return this->translatedDistance; }
+void Asteroid::setTranslatedDistance(float distance) { this->translatedDistance = distance; }
+float Asteroid::getRadius() { return this->radius; }
+float Asteroid::getY() { return this->coordinates.y; }

OpenRocket/OpenRocket/Asteroid.h

@@ -20,7 +20,7 @@ class Asteroid {
 	float radius;
 	float translatedDistance;
 	string currentZone;
-
+	int textureIndex;
 public:
 	glm::mat4 asteroidMatrix;
 	static glm::vec4 circlePoint;
@@ -41,6 +41,7 @@ class Asteroid {
 	float getY();
 	float getRadius();
 	float getTranslatedDistance();
+	int getTextureIndex();
 	glm::mat4 getAsteroidMatrix() { return asteroidMatrix; }
 
 	void setX(float);

OpenRocket/OpenRocket/Constants.cpp

@@ -19,6 +19,15 @@ 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{
+	"blueAsteroid.png",
+	"brightOrangeAsteroid.png",
+	"darkBlueAsteroid.png",
+	"greenAsteroid.png",
+	"orangeAsteroid.png",
+	"turquoiseAsteroid.png"
+};
+const int Constants::nrOfTextures = 6;
 const float Constants::bulletSpeed = 0.1;
 const double Constants::bulletSpawnCooldown = 0.1;
 const float Constants::bulletRadius = 2.5f;

OpenRocket/OpenRocket/Constants.h

@@ -1,5 +1,6 @@
 #pragma once
 #include <string>
+#include <vector>
 
 class Constants
 {
@@ -23,6 +24,8 @@ class Constants
     static const std::string yCoord;
     static const std::string RED;
     static const std::string SAFE;
+    static const std::vector<const char*> textureImages;
+    static const int nrOfTextures;
     static const float bulletSpeed;
     static const double bulletSpawnCooldown;
     static const float bulletRadius;