--- libgender/test.C	2004/11/06 00:44:50	1.84
+++ libgender/test.C	2005/01/06 02:15:17	1.94
@@ -2,6 +2,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <math.h>
+#include <list>
 
 #include "opengl.h"
 
@@ -19,6 +20,8 @@
 
 #include "shader.h"
 
+#include "physics.h"
+
 /**********************************************************************/
 
 view camera;
@@ -189,6 +192,17 @@
 }
 
 extern void draw_level ();
+
+std::list<entity_moveable *> moveables;
+
+void perfom_moves ()
+{
+  for (std::list<entity_moveable *>::iterator i = moveables.begin (); i != moveables.end (); ++i)
+    {
+      (*i)->perform_step (timer.diff);
+    }
+}
+
 int
 RunGLTest (int argc, char *argv[],
 	   int logo, int slowly, int bpp, float gamma, int noframe, int fsaa)
@@ -304,15 +318,16 @@
   if (gamma != 0.0)
     SDL_SetGamma (gamma, gamma, gamma);
 
-
-
   testmat = new test_material;
 
-  entity *planet = new entity (new geometry_sphere (testmat, 10));
+  entity_moveable *planet = new entity_moveable (new geometry_sphere (testmat, 10));
   planet->move (vec3 (0, 0, -20));
   planet->show ();
 
-  //doom3parse ("test.proc");
+  planet->v = vec3 (10, 0, 0);
+  moveables.push_back (planet);
+
+  doom3parse ("test.proc");
 
   for (int i = 0; i < 20; i++)
     {
@@ -333,23 +348,22 @@
       e->show ();
     }
 
-    {
-      fisch (vec3 (0, 0, -2e9), 1e9, 8);
-      //entity *planet = new entity (new geometry_sphere (1e9));
-      //planet->move (vec3 (0, 0, -1.5e9));
-      //planet->show ();
-    }
+  {
+    fisch (vec3 (0, 0, -2e9), 1e9, 8);
+    //entity *planet = new entity (new geometry_sphere (1e9));
+    //planet->move (vec3 (0, 0, -1.5e9));
+    //planet->show ();
+  }
 
-    {
-      entity *planet = new entity (new geometry_sphere (testmat, 4e15));
-      planet->move (vec3 (0, 0, 1e17));
-      planet->show ();
-    }
+  {
+    entity *planet = new entity (new geometry_sphere (testmat, 4e15));
+    planet->move (vec3 (0, 0, 1e17));
+    planet->show ();
+  }
 
   //draw_floor (10, -500, -10, -1000);
   draw_level ();
 
-
 #if 0
   {
     geometry_heightfield *hf = new geometry_heightfield (100000., 100000.);
@@ -369,27 +383,31 @@
   camera.w = w; camera.h = h;
   camera.fov = 40.;
 
-  glEnable (GL_CULL_FACE);
   glDisable (GL_ALPHA_TEST);
-  glDisable (GL_BLEND);
 
   /* Loop until done. */
   frames = 0;
 
-  linear_light mylight;
+  linear_light mylight, mylight2;
+
   mylight.radius = 100000;
   mylight.c = colour (1., 1, 1, 1.);
   mylight.intensity = 1.F;
 
-  pass pass_light (&mylight);
+  mylight2.radius = 100000;
+  mylight2.c = colour (1., 0, 0, 1.);
+  mylight2.intensity = 1.F;
+
+  pass_data pass_light (&mylight);
+  pass_data pass_light2 (&mylight2);
 
   while (!done)
     {
       char *sdl_error;
       SDL_Event event;
 
-      camera_angle  += 180 * camera_velocity_angle  * timer.diff;
-      camera_angle2 += 180 * camera_velocity_angle2 * timer.diff;
+      camera_angle  += 90 * camera_velocity_angle  * timer.diff;
+      camera_angle2 += 90 * camera_velocity_angle2 * timer.diff;
 
       vec3 geradeaus = matrix::rotation (-camera_angle, vec3 (0, 1, 0)) * vec3 (0, 0, -1);
       vec3 right     = matrix::rotation (90., vec3 (0, 1, 0)) * geradeaus;
@@ -403,14 +421,20 @@
       mylight.orig = camera.orig;
       mylight.p = camera.p;
 
+      mylight2.orig = camera.orig;
+      mylight2.p = camera.p + vec3 (sin (timer.now * 2) * 100, 1, cos (timer.now * 2) * 100);
+
       //mylight.intensity = max (sinf (timer.now) + 1.2F, 0.2F);
       
       camera.begin ();
-      camera.render (view::DEPTH, pass_depth);
-      camera.render (view::POSTDEPTH, pass_depth);
-      camera.render (view::LIGHTED, pass_light);
+      camera.render (pass_depth);
+      camera.render (pass_postdepth);
+      camera.render (pass_light);
+      //camera.render (view::LIGHTED, pass_light2);
       camera.end ();
 
+      perfom_moves ();
+
       SDL_GL_SwapBuffers ();
       timer.frame ();