[ViewVC] Diff of: cvs/libgender/view.h

Comparing libgender/view.h (file contents):
Revision 1.32 by root, Wed Nov 3 03:35:13 2004 UTC vs.
Revision 1.33 by root, Sat Nov 6 00:06:33 2004 UTC

   ~view ();
 };
 struct light : view
 {
-  shader::uniform_4f lightpos;
+  // the following variables are valid in the fragment shader as well as in the vertex shader
+  bool has_lightvec;           // is a light vector available?
+  shader::temp_3f sh_lightvec; // not defined unless has_lightvec is true
+  shader::temp_3f sh_colour;   // always available for any light
   // vertex shader
   virtual void vsh () = 0;
   // fragment shader
-  virtual shader::temp_3f operator ()() = 0;
+  virtual void fsh () = 0;
   virtual void enable ();
   virtual void disable ();
+protected:
+  shader::uniform_3f lightpos; // or direction
 };
 struct linear_light : light
 {
   colour c;
   GLfloat intensity;
   GLfloat radius;
   void vsh ();
-  shader::temp_3f operator ()();
+  void fsh ();
 };
 #endif

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