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

diff --git a/src/renderer.cc b/src/renderer.cc
index 260c3cf..816e924 100644
--- a/src/renderer.cc
+++ b/src/renderer.cc
@@ -1,9 +1,12 @@
 #include <GL/glew.h>
+#include <gmath/gmath.h>
 
 #include "global.h"
+#include "gfxapi.h"
 
 #include "camera.h"
 #include "mesh.h"
+#include "meshgen.h"
 #include "object.h"
 #include "renderer.h"
 #include "scene.h"
@@ -11,6 +14,12 @@
 #include "shader_manager.h"
 #include "texture.h"
 
+/* skybox */
+
+static Mesh *skymesh; /* it will be used by many renderers => no destroy */
+static ShaderProgram *skyprog;
+static int viewproj_loc;
+
 Renderer::Renderer()
 {
 	scene = 0;
@@ -27,42 +36,25 @@ Renderer::~Renderer()
 
 bool Renderer::create()
 {
-	if(!(sprog = sdr_man->create_shader_program("default.v.glsl", "default.f.glsl"))) {
-		return false;
+	//debug
+	if(!(nprog = sdr_man->create_shader_program("debug.v.glsl", "debug.f.glsl"))) {
+		fprintf(stderr, "Failed to load debug shaders.\n");
 	}
 
-	if(!(sprog->link())) {
+	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");
-		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;
 }
@@ -72,6 +64,10 @@ void Renderer::draw() const
 	if(!camera || !scene)
 		return;
 
+	if(skytex) {
+		draw_skybox();
+	}
+
 	if(!sprog->link())
 		return;
 
@@ -88,9 +84,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 */
 
@@ -100,21 +101,67 @@ 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->update_vertex_data();
 	object->mesh->draw();
+
+	/* debug
+	if(nprog) {
+		int loc = nprog->get_uniform_location("mmviewproj");
+		if(loc != -1) {
+			nprog->set_uniform_matrix(loc, mmviewproj);
+		}
+		nprog->use();
+		object->mesh->draw_normals(1.0);
+	}
+	*/
+
+	// if(m->dtex)
+	// 	m->dtex->unbind();
 }
 
 void Renderer::set_sky_tex(Texture *stex)
 {
+	if(!skymesh) {
+		skymesh = gfx_create_mesh();
+		gen_geosphere(skymesh, 1, 0);
+	}
+	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;
 }
 
 void Renderer::set_diffuse_sky_tex(Texture *dstex)
 {
 	dskytex = dstex;
+}
+
+void Renderer::draw_skybox() const
+{
+	if(!skymesh || !skytex)
+		return;
+
+	gfx_zbuffer(false);
+	gfx_cull_face(GFX_CULL_NONE);
+
+	skytex->bind();
+	skyprog->use();
+
+	Mat4 mviewproj;
+	mviewproj = camera->get_view_matrix().upper3x3() * mprojection;
+	skyprog->set_uniform_matrix(viewproj_loc, mviewproj);
+
+	skymesh->draw();
+
+	gfx_cull_face(GFX_CULL_BACK);
+	gfx_zbuffer(true);
 }
\ No newline at end of file