--- libgender/view.C	2004/10/06 01:41:30	1.18
+++ libgender/view.C	2004/10/06 17:55:40	1.32
@@ -1,8 +1,12 @@
 #include <cmath>
 
+#include <GL/gl.h>
+#include <GL/glext.h>
+
 #include "oct.h"
 #include "view.h"
 
+      static GLenum gl_error;
 view::view ()
 : gamma(1.0)
 {
@@ -30,29 +34,36 @@
   glMatrixMode (GL_PROJECTION);
   glLoadIdentity ();
 
+      gl_error = glGetError ();
   GLdouble aspect = (GLdouble)w/h;
   GLdouble zNear = 0.1;
   GLdouble zFar = 50.;
 
+      gl_error = glGetError ();
   GLdouble ymax = zNear * tan (fov * (M_PI / 360.0));
   glFrustum (-ymax * aspect, ymax * aspect, -ymax, ymax, zNear, zFar);
 
+      gl_error = glGetError ();
   d = normalize (d);//D
   u = normalize (u);//D
   vec3 rz = -d;
   vec3 rx = cross (u, rz);
   vec3 ry = cross (rz, rx);
+      gl_error = glGetError ();
 
   matrix &m = projection;
   m(0,0) = rx.x; m(0,1) = rx.y; m(0,2) = rx.z; m(0,3) = 0;
   m(1,0) = ry.x; m(1,1) = ry.y; m(1,2) = ry.z; m(1,3) = 0;
   m(2,0) = rz.x; m(2,1) = rz.y; m(2,2) = rz.z; m(2,3) = 0;
   m(3,0) =    0; m(3,1) =    0; m(3,2) =    0; m(3,3) = 1;
+      gl_error = glGetError ();
 
   glMultMatrixf ((GLfloat *)m.data);
 
+      gl_error = glGetError ();
   glGetFloatv (GL_PROJECTION_MATRIX, (GLfloat *)&m);
 
+      gl_error = glGetError ();
   frustum.l = plane ( m(3,0) + m(0,0), m(3,1) + m(0,1), m(3,2) + m(0,2), m(3,3) + m(0,3) );
   frustum.r = plane ( m(3,0) - m(0,0), m(3,1) - m(0,1), m(3,2) - m(0,2), m(3,3) - m(0,3) );
   frustum.b = plane ( m(3,0) + m(1,0), m(3,1) + m(1,1), m(3,2) + m(1,2), m(3,3) + m(1,3) );
@@ -60,21 +71,37 @@
   frustum.n = plane ( m(3,0) + m(2,0), m(3,1) + m(2,1), m(3,2) + m(2,2), m(3,3) + m(2,3) );
   frustum.f = plane ( m(3,0) - m(2,0), m(3,1) - m(2,1), m(3,2) - m(2,2), m(3,3) - m(2,3) );
 
+      gl_error = glGetError ();
   glMatrixMode (GL_MODELVIEW);
   glLoadIdentity ();
   glTranslatef (-p.x, -p.y, -p.z);
+      gl_error = glGetError ();
 }
 
 void view::begin ()
 {
+  glClear (GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+  glDepthRange (0, 1. - (1. / pow (2., 16.)));
+
   vismap.clear ();
+  vislist.clear ();
 
   generation++;
 
   reset_projection ();
 
+  for (vector<octant *>::iterator i = farlist.begin (); i != farlist.end (); ++i)
+    ;
+  farlist.clear ();
+
   // check occlusion queries here
+#if 0
+  for (vector<octant *>::iterator i = checklist.begin (); i != checklist.end (); ++i)
+    //printf ("%p %d\n", *i, occ_query_result ((*i)->occ_query));
+    occ_query_result ((*i)->occ_query);
+
   checklist.clear ();
+#endif
 
   world.detect_visibility (*this);
 }
@@ -98,8 +125,8 @@
       glDepthFunc (GL_LESS);
       glDisable (GL_LIGHTING);
       glColorMask (0, 0, 0, 0);
-      //cgGLDisableProfile (CG_PROFILE_ARBVP1);
-      cgGLDisableProfile (CG_PROFILE_ARBFP1);
+      cgGLEnableProfile (vsh_profile);// z-fighting??
+      cgGLDisableProfile (fsh_profile);
     }
   else
     {
@@ -107,8 +134,8 @@
       glDisable (GL_POLYGON_OFFSET_FILL);
       glDepthFunc (GL_LESS);
       glDepthMask (0);
-      cgGLEnableProfile (CG_PROFILE_ARBVP1);
-      cgGLEnableProfile (CG_PROFILE_ARBFP1);
+      cgGLEnableProfile (vsh_profile);
+      cgGLEnableProfile (fsh_profile);
     }
   
   for (vector<octant *>::iterator i = vislist.begin (); i != vislist.end (); ++i)
@@ -116,8 +143,36 @@
 
   drawn.clear ();
 
+  if (mode == view::LIGHTED)
+    {
+      glEnable (GL_DEPTH_CLAMP_NV);
+      glDepthFunc (GL_LESS);
+      glEnable (GL_COLOR_MATERIAL);
+      glDisable (GL_LIGHTING);
+#if 1
+      cgGLDisableProfile (vsh_profile);
+      cgGLDisableProfile (fsh_profile);
+#endif
+      glShadeModel (GL_FLAT);
+
+      static int count; count++;
+      if (farlist.size ())
+        printf ("%d: size %d\n", count, farlist.size ());
+
+     for (vector<octant *>::iterator i = farlist.begin (); i != farlist.end (); ++i)
+       {
+        glColor3f (1 / (GLfloat)(i - farlist.begin()), 1, 1 / (GLfloat)(i - farlist.begin()));
+        (*i)->draw_bbox (*this);
+       }
+
+      glEnable (GL_DEPTH_TEST);
+      glDisable (GL_DEPTH_CLAMP_NV);
+      glShadeModel (GL_SMOOTH);
+    }
+
   glColorMask (1, 1, 1, 0);
   glDepthMask (1);
+
 }