X-Git-Url: https://eleni.mutantstargoat.com/git/?p=demo;a=blobdiff_plain;f=src%2Frenderer.cc;h=380cf69ee2b5e0a35903c49cb1ef231a37620a47;hp=093b71e6efa83d5babd3a5208d3ef72a064b8802;hb=0d3454cbd5e803b8dea601110d403cd5563df9be;hpb=47982b199010496e34eefb95044275fb231cba18

diff --git a/src/renderer.cc b/src/renderer.cc
index 093b71e..380cf69 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 */
@@ -47,32 +49,14 @@ bool Renderer::create()
 
 	/* getting material uniform locations: diffuse, specular, specular exponent (strength) */
 
-	if((diff_loc = sprog->get_uniform_location("diffuse")) == -1) {
-		fprintf(stderr, "Invalid uniform location: can't find \"diffuse\".\n");
-		return false;
-	}
-
-	if((spec_loc = sprog->get_uniform_location("specular")) == -1) {
-		fprintf(stderr, "Invalid uniform location: can't find \"specular\".\n");
-		return false;
-	}
-
-	if((shin_loc = sprog->get_uniform_location("shininess")) == -1) {
-		fprintf(stderr, "Invalid uniform location: can't find \"shininess\".\n");
-		return false;
-	}
+	diff_loc = sprog->get_uniform_location("diffuse");
+	spec_loc = sprog->get_uniform_location("specular");
+	shin_loc = sprog->get_uniform_location("shininess");
 
 	/* uniform locations for matrices */
 
-	if((mmviewproj_loc = sprog->get_uniform_location("mmviewproj")) == -1) {
-		fprintf(stderr, "Invalid uniform location: can't find \"mmviewproj\".\n");
-		return false;
-	}
-
-	if((mview_loc = sprog->get_uniform_location("mview")) == -1) {
-		fprintf(stderr, "Invalid uniform location: can't find \"mview\".\n");
-		return false;
-	}
+	mmviewproj_loc = sprog->get_uniform_location("mmviewproj");
+	mview_loc = sprog->get_uniform_location("mview");
 
 	return true;
 }
@@ -102,9 +86,14 @@ void Renderer::draw_object(Object *object) const
 
 	/* setting uniforms for material */
 
-	sprog->set_uniformf(diff_loc, m->diffuse.x, m->diffuse.y, m->diffuse.z, 1);
-	sprog->set_uniformf(spec_loc, m->specular.x, m->specular.y, m->specular.z, 1);
-	sprog->set_uniformf(shin_loc, m->shininess);
+	if(diff_loc != -1)
+		sprog->set_uniformf(diff_loc, m->diffuse.x, m->diffuse.y, m->diffuse.z, 1);
+
+	if(spec_loc != -1)
+		sprog->set_uniformf(spec_loc, m->specular.x, m->specular.y, m->specular.z, 1);
+
+	if(shin_loc != -1)
+		sprog->set_uniformf(shin_loc, m->shininess);
 
 	/* texture */
 
@@ -114,14 +103,17 @@ void Renderer::draw_object(Object *object) const
 	/* setting uniforms for matrices */
 
 	Mat4 mmviewproj = object->transform * camera->get_view_matrix() * mprojection;
-	sprog->set_uniform_matrix(mmviewproj_loc, mmviewproj);
+	if(mmviewproj_loc != -1)
+		sprog->set_uniform_matrix(mmviewproj_loc, mmviewproj);
 
 	Mat4 mview = object->transform * camera->get_view_matrix();
-	sprog->set_uniform_matrix(mview_loc, mview);
+	if(mview_loc != -1)
+		sprog->set_uniform_matrix(mview_loc, mview);
 
 	object->mesh->draw();
 
-	/* debug
+	// debug
+#ifdef DRAW_NORMALS
 	if(nprog) {
 		int loc = nprog->get_uniform_location("mmviewproj");
 		if(loc != -1) {
@@ -129,10 +121,8 @@ 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)