Add #6 - asteroids design.

Author: mirastroie

OpenRocket/OpenRocket/Constants.cpp

@@ -22,7 +22,9 @@ 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 = 4;
+const int Constants::nrOfTextures = 6;

OpenRocket/OpenRocket/Game.cpp

@@ -8,6 +8,7 @@
 #include <GL/glew.h>
 #include <GL/freeglut.h>
 
+vector<GLuint> Game::textures;
 void Game::move(void)
 {
 	for (auto& asteroid : asteroids) {
@@ -69,8 +70,8 @@ void Game::InitializeGlew() {
 	glutCloseFunc(cleanupCallback); 
 }
 
-void Game::CreateShaders(const char* vertShader, const char* fragShader) {
-	ProgramId = LoadShaders(vertShader, fragShader);
+void Game::CreateShaders() {
+	ProgramId = LoadShaders("04_03_Shader.vert", "04_03_Shader.frag");
 	TextureProgramId = LoadShaders("Texturare_Shader.vert", "Texturare_Shader.frag");
 	glUseProgram(ProgramId);
 }
@@ -96,12 +97,11 @@ void Game::DestroyBackgroundVBO(void) {
 	//glDeleteVertexArrays(1, &VaoId);
 }
 
-void Game::InitializeGame(const char* vertShader, const char* fragShader) {
-	CreateShaders("04_03_Shader.vert", "04_03_Shader.frag");
+void Game::InitializeGame() {
+	CreateShaders();
 
 	resizeMatrix = glm::scale(glm::mat4(1.0f), glm::vec3(1.f / maxX, 1.f / maxY, 1.0));
 	matrTransl = glm::translate(glm::mat4(1.0f), glm::vec3(-maxX, -maxY, 0.0));
-
 	myMatrix = resizeMatrix * matrTransl;
 
 	glClearColor(0.0f, 0.0f, 0.0f, 0.0f);
@@ -200,7 +200,7 @@ void Game::RenderFunction(void) {
 	glActiveTexture(GL_TEXTURE0);
 
 	for (auto& asteroid : asteroids) {
-		glBindTexture(GL_TEXTURE_2D, textures[asteroid->getTextureIndex()]);
+		glBindTexture(GL_TEXTURE_2D, Game::textures[asteroid->getTextureIndex()]);
 		glm::mat4 asteroidMatrix = glm::scale(glm::mat4(1.0f), glm::vec3(asteroid->getRadius(), asteroid->getRadius(), 1.0));
 		glm::mat4 animateMatrix = glm::translate(glm::mat4(1.0f), glm::vec3(0.0, - asteroid->getTranslatedDistance(), 0.0)); // controleaza translatia de-a lungul lui Oy
 		backgroundMatrix = backgroundScaleMatrix * backgroundTranslateMatrix;
@@ -440,6 +440,6 @@ void Game::loadTextures() {
 	for (auto& imageName : Constants::textureImages) {
 		GLuint texture;
 		LoadTexture(texture, imageName);
-		textures.push_back(texture);
+		Game::textures.push_back(texture);
 	}	
 }

OpenRocket/OpenRocket/Game.h

@@ -14,11 +14,12 @@
 
 using namespace std;
 
-static vector<GLuint> textures;
+
 
 class Game {
 private:
 	static Game* instance;
+	static vector<GLuint> textures;
 	GLuint backgroundVao;
 	GLuint backgroundVbo;
 	GLuint backgroundEbo;
@@ -103,12 +104,12 @@ class Game {
 
 	void CreateAsteroidBuffers();
 	void InitializeGlew();
-	void CreateShaders(const char* vertShader, const char* fragShader);
+	void CreateShaders();
 	void DestroyShaders(void);
 	void Cleanup(void);
 	void DestroyBackgroundVBO(void);
 
-	void InitializeGame(const char* vertShader, const char* fragShader);
+	void InitializeGame();
 	void RenderFunction(void);
 	void GenerateAsteroids(int nrOfAsteroids);
 	Asteroid* GenerateSingleAsteroid();

OpenRocket/OpenRocket/Source.cpp

@@ -10,7 +10,7 @@ int main(int argc, char* argv[]) {
 	glutInitDisplayMode(GLUT_SINGLE | GLUT_RGB);
 
 	Game* game = Game::getInstance();
-	game->InitializeGame("04_03_Shader.vert", "04_03_Shader.frag");
+	game->InitializeGame();
 	game->RenderFunction();
 
 	glutMainLoop();

OpenRocket/OpenRocket/Texturare_Shader.frag

@@ -15,6 +15,6 @@ out vec4 out_Color;
 void main(void)
   {
 
-	 out_Color = mix(texture(myTexture, tex_Coord), ex_Color, 0.2);
+	 out_Color = texture(myTexture, tex_Coord);
   }