X-Git-Url: http://git.mutantstargoat.com?a=blobdiff_plain;f=src%2Frenderer.cc;h=093b71e6efa83d5babd3a5208d3ef72a064b8802;hb=47982b199010496e34eefb95044275fb231cba18;hp=06efbee2068f26349de3ea4b6d211851b4d15b75;hpb=3bf3536271e4afa8a8a93c75e2ab1256c0bf718a;p=demo

diff --git a/src/renderer.cc b/src/renderer.cc
index 06efbee..093b71e 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,11 +14,20 @@
 #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;
 	camera = 0;
 	sprog = 0;
+
+	skytex = 0;
+	dskytex = 0;
 }
 
 Renderer::~Renderer()
@@ -24,11 +36,12 @@ 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;
 	}
 
@@ -69,6 +82,10 @@ void Renderer::draw() const
 	if(!camera || !scene)
 		return;
 
+	if(skytex) {
+		draw_skybox();
+	}
+
 	if(!sprog->link())
 		return;
 
@@ -102,6 +119,59 @@ void Renderer::draw_object(Object *object) const
 	Mat4 mview = object->transform * camera->get_view_matrix();
 	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