X-Git-Url: http://git.mutantstargoat.com?p=demo;a=blobdiff_plain;f=src%2Frenderer.cc;h=f30c1ef52e695864f098ad35b039836864b7def3;hp=353d0db39543cc7a737418aae0011336489edeb4;hb=63d7f3b0e70ab5e3d530c579b1881967c96b0b92;hpb=fcd6773bc770425ede4b47a84eef7cc78342542c

diff --git a/src/renderer.cc b/src/renderer.cc
index 353d0db..f30c1ef 100644
--- a/src/renderer.cc
+++ b/src/renderer.cc
@@ -1,11 +1,15 @@
+#include <GL/glew.h>
+
 #include "global.h"
 
 #include "camera.h"
+#include "mesh.h"
 #include "object.h"
 #include "renderer.h"
 #include "scene.h"
 #include "shader.h"
 #include "shader_manager.h"
+#include "texture.h"
 
 Renderer::Renderer()
 {
@@ -19,10 +23,11 @@ Renderer::~Renderer()
 }
 
 bool Renderer::create()
-{	
+{
 	if(!(sprog = sdr_man->create_shader_program("default.v.glsl", "default.f.glsl"))) {
 		return false;
 	}
+
 	return true;
 }
 
@@ -31,9 +36,60 @@ void Renderer::draw() const
 	if(!camera || !scene)
 		return;
 
-	// sprog->set_uniform_matrix(mview_loc, camera->get_view_matrix());
+	glClearColor(0.5, 0.5, 0.5, 1);
+	glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+
+	if(!sprog->link())
+		return;
+
+	sprog->use();
+
+	for(size_t i=0; i<scene->objects.size(); i++) {
+		draw_object(scene->objects[i]);
+	}
 }
 
 void Renderer::draw_object(Object *object) const
 {
+	Material *m = object->material;
+	/* diffuse */
+	int diff_loc;
+	if((diff_loc = sprog->get_uniform_location("diffuse")) != -1) {
+		sprog->set_uniformf(diff_loc, m->diffuse.x, m->diffuse.y, m->diffuse.z, 1);
+	}
+	/* specular */
+	int spec_loc;
+	if((spec_loc = sprog->get_uniform_location("specular")) != -1) {
+		sprog->set_uniformf(spec_loc, m->specular.x, m->specular.y, m->specular.z, 1);
+	}
+	/* specular exponent */
+	int shin_loc;
+	if((shin_loc = sprog->get_uniform_location("shininess")) != -1) {
+		sprog->set_uniformf(shin_loc, m->shininess);
+	}
+	/* texture */
+	if (m->dtex)
+		m->dtex->bind();
+
+	// Mat4 mmviewproj = mprojection * camera->get_view_matrix() * object->transform;
+	Mat4 mmviewproj = object->transform * camera->get_view_matrix() * mprojection;
+	// printf("\nmatrices:\n");
+	// mprojection.print();
+	// camera->get_view_matrix().print();
+	// object->transform.print();
+	// mmodelview.print();
+
+	int mmviewproj_loc;
+	if((mmviewproj_loc = sprog->get_uniform_location("mmviewproj")) != -1) {
+		sprog->set_uniform_matrix(mmviewproj_loc, mmviewproj);
+	}
+
+	Mat4 mview = camera->get_view_matrix(); //* object->transform;
+	int mview_loc;
+	if((mview_loc = sprog->get_uniform_location("mview")) != -1) {
+		sprog->set_uniform_matrix(mview_loc, mview);
+	}
+
+	object->mesh->update_vertex_data();
+	object->mesh->draw();
 }
\ No newline at end of file