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

Comparing libgender/shader.C (file contents):
Revision 1.14 by root, Sun Oct 24 17:10:04 2004 UTC vs.
Revision 1.15 by root, Sun Oct 24 20:01:08 2004 UTC

   program_object::program_object ()
   {
     id = glCreateProgramObjectARB ();
     assert (id);
-  }
-  program_object::~program_object ()
-  {
-    glDeleteProgramsARB (1, &id);
-  }
-  void program_object::link ()
-  {
     glAttachObjectARB (id, vsh->id);
     glAttachObjectARB (id, fsh->id);
+  }
+  program_object::~program_object ()
+  {
+    glDeleteProgramsARB (1, &id);
+  }
+  void program_object::link ()
+  {
     glLinkProgramARB (id);
     GLint linked;
     glGetObjectParameterivARB (id, GL_OBJECT_LINK_STATUS_ARB, &linked);
     lightpos = vec4 (0, 10, 0, 1);
     wpos = xyz (gl.model_view_matrix * vin.vertex);
     vout.position = gl.model_view_matrix_inverse_transpose * vin.vertex;
     vout.tex_coord[0] = vin.tex_coord[0];
-    vout.tex_coord[1] = normalize (lightpos - wpos);
+    vout.tex_coord[1] = normalize (xyz (lightpos) - wpos);
-    vout.tex_coord[2] = normalize (wpos);
+    vout.tex_coord[2] = normalize (xyzx (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