X-Git-Url: http://git.mutantstargoat.com?a=blobdiff_plain;f=src%2Frenderer.cc;h=18c93bb4fa9755854aa28a53dae1520969b7d271;hb=86c912d603be75ac8b2fdb2229f1696e9c0c01d9;hp=e11b9737adc6018af1913a1e9d3cd743532f4e02;hpb=d1a2cf93cf54898bb4ad442da94fc61f2617cf9f;p=demo

diff --git a/src/renderer.cc b/src/renderer.cc
index e11b973..18c93bb 100644
--- a/src/renderer.cc
+++ b/src/renderer.cc
@@ -1,5 +1,4 @@
 #include <GL/glew.h>
-#include <gmath/gmath.h>
 
 #include "global.h"
 #include "gfxapi.h"
@@ -13,12 +12,14 @@
 #include "shader.h"
 #include "shader_manager.h"
 #include "texture.h"
+#include "uniforms.h"
+
+#undef DRAW_NORMALS
 
 /* skybox */
 
 static Mesh *skymesh; /* it will be used by many renderers => no destroy */
 static ShaderProgram *skyprog;
-static int viewproj_loc;
 
 Renderer::Renderer()
 {
@@ -28,57 +29,62 @@ Renderer::Renderer()
 
 	skytex = 0;
 	dskytex = 0;
+
+	fog_density = 0;
+
+	vbuf = fbuf = svbuf = 0;
 }
 
 Renderer::~Renderer()
 {
+	delete vbuf;
+	delete fbuf;
+	delete svbuf;
 }
 
 bool Renderer::create()
 {
-	if(!(sprog = sdr_man->create_shader_program("default.v.glsl", "default.f.glsl"))) {
-		return false;
-	}
-
-	/* 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");
+	//debug
+	// if(!(nprog = sdr_man->create_shader_program("debug.v.glsl", "debug.f.glsl"))) {
+	//	fprintf(stderr, "Failed to load debug shaders.\n");
+	// }
+
+	vbuf = gfx_create_uniform_buffer();
+	if(!vbuf->create(sizeof vu)) {
+		fprintf(stderr, "Failed to create uniform buffer.\n");
 		return false;
 	}
 
-	if((shin_loc = sprog->get_uniform_location("shininess")) == -1) {
-		fprintf(stderr, "Invalid uniform location: can't find \"shininess\".\n");
+	fbuf = gfx_create_uniform_buffer();
+	if(!fbuf->create(sizeof fu)) {
+		fprintf(stderr, "Failed to create uniform buffer.\n");
 		return false;
 	}
 
-	/* uniform locations for matrices */
-
-	if((mmviewproj_loc = sprog->get_uniform_location("mmviewproj")) == -1) {
-		fprintf(stderr, "Invalid uniform location: can't find \"mmviewproj\".\n");
+	svbuf = gfx_create_uniform_buffer();
+	if(!svbuf->create(sizeof svu)) {
+		fprintf(stderr, "Failed to create uniform buffer.\n");
 		return false;
 	}
 
-	if((mview_loc = sprog->get_uniform_location("mview")) == -1) {
-		fprintf(stderr, "Invalid uniform location: can't find \"mview\".\n");
+	if(!(sprog = sdr_man->create_shader_program("default.v.glsl", "default.f.glsl"))) {
 		return false;
 	}
 
 	return true;
 }
 
-void Renderer::draw() const
+void Renderer::draw()
 {
 	if(!camera || !scene)
 		return;
 
 	if(skytex) {
 		draw_skybox();
+
+		if(dskytex) {
+			dskytex->bind(1);
+		}
 	}
 
 	if(!sprog->link())
@@ -91,31 +97,47 @@ void Renderer::draw() const
 	}
 }
 
-void Renderer::draw_object(Object *object) const
+void Renderer::draw_object(Object *object)
 {
 	Material *m = object->material;
 
 	/* 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);
+	fu.diffuse = Vec4(m->diffuse.x, m->diffuse.y, m->diffuse.z, 1.0);
+	fu.specular = Vec4(m->specular.x, m->specular.y, m->specular.z, 1.0);
+	fu.shininess = m->shininess;
+	fu.fog_density = fog_density;
+
+	fbuf->update(&fu);
+	fbuf->bind(SHADING_UNIFORMS);
 
 	/* texture */
 
 	if(m->dtex)
-		m->dtex->bind();
+		m->dtex->bind(0);
 
 	/* setting uniforms for matrices */
 
-	Mat4 mmviewproj = object->transform * camera->get_view_matrix() * mprojection;
-	sprog->set_uniform_matrix(mmviewproj_loc, mmviewproj);
+	vu.mview = object->transform * camera->get_view_matrix();
+	vu.mmviewproj = object->transform * camera->get_view_matrix() * mprojection;
+	vu.mmod = object->transform.upper3x3();
 
-	Mat4 mview = object->transform * camera->get_view_matrix();
-	sprog->set_uniform_matrix(mview_loc, mview);
+	vbuf->update(&vu);
+	vbuf->bind(MATRIX_UNIFORMS);
 
-	object->mesh->update_vertex_data();
 	object->mesh->draw();
+
+	// debug
+#ifdef DRAW_NORMALS
+	if(nprog) {
+		vu.mmviewproj = mmviewproj;
+		vbuf->update(&vu);
+		vbuf->bind(MATRIX_UNIFORMS);
+
+		nprog->use();
+		object->mesh->draw_normals(1.0);
+	}
+#endif
 }
 
 void Renderer::set_sky_tex(Texture *stex)
@@ -127,8 +149,6 @@ void Renderer::set_sky_tex(Texture *stex)
 	if(!skyprog) {
 		if(!(skyprog = sdr_man->create_shader_program("sky.v.glsl", "sky.f.glsl")))
 			return;
-		if((viewproj_loc = skyprog->get_uniform_location("mviewproj") == -1))
-			return;
 	}
 	skytex = stex;
 }
@@ -138,7 +158,7 @@ void Renderer::set_diffuse_sky_tex(Texture *dstex)
 	dskytex = dstex;
 }
 
-void Renderer::draw_skybox() const
+void Renderer::draw_skybox()
 {
 	if(!skymesh || !skytex)
 		return;
@@ -149,12 +169,12 @@ void Renderer::draw_skybox() const
 	skytex->bind();
 	skyprog->use();
 
-	Mat4 mviewproj;
-	mviewproj = camera->get_view_matrix().upper3x3() * mprojection;
-	skyprog->set_uniform_matrix(viewproj_loc, mviewproj);
+	svu.mviewproj = camera->get_view_matrix().upper3x3() * mprojection;
+	svbuf->update(&svu);
+	svbuf->bind(SKY_MATRIX_UNIFORMS);
 
 	skymesh->draw();
 
 	gfx_cull_face(GFX_CULL_BACK);
 	gfx_zbuffer(true);
-}
\ No newline at end of file
+}