[testing] shader ddoesnt work, still on it

src/main.cpp

@@ -3,6 +3,7 @@
 #include <glm/gtc/matrix_transform.hpp>
 #define STB_IMAGE_IMPLEMENTATION
 #include <iostream>
+#include <map>
 
 #include "stb_image.h"
 #include <ostream>
@@ -16,6 +17,9 @@
 #include "renderEngine/renderer.h"
 #include "shaders/entity_shader.h"
 #include "toolbox/toolbox.h"
+#include "scenes/scene.h"
+#include "scenes/in_Game_Scene.h"
+#include "scenes/startup_Scene.h"
 
 #pragma comment(lib, "glfw3.lib")
 #pragma comment(lib, "glew32s.lib")
@@ -23,8 +27,9 @@
 
 static double UpdateDelta();
 
-static GLFWwindow* window;
-
+GLFWwindow* window;
+std::map<scene::Scenes, scene::Scene*> scenes;
+scene::Scene* current_scene = nullptr;
 
 int main(void)
 {
@@ -44,42 +49,48 @@ int main(void)
 
     glfwSetKeyCallback(window, [](GLFWwindow* window, int key, int scancode, int action, int mods)
     {
+            current_scene->onKey(key, scancode, action, mods);
 	    if (key == GLFW_KEY_ESCAPE)
 	        glfwSetWindowShouldClose(window, true);
     });
+
+
+    scenes[scene::Scenes::STARTUP] = new scene::Startup_Scene();
+    scenes[scene::Scenes::INGAME] = new scene::In_Game_Scene();
+    current_scene = scenes[scene::Scenes::STARTUP];
 	
 	
-    models::RawModel raw_model = render_engine::LoadObjModel("res/House.obj");
+   /* models::RawModel raw_model = render_engine::LoadObjModel("res/House.obj");
     models::ModelTexture texture = { render_engine::loader::LoadTexture("res/Texture.png") };
     texture.shine_damper = 10;
     texture.reflectivity = 0;
-    models::TexturedModel model = { raw_model, texture };
+    models::TexturedModel model = { raw_model, texture };*/
 
     /**
     * load and add some models (in this case some level sections) to the entities list.
     * */
-    std::vector<entities::Entity> entities;
+    /*std::vector<entities::Entity> entities;
     int z = 0;
     for (int i = 0; i < 5; ++i)
     {
         entities.push_back(entities::Entity(model, glm::vec3(0, -50, -50 - z), glm::vec3(0, 90, 0), 20));
         z += (raw_model.model_size.x * 20);
-    }
+    }*/
 
-    std::vector<entities::Light> lights;
+   /* std::vector<entities::Light> lights;
     lights.push_back(entities::Light(glm::vec3(0, 1000, -7000), glm::vec3(5, 5, 5)));
     lights.push_back(entities::Light(glm::vec3(0, 0, -30), glm::vec3(2, 0, 2), glm::vec3(0.0001f, 0.0001f, 0.0001f)));
-    lights.push_back(entities::Light(glm::vec3(0, 0, -200), glm::vec3(0, 2, 0), glm::vec3(0.0001f, 0.0001f, 0.0001f)));
+    lights.push_back(entities::Light(glm::vec3(0, 0, -200), glm::vec3(0, 2, 0), glm::vec3(0.0001f, 0.0001f, 0.0001f)));*/
 
-	shaders::EntityShader shader;
+	/*shaders::EntityShader shader;
     shader.Init();
-    render_engine::renderer::Init(shader);
+    render_engine::renderer::Init(shader);*/
 
-    entities::Camera camera(glm::vec3(0, 0, 0), glm::vec3(0, 0, 0));
+    //entities::Camera camera(glm::vec3(0, 0, 0), glm::vec3(0, 0, 0));
 
 
 	// GUI stuff
-    shaders::GuiShader gui_shader;
+   /* shaders::GuiShader gui_shader;
     gui_shader.Init();
 	
     std::vector<gui::GuiTexture*> guis;
@@ -91,36 +102,38 @@ int main(void)
             std::cout << "I got clicked on!" << std::endl;
         });
     guis.push_back(&button);
-	
+	*/
 	
 	// Main game loop
 	while (!glfwWindowShouldClose(window))
 	{
         // Update
         const double delta = UpdateDelta();
-        camera.Move(window);
-        button.Update(window);
+        //camera.Move(window);
+        current_scene->update();
+       // button.Update(window);
 
+        current_scene->render();
 		// Render
-        render_engine::renderer::Prepare();
+        //render_engine::renderer::Prepare();
 		
 		// Start rendering the entities
-        shader.Start();
-        shader.LoadSkyColor(render_engine::renderer::SKY_COLOR);
-        shader.LoadLights(lights);
-        shader.LoadViewMatrix(camera);
+        //shader.Start();
+        //shader.LoadSkyColor(render_engine::renderer::SKY_COLOR);
+        //shader.LoadLights(lights);
+        //shader.LoadViewMatrix(camera);
 		
         // Renders each entity in the entities list
-		for (entities::Entity& entity : entities)
+	/*	for (entities::Entity& entity : entities)
 		{
             render_engine::renderer::Render(entity, shader);
-		}
+		}*/
 
 		// Stop rendering the entities
-        shader.Stop();
+        //shader.Stop();
 
         // Render GUI items
-        render_engine::renderer::Render(guis, gui_shader);
+        //render_engine::renderer::Render(guis, gui_shader);
 
         // Finish up
 		glfwSwapBuffers(window);
@@ -128,8 +141,8 @@ int main(void)
 	}
 
 	// Clean up
-    shader.CleanUp();
-    gui_shader.CleanUp();
+    //shader.CleanUp();
+   // gui_shader.CleanUp();
     render_engine::loader::CleanUp();
 	glfwTerminate();
     return 0;