Use the TexGen wrapper in ShadowMap

diff --git a/source/shadowmap.cpp b/source/shadowmap.cpp
index 5b2bacad4c4617ad7d617fd333edad7f5232f568..a9edacfc3f9282ca6c1128d351c21712922494c7 100644 (file)
--- a/source/shadowmap.cpp
+++ b/source/shadowmap.cpp
@@ -6,6 +6,7 @@
 #include "renderer.h"
 #include "scene.h"
 #include "shadowmap.h"
+#include "texgen.h"
 #include "texunit.h"
 
 using namespace std;
@@ -106,29 +107,24 @@ void ShadowMap::render(Renderer &renderer, const Tag &tag) const
                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.5f };
-       float t_eq[4] = { matrix[1]/diam, matrix[5]/diam, matrix[9]/diam, matrix[13]/diam+0.5f };
-       float r_eq[4] = { -matrix[2]/diam, -matrix[6]/diam, -matrix[10]/diam, 0.5f-matrix[14]/diam-4.0f/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);
 
        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);
 }