X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?p=laserbrain_demo;a=blobdiff_plain;f=src%2Fshadow.cc;h=0f21abe024b57b6d36bb9aa7e03a416e608b7943;hp=357ed8245e605a9b2afea34665cc71765c6c0200;hb=6fd661e5b1462f28cb5c6a73ecc066ada09657b3;hpb=210e0808f65484b98af436587c46874695cf7453

diff --git a/src/shadow.cc b/src/shadow.cc
index 357ed82..0f21abe 100644
--- a/src/shadow.cc
+++ b/src/shadow.cc
@@ -2,7 +2,14 @@
 #include <assert.h>
 #include "opengl.h"
 #include "shadow.h"
+
+#undef DBG_USE_VMATH
+
+#ifdef DBG_USE_VMATH
 #include "vmath/vmath.h"
+#else
+#include "gmath/gmath.h"
+#endif
 
 
 bool shadow_pass;
@@ -67,6 +74,7 @@ void begin_shadow_pass(const gph::Vec3 &lpos, const gph::Vec3 &ltarg, float lfov
 	glColorMask(0, 0, 0, 0);
 	glDepthMask(1);
 
+#ifdef DBG_USE_VMATH
 	Matrix4x4 viewmat;
 	glGetFloatv(GL_MODELVIEW_MATRIX, viewmat[0]);
 	viewmat.transpose();
@@ -86,13 +94,12 @@ void begin_shadow_pass(const gph::Vec3 &lpos, const gph::Vec3 &ltarg, float lfov
 	glMatrixMode(GL_MODELVIEW);
 	glPushMatrix();
 	glLoadTransposeMatrixf(lt_viewmat[0]);
-
-
-	/*gph::Mat4 viewmat;
+#else
+	gph::Mat4 viewmat;
 	glGetFloatv(GL_MODELVIEW_MATRIX, viewmat[0]);
 
 	gph::Mat4 lt_viewmat, lt_projmat;
-	lt_projmat.perspective(deg_to_rad(lfov) * 2.0, 1.0, znear, zfar);
+	lt_projmat.perspective(gph::deg_to_rad(lfov) * 2.0, 1.0, znear, zfar);
 	lt_viewmat.inv_lookat(lpos, ltarg, gph::Vec3(0, 1, 0));
 	shadow_mat = lt_projmat * lt_viewmat * viewmat.inverse();
 	//shadow_mat = viewmat.inverse() * lt_viewmat * lt_projmat;
@@ -105,7 +112,7 @@ void begin_shadow_pass(const gph::Vec3 &lpos, const gph::Vec3 &ltarg, float lfov
 	glMatrixMode(GL_MODELVIEW);
 	glPushMatrix();
 	glLoadMatrixf(lt_viewmat[0]);
-	*/
+#endif
 
 	glGetIntegerv(GL_VIEWPORT, prev_vp);
 	glViewport(0, 0, tex_sz, tex_sz);