X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fshadowmap.cpp;h=a9edacfc3f9282ca6c1128d351c21712922494c7;hb=ab83db6f1e31d44ced585119a57fd10896e469cb;hp=96539f1d4d70c2241e0699e60dc5da757595a961;hpb=656b4577fccfb02bea747871e5ab10148f002443;p=libs%2Fgl.git

diff --git a/source/shadowmap.cpp b/source/shadowmap.cpp
index 96539f1d..a9edacfc 100644
--- a/source/shadowmap.cpp
+++ b/source/shadowmap.cpp
@@ -1,17 +1,12 @@
-/* $Id$
-
-This file is part of libmspgl
-Copyright © 2009  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #include <cmath>
 #include <cstdlib>
 #include "light.h"
 #include "matrix.h"
 #include "misc.h"
+#include "renderer.h"
 #include "scene.h"
 #include "shadowmap.h"
+#include "texgen.h"
 #include "texunit.h"
 
 using namespace std;
@@ -19,9 +14,9 @@ using namespace std;
 namespace Msp {
 namespace GL {
 
-ShadowMap::ShadowMap(unsigned s, const Scene &c, const Light &l):
+ShadowMap::ShadowMap(unsigned s, const Renderable &r, const Light &l):
+	Effect(r),
 	size(s),
-	scene(c),
 	light(l),
 	unit(3),
 	radius(1)
@@ -45,8 +40,11 @@ void ShadowMap::set_texture_unit(unsigned u)
 	unit = u;
 }
 
-void ShadowMap::prepare()
+void ShadowMap::render(Renderer &renderer, const Tag &tag) const
 {
+	if(!enabled_passes.count(tag))
+		return renderable.render(renderer, tag);
+
 	Vector4 lpos = light.get_position();
 	if(lpos.w)
 	{
@@ -95,6 +93,8 @@ void ShadowMap::prepare()
 	matrix[11] = 0;
 	matrix[15] = 1;
 
+	renderer.escape();
+
 	{
 		MatrixStack::Push push_mv(MatrixStack::modelview());
 		MatrixStack::Push push_proj(MatrixStack::projection());
@@ -104,33 +104,27 @@ void ShadowMap::prepare()
 
 		Bind bind_fbo(fbo, true);
 		fbo.clear(DEPTH_BUFFER_BIT);
-		scene.render("shadow");
+		renderable.render("shadow");
 	}
 
+	// Has side effect of changing the current unit
 	depth_buf.bind_to(unit);
 	float diam = radius*2;
-	float s_eq[4] = { matrix[0]/diam, matrix[4]/diam, matrix[8]/diam, matrix[12]/diam+0.5 };
-	float t_eq[4] = { matrix[1]/diam, matrix[5]/diam, matrix[9]/diam, matrix[13]/diam+0.5 };
-	float r_eq[4] = { -matrix[2]/diam, -matrix[6]/diam, -matrix[10]/diam, 0.5-matrix[14]/diam-4.0/size };
-	glTexGeni(GL_S, GL_TEXTURE_GEN_MODE, GL_EYE_LINEAR);
-	glTexGenfv(GL_S, GL_EYE_PLANE, s_eq);
-	enable(GL_TEXTURE_GEN_S);
-	glTexGeni(GL_T, GL_TEXTURE_GEN_MODE, GL_EYE_LINEAR);
-	glTexGenfv(GL_T, GL_EYE_PLANE, t_eq);
-	enable(GL_TEXTURE_GEN_T);
-	glTexGeni(GL_R, GL_TEXTURE_GEN_MODE, GL_EYE_LINEAR);
-	glTexGenfv(GL_R, GL_EYE_PLANE, r_eq);
-	enable(GL_TEXTURE_GEN_R);
-
+	TexGen tg_s, tg_t, tg_r;
+	tg_s.set_plane(Vector4(matrix[0]/diam, matrix[4]/diam, matrix[8]/diam, matrix[12]/diam+0.5f));
+	tg_t.set_plane(Vector4(matrix[1]/diam, matrix[5]/diam, matrix[9]/diam, matrix[13]/diam+0.5f));
+	tg_r.set_plane(Vector4(-matrix[2]/diam, -matrix[6]/diam, -matrix[10]/diam, 0.5f-matrix[14]/diam-4.0f/size));
+	tg_s.bind_to(SCOORD);
+	tg_t.bind_to(TCOORD);
+	tg_r.bind_to(RCOORD);
 	TexUnit::activate(0);
-}
 
-void ShadowMap::cleanup()
-{
+	renderable.render(renderer, tag);
+
 	Texture::unbind_from(unit);
-	disable(GL_TEXTURE_GEN_S);
-	disable(GL_TEXTURE_GEN_T);
-	disable(GL_TEXTURE_GEN_R);
+	TexGen::unbind_from(SCOORD);
+	TexGen::unbind_from(TCOORD);
+	TexGen::unbind_from(RCOORD);
 	TexUnit::activate(0);
 }