X-Git-Url: http://git.mutantstargoat.com?a=blobdiff_plain;ds=sidebyside;f=src%2Fmorph_renderer.cc;h=75351712414df314d44e47edfcd71fa5f8cdd810;hb=73b9db25a6deff93da45f3c45290ca8a56fefed3;hp=ae916258d9959aa2a9e504f4d21c333effe08674;hpb=978140660bed8a4bbe782dc5ca0516a80e1ba233;p=demo

diff --git a/src/morph_renderer.cc b/src/morph_renderer.cc
index ae91625..7535171 100644
--- a/src/morph_renderer.cc
+++ b/src/morph_renderer.cc
@@ -1,8 +1,10 @@
 #include "global.h"
 #include "morph_renderer.h"
+#include "object.h"
 #include "scene.h"
 #include "shader.h"
 #include "shader_manager.h"
+#include "texture.h"
 
 MorphRenderer::MorphRenderer()
 {
@@ -13,6 +15,8 @@ MorphRenderer::MorphRenderer()
 	/* we won't use them */
 	skytex = 0;
 	dskytex = 0;
+
+	fog_density = 0;
 }
 
 MorphRenderer::~MorphRenderer()
@@ -31,11 +35,17 @@ bool MorphRenderer::create()
 	spec_loc = sprog->get_uniform_location("specular");
 	shin_loc = sprog->get_uniform_location("shininess");
 	t_loc = sprog->get_uniform_location("t");
+	fog_loc = sprog->get_uniform_location("fog_density");
 
 	/* uniform locations for matrices */
 
 	mmviewproj_loc = sprog->get_uniform_location("mmviewproj");
 	mview_loc = sprog->get_uniform_location("mview");
+	mmod_loc = sprog->get_uniform_location("mmod");
+
+	dstex_loc = sprog->get_uniform_location("dstex");
+	if(dstex_loc != -1)
+		sprog->set_uniformi(dstex_loc, 1);
 
 	return true;
 }
@@ -48,19 +58,20 @@ void MorphRenderer::draw() const
 	if(!sprog->link())
 		return;
 
+	if(dskytex) {
+		dskytex->bind(1);
+	}
+
 	sprog->use();
 
 	for(size_t i=0; i<scene->objects.size(); i++) {
-		draw_object(scene->objects[i]);
-	}
-}
-
-void MorphRenderer::draw_object(Object *object) const
-{
-	float t =  (sin(time_sec) + 1) * 0.5;
+		float t = (sin(time_sec + 7.3 * noise(i * M_PI)) + 1) * 0.5;
+		if (t_loc != -1)
+			sprog->set_uniformf(t_loc, t);
 
-	if(t_loc != -1)
-		sprog->set_uniformf(t_loc, t);
+		if(mmod_loc != -1)
+			sprog->set_uniform_matrix(mmod_loc, scene->objects[i]->transform.upper3x3());
 
-	Renderer::draw_object(object);
+		draw_object(scene->objects[i]);
+	}
 }
\ No newline at end of file