Merge pull request #43 from DianaVasiliu/diana

Refactoring 3

Author: DianaVasiliu

OpenRocket/OpenRocket/Asteroid.cpp

@@ -14,6 +14,7 @@ Asteroid::Asteroid(float radius = 40.0f, int nrOfVertices = 16, glm::vec4 coordi
 	currentZone(Constants::SAFE),
 	asteroidMatrix(glm::mat4(1.0f))
 {
+	// setting a random texture for the asteroid
 	textureIndex = rand() % Constants::nrOfTextures;
 };
 
@@ -22,7 +23,7 @@ bool Asteroid::isInViewport() {
 }
 
 bool Asteroid::belowViewport() {
-	return this->coordinates.y - this->translatedDistance < - this->radius;
+	return this->coordinates.y - this->translatedDistance < -this->radius;
 }
 
 bool Asteroid::inLowerHalf() {
@@ -63,14 +64,26 @@ int Asteroid::getTextureIndex() const {
 	return this->textureIndex;
 }
 
-void Asteroid::setAsteroidMatrix(glm::mat4 matrix) { asteroidMatrix = matrix; }
+void Asteroid::setAsteroidMatrix(glm::mat4 matrix) { 
+	asteroidMatrix = matrix; 
+}
 
-glm::mat4 Asteroid::getAsteroidMatrix() const { return asteroidMatrix; }
+glm::mat4 Asteroid::getAsteroidMatrix() const { 
+	return asteroidMatrix; 
+}
 
-float Asteroid::getTranslatedDistance() const { return this->translatedDistance; }
+float Asteroid::getTranslatedDistance() const { 
+	return this->translatedDistance; 
+}
 
-void Asteroid::setTranslatedDistance(float distance) { this->translatedDistance = distance; }
+void Asteroid::setTranslatedDistance(float distance) { 
+	this->translatedDistance = distance; 
+}
 
-float Asteroid::getRadius() const { return this->radius; }
+float Asteroid::getRadius() const { 
+	return this->radius; 
+}
 
-float Asteroid::getY() const { return this->coordinates.y; }
+float Asteroid::getY() const { 
+	return this->coordinates.y; 
+}

OpenRocket/OpenRocket/Bullet.cpp

@@ -1,14 +1,12 @@
 #include "Bullet.h"
 #include "Constants.h"
-#include <iostream>
 
 Bullet::Bullet(float radius, float posX, float posY) :
 	radius(radius),
 	x(posX),
 	y(posY),
 	translatedDistance(0)
 {
-
 }
 
 bool Bullet::aboveViewport() {

OpenRocket/OpenRocket/Bullet.h

@@ -10,17 +10,16 @@ class Bullet {
 	float x;
 	float y;
 	bool toBeDeleted = false;
+
 public:
 	Bullet(float, float, float);
 	~Bullet() {}
 
 	float getRadius() const;
 	float getX() const;
 	float getY() const;
-	float getTranslatedDistance() const;
-  
+	float getTranslatedDistance() const;  
 	bool getToBeDeleted() { return toBeDeleted; }
-	void setToBeDeleted(bool t) { toBeDeleted = t; }
 
 	static glm::vec4 bulletCenter;
 	static glm::vec4 bulletPoint;
@@ -29,6 +28,7 @@ class Bullet {
 	void setX(float);
 	void setY(float);
 	void setTranslatedDistance(float);
+	void setToBeDeleted(bool t) { toBeDeleted = t; }
 
 	bool aboveViewport();
 };

OpenRocket/OpenRocket/Constants.h

@@ -9,8 +9,8 @@ class Constants
     static const int height; 
     static const int maxX;
     static const int maxY;
-	static const char* title;
-	static const float PI;
+    static const char* title;
+    static const float PI;
     static const int nrOfStars;
     static const int nrOfAsteroids;
     static const int nrOfAsteroidsPerFrame;