X-Git-Url: http://git.mutantstargoat.com?a=blobdiff_plain;f=src%2Frenderer.cc;h=b4decc4b39c78c609ec035d8a70a027298b016c0;hb=198fff0ac38a65f6c2db8d9061e47481febfb008;hp=816e924cbb7109bb041bede3bba5a192981cd617;hpb=fd601d4218b63fdf92c5e4dfa32eac8adbda82fa;p=demo

diff --git a/src/renderer.cc b/src/renderer.cc
index 816e924..b4decc4 100644
--- a/src/renderer.cc
+++ b/src/renderer.cc
@@ -14,6 +14,8 @@
 #include "shader_manager.h"
 #include "texture.h"
 
+#undef DRAW_NORMALS
+
 /* skybox */
 
 static Mesh *skymesh; /* it will be used by many renderers => no destroy */
@@ -28,6 +30,8 @@ Renderer::Renderer()
 
 	skytex = 0;
 	dskytex = 0;
+
+	fog_density = 0;
 }
 
 Renderer::~Renderer()
@@ -50,6 +54,7 @@ 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 */
 
@@ -93,10 +98,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,7 +118,8 @@ void Renderer::draw_object(Object *object) const
 
 	object->mesh->draw();
 
-	/* debug
+	// debug
+#ifdef DRAW_NORMALS
 	if(nprog) {
 		int loc = nprog->get_uniform_location("mmviewproj");
 		if(loc != -1) {
@@ -119,10 +128,7 @@ void Renderer::draw_object(Object *object) const
 		nprog->use();
 		object->mesh->draw_normals(1.0);
 	}
-	*/
-
-	// if(m->dtex)
-	// 	m->dtex->unbind();
+#endif
 }
 
 void Renderer::set_sky_tex(Texture *stex)