Merge master into current branch.

Author: mirastroie

OpenRocket/OpenRocket/Asteroid.cpp

@@ -1,40 +1,64 @@
 #include "Asteroid.h"
 #include "Constants.h"
 
-glm::vec4 Asteroid::circlePoint = glm::vec4(0.0f);
-glm::vec4 Asteroid::circleCenter = glm::vec4(0.0f);
+glm::vec4 Asteroid::circlePoint = { 1.0f, 0.0f, 0.f, 1.f };
+glm::vec4 Asteroid::circleCenter = { 0.f, 0.0f, 0.f, 1.f };
 
 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)) : radius(radius), nrOfVertices(nrOfVertices), coordinates(coordinates), colors(colors), translatedDistance(0), currentZone(Constants::SAFE) {
+	glm::vec4 colors = glm::vec4(0.0f, 0.0f,0.0f,0.0f)) : 
+	radius(radius), 
+	nrOfVertices(nrOfVertices), 
+	coordinates(coordinates), 
+	colors(colors), 
+	translatedDistance(0), 
+	currentZone(Constants::SAFE) {
 	textureIndex = rand() % Constants::nrOfTextures;
 };
+
 bool Asteroid::isInViewport() {
 	return this->coordinates.y - this->translatedDistance < Constants::height && !this->belowViewport();
 }
+
 bool Asteroid::belowViewport() {
 	return this->coordinates.y - this->translatedDistance < - this->radius;
 }
+
 bool Asteroid::inLowerHalf() {
 	return !this->belowViewport() && this->isInViewport() && this->getRealY() < Constants::height;
 }
+
 string Asteroid::getCurrentZone() {
 	return this->currentZone;
 }
+
 void Asteroid::setCurrentZone(string newZone) {
 	this->currentZone = newZone;
 }
+
 void Asteroid::updateState() {
 	if (Asteroid::inLowerHalf()) {
 		Asteroid::setCurrentZone(Constants::RED);
 	}
 }
+
+float Asteroid::getX() { 
+	return this->coordinates.x; 
+}
+
+float Asteroid::getRealY() { 
+	return this->coordinates.y - this->translatedDistance; 
+}
+
+void Asteroid::setX(float newXOffset) { 
+	this->coordinates.x = newXOffset; 
+}
+
+void Asteroid::setY(float newYOffset) { 
+	this->coordinates.y = newYOffset;
+}
 int Asteroid::getTextureIndex() {
 	return this->textureIndex;
 }
-float Asteroid::getX() { return this->coordinates.x; }
-float Asteroid::getRealY() { return this->coordinates.y - this->translatedDistance; }
-void Asteroid::setX(float newXOffset) { this->coordinates.x = 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; }

OpenRocket/OpenRocket/Bullet.cpp

@@ -0,0 +1,16 @@
+#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() {
+	return this->y > Constants::height;
+}

OpenRocket/OpenRocket/Bullet.h

@@ -0,0 +1,44 @@
+#pragma once
+
+class Bullet {
+private:
+	float radius;
+	float translatedDistance;
+	float x;
+	float y;
+
+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;
+	}
+
+	void setX(float x) {
+		this->x = x;
+	}
+
+	void setY(float y) {
+		this->y = y;
+	}
+
+	void setTranslatedDistance(float distance) {
+		translatedDistance = distance;
+	}
+
+	bool aboveViewport();
+
+};

OpenRocket/OpenRocket/Constants.cpp

@@ -1,10 +1,10 @@
 #include "Constants.h"
 
-const char* Constants::title = "Open rocket";
+const char* Constants::title = "Open Rocket";
 const float Constants::PI = 3.141592;
 const int Constants::width = 800;
 const int Constants::height = 450;
-const int Constants::nrOfStars = 2000;
+const int Constants::nrOfStars = 1000;
 const int Constants::maxX = 1600;
 const int Constants::maxY = 900;
 const int Constants::nrOfAsteroids = 20;
@@ -27,4 +27,8 @@ const std::vector<const char*> Constants::textureImages{
 	"orangeAsteroid.png",
 	"turquoiseAsteroid.png"
 };
-const int Constants::nrOfTextures = 6;
+const int Constants::nrOfTextures = 6;
+const float Constants::bulletSpeed = 0.1;
+const double Constants::bulletSpawnCooldown = 0.1;
+const float Constants::bulletRadius = 2.5f;
+const int Constants::nrOfBulletsPerFrame = 8;

OpenRocket/OpenRocket/Constants.h

@@ -26,4 +26,8 @@ class Constants
     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;
+    static const int nrOfBulletsPerFrame;
 };