Texture + Lights intro

data/shaders/normal.fs

@@ -5,7 +5,12 @@ varying vec3 v_normal;
 varying vec2 v_uv;
 varying vec4 v_color;
 
+uniform sampler2D u_texture;
+
 void main()
 {
-	gl_FragColor = vec4(v_normal,1.0);
+
+
+	vec4 albedo = texture2D(u_texture, v_uv);	
+	gl_FragColor = albedo;
 }

src/application.cpp

@@ -45,13 +45,24 @@ Application::Application(int window_width, int window_height, SDL_Window* window
 	camera->setPerspective(45.f,window_width/(float)window_height,0.1f,10000.f); //set the projection, we want to be perspective
 
 	{
+		// HELMET MODEL
 		StandardMaterial* mat = new StandardMaterial();
+		Texture* albedo = Texture::Get("data/models/helmet/albedo.png");
+		mat->texture = albedo;
 		SceneNode* node = new SceneNode("Visible node");
-		node->mesh = Mesh::Get("data/meshes/sphere.obj.mbin");
+		node->mesh = Mesh::Get("data/models/helmet/helmet.obj.mbin");
 		//node->model.scale(5, 5, 5);
 		node->material = mat;
 		mat->shader = Shader::Get("data/shaders/basic.vs", "data/shaders/normal.fs");
 		node_list.push_back(node);
+
+		// LIGHT
+		Light* light = new Light("first light");
+		light->ambient = Vector3(1.0, 0.0, 0.0);
+		light->specular = Vector3(1.0, 1.0, 1.0);
+		light->difuse = Vector3(1.0, 1.0, 1.0);
+		light->position = Vector3(-10.0 , 10.0, 10.0);
+
 	}
 
 	//hide the cursor

src/application.h

@@ -24,6 +24,7 @@ class Application
 	static Application* instance;
 
 	std::vector< SceneNode* > node_list;
+	std::vector< Light* > light_list;
 
 	//window
 	SDL_Window* window;

src/scenenode.cpp

@@ -65,3 +65,8 @@ void SceneNode::renderInMenu()
 		ImGui::TreePop();
 	}
 }
+
+Light::Light(std::string name)
+{
+	this->name = name;
+}

src/scenenode.h

@@ -8,7 +8,20 @@
 #include "camera.h"
 #include "material.h"
 
-class Light;
+class Light {
+public:
+
+	Light(std::string name);
+	~Light();
+
+	Vector3 ambient;
+	Vector3 difuse;
+	Vector3 specular;
+	Vector3 position;
+
+	std::string name;
+
+};
 
 class SceneNode {
 public: