[ViewVC] Diff of: cvs/libgender/shader.C

Comparing libgender/shader.C (file contents):
Revision 1.17 by root, Thu Oct 28 15:17:25 2004 UTC vs.
Revision 1.18 by root, Thu Oct 28 17:00:46 2004 UTC

 #include "shader_vars.h"
 #include <sstream>
 #include <iomanip>
-using namespace std;
 namespace shader {
+  using namespace std;
   refcounted::~refcounted ()
   {
-#if 1
     if (refcnt)
       abort ();
-#endif
   }
   void refcounted::refcnt_dec () const
   {
     if (!--refcnt)
     vertex_shader vsh;
     vsh->start ();
     temp_4f lightpos;
-    temp_3f wpos;
+    temp_4f wpos;
     lightpos = vec4 (0, 10, 0, 1);
-    wpos = xyz (gl.model_view_matrix * vin.vertex);
+    wpos = gl.model_view_matrix * vin.vertex;
     vout.position = vin.vertex * gl.model_view_matrix_inverse;
     vout.tex_coord[0] = vin.tex_coord[0];
-    vout.tex_coord[1] = normalize (xyz (lightpos) - wpos);
+    vout.tex_coord[1] = normalize (lightpos - wpos);
-    vout.tex_coord[2] = normalize (xyzx (wpos));
+    vout.tex_coord[2] = normalize (wpos);
     //vout.tex_coord[3] = normalize (xyz (gl.model_view_matrix_inverse_transpose) * vin.normal);
     //vout.tex_coord[4] = normalize (xyz (gl.projection_matrix_inverse_transpose) - wpos);
     vsh->end ();
     vsh->compile ();

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines