X-Git-Url: http://git.mutantstargoat.com?a=blobdiff_plain;f=src%2Frenderer.cc;h=fd18d55587956ffc8863358e52fcb0a4c802ce79;hb=8d1aef17df1bf15491ce4fd35242adcd58a9c411;hp=380cf69ee2b5e0a35903c49cb1ef231a37620a47;hpb=0d3454cbd5e803b8dea601110d403cd5563df9be;p=demo

diff --git a/src/renderer.cc b/src/renderer.cc
index 380cf69..fd18d55 100644
--- a/src/renderer.cc
+++ b/src/renderer.cc
@@ -30,6 +30,8 @@ Renderer::Renderer()
 
 	skytex = 0;
 	dskytex = 0;
+
+	fog_density = 0;
 }
 
 Renderer::~Renderer()
@@ -39,9 +41,9 @@ Renderer::~Renderer()
 bool Renderer::create()
 {
 	//debug
-	if(!(nprog = sdr_man->create_shader_program("debug.v.glsl", "debug.f.glsl"))) {
-		fprintf(stderr, "Failed to load debug shaders.\n");
-	}
+	// if(!(nprog = sdr_man->create_shader_program("debug.v.glsl", "debug.f.glsl"))) {
+	// 	fprintf(stderr, "Failed to load debug shaders.\n");
+	// }
 
 	if(!(sprog = sdr_man->create_shader_program("default.v.glsl", "default.f.glsl"))) {
 		return false;
@@ -52,11 +54,24 @@ bool Renderer::create()
 	diff_loc = sprog->get_uniform_location("diffuse");
 	spec_loc = sprog->get_uniform_location("specular");
 	shin_loc = sprog->get_uniform_location("shininess");
+	fog_loc = sprog->get_uniform_location("fog_density");
 
 	/* uniform locations for matrices */
 
 	mmviewproj_loc = sprog->get_uniform_location("mmviewproj");
 	mview_loc = sprog->get_uniform_location("mview");
+	mmod_loc = sprog->get_uniform_location("mmod");
+
+	/* skybox, irradiance map uniforms */
+
+	stex_loc = sprog->get_uniform_location("stex");
+	dstex_loc = sprog->get_uniform_location("dstex");
+
+	if(stex_loc != -1)
+		sprog->set_uniformi(stex_loc, 0);
+
+	if(dstex_loc != -1)
+		sprog->set_uniformi(dstex_loc, 1);
 
 	return true;
 }
@@ -68,6 +83,10 @@ void Renderer::draw() const
 
 	if(skytex) {
 		draw_skybox();
+
+		if(dskytex) {
+			dskytex->bind(1);
+		}
 	}
 
 	if(!sprog->link())
@@ -95,10 +114,13 @@ void Renderer::draw_object(Object *object) const
 	if(shin_loc != -1)
 		sprog->set_uniformf(shin_loc, m->shininess);
 
+	if(fog_loc != -1)
+		sprog->set_uniformf(fog_loc, fog_density);
+
 	/* texture */
 
 	if(m->dtex)
-		m->dtex->bind();
+		m->dtex->bind(0);
 
 	/* setting uniforms for matrices */
 
@@ -110,6 +132,10 @@ void Renderer::draw_object(Object *object) const
 	if(mview_loc != -1)
 		sprog->set_uniform_matrix(mview_loc, mview);
 
+	Mat4 mmod = object->transform.upper3x3();
+	if(mmod_loc != -1)
+		sprog->set_uniform_matrix(mmod_loc, mmod);
+
 	object->mesh->draw();
 
 	// debug