--- libgender/test.C	2004/10/23 21:43:27	1.70
+++ libgender/test.C	2004/11/06 00:44:50	1.84
@@ -15,6 +15,8 @@
 #include "entity.h"
 #include "txtprt_import.h"
 
+bool doom3parse (const char *f);
+
 #include "shader.h"
 
 /**********************************************************************/
@@ -30,6 +32,7 @@
   SDL_Surface *screen;
 
   screen = SDL_GetVideoSurface ();
+
   if (SDL_WM_ToggleFullScreen (screen))
     printf ("Toggled fullscreen mode - now %s\n",
             (screen->flags & SDL_FULLSCREEN) ? "fullscreen" : "windowed");
@@ -44,12 +47,14 @@
 
   printf ("Ctrl-G: toggling input grab!\n");
   mode = SDL_WM_GrabInput (SDL_GRAB_QUERY);
+
   if (mode == SDL_GRAB_ON)
     printf ("Grab was on\n");
   else
     printf ("Grab was off\n");
 
   mode = SDL_WM_GrabInput (mode ? SDL_GRAB_OFF : SDL_GRAB_ON);
+
   if (mode == SDL_GRAB_ON)
     printf ("Grab is now on\n");
   else
@@ -69,6 +74,7 @@
   int done;
 
   done = 0;
+
   switch (event->type)
     {
     case SDL_ACTIVEEVENT:
@@ -147,7 +153,7 @@
           pts.push_back (vertex_t2f_n3f_v3f (point (size, 0,    0), vec3 (0, 1, 0), tex2 (1, 0)));
 
           geometry_quads *q = new geometry_quads;
-          q->m = new simple_material;
+          //q->m = new simple_material;
           q->set (pts);
           entity *e = new entity (q);
           e->move (vec3 (dx + x * size, dy, dz + z * size));
@@ -167,7 +173,7 @@
 
 void fisch (vec3 center, GLfloat radius, int depth)
 {
-  entity *planet = new entity (new geometry_sphere (radius));
+  entity *planet = new entity (new geometry_sphere (testmat, radius));
   planet->move (center);
   planet->show ();
 
@@ -298,13 +304,16 @@
   if (gamma != 0.0)
     SDL_SetGamma (gamma, gamma, gamma);
 
-    entity *planet = new entity (new geometry_sphere (10));
-    planet->move (vec3 (0, 0, -20));
-    planet->show ();
 
-  shader::debdebdebdebug ();//D
 
-#if 1
+  testmat = new test_material;
+
+  entity *planet = new entity (new geometry_sphere (testmat, 10));
+  planet->move (vec3 (0, 0, -20));
+  planet->show ();
+
+  //doom3parse ("test.proc");
+
   for (int i = 0; i < 20; i++)
     {
       // load a entity
@@ -332,16 +341,26 @@
     }
 
     {
-      entity *planet = new entity (new geometry_sphere (4e15));
+      entity *planet = new entity (new geometry_sphere (testmat, 4e15));
       planet->move (vec3 (0, 0, 1e17));
       planet->show ();
     }
 
-  draw_floor (10, -500, -10, -1000);
+  //draw_floor (10, -500, -10, -1000);
   draw_level ();
-  //draw_test_nurb ();
+
+
+#if 0
+  {
+    geometry_heightfield *hf = new geometry_heightfield (100000., 100000.);
+    entity *e = new entity (hf);
+    e->move (vec3 (-100000, -100000 * 0.01, -100000));
+    e->show ();
+  }
 #endif
 
+  //draw_test_nurb ();
+
   //camera.orig.x = 108; camera.orig.y = 0; camera.orig.z = -368;
   camera.orig.x = 0; camera.orig.y = 0; camera.orig.z = 0;
   camera.p = point (0, 0, 10);
@@ -354,13 +373,16 @@
   glDisable (GL_ALPHA_TEST);
   glDisable (GL_BLEND);
 
-  init_shaders ();
-
-  osama_material osa_mat; 
-
   /* Loop until done. */
   frames = 0;
 
+  linear_light mylight;
+  mylight.radius = 100000;
+  mylight.c = colour (1., 1, 1, 1.);
+  mylight.intensity = 1.F;
+
+  pass pass_light (&mylight);
+
   while (!done)
     {
       char *sdl_error;
@@ -378,19 +400,20 @@
       camera.p = camera.p - camera.d * (camera_velocity_factor * timer.diff) * camera_velocity.z;
       camera.p = camera.p - camera.u * (camera_velocity_factor * timer.diff) * camera_velocity.y;
 
-      osa_mat.begin ();
+      mylight.orig = camera.orig;
+      mylight.p = camera.p;
 
+      //mylight.intensity = max (sinf (timer.now) + 1.2F, 0.2F);
+      
       camera.begin ();
-      camera.render (view::DEPTH);
-      camera.render (view::POSTDEPTH);
-      camera.render (view::LIGHTED);
+      camera.render (view::DEPTH, pass_depth);
+      camera.render (view::POSTDEPTH, pass_depth);
+      camera.render (view::LIGHTED, pass_light);
       camera.end ();
 
       SDL_GL_SwapBuffers ();
       timer.frame ();
 
-      osa_mat.end ();
-
 #if 0
       /* Check for error conditions. */
       gl_error = glGetError ();
@@ -413,7 +436,6 @@
       while (SDL_PollEvent (&event))
 	done = HandleEvent (&event);
 
-
       ++frames;
     }
 
@@ -422,6 +444,7 @@
       SDL_FreeSurface (global_image);
       global_image = NULL;
     }
+
   if (global_texture)
     {
       glDeleteTextures (1, &global_texture);