--- libgender/test.C	2004/11/06 01:56:20	1.89
+++ libgender/test.C	2005/02/07 08:16:31	1.99
@@ -2,6 +2,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <math.h>
+#include <list>
 
 #include "opengl.h"
 
@@ -14,6 +15,7 @@
 #include "util.h"
 #include "entity.h"
 #include "txtprt_import.h"
+#include "randlvl.h"
 
 bool doom3parse (const char *f);
 
@@ -189,6 +191,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)
@@ -305,11 +318,15 @@
     SDL_SetGamma (gamma, gamma, gamma);
 
   testmat = new test_material;
+  testmat2 = new test_material2;
 
-  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 ();
 
+  planet->v = vec3 (10, 0, 0);
+  moveables.push_back (planet);
+
   doom3parse ("test.proc");
 
   for (int i = 0; i < 20; i++)
@@ -344,6 +361,26 @@
     planet->show ();
   }
 
+  {
+    RandomBuilding r;
+    entity *randlvl = r.draw (1000, 1000, 200);
+    randlvl->move (vec3 (0, 0, 0));
+    randlvl->show ();
+
+    entity *randlvl2 = r.draw (1000, 10000, 1000);
+    randlvl2->move (vec3 (-20000, 0, 0));
+    randlvl2->show ();
+
+    entity *randlvl3 = r.draw (100, 30, 3);
+    randlvl3->move (vec3 (-1000, 0, 0));
+    randlvl3->show ();
+
+
+    entity *randlvl4 = r.draw (100, 1000000, 100000);
+    randlvl4->move (vec3 (0, -1001000, 0));
+    randlvl4->show ();
+  }
+
   //draw_floor (10, -500, -10, -1000);
   draw_level ();
 
@@ -366,19 +403,25 @@
   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;
-  mylight.radius = 100000;
-  mylight.c = colour (1., 1, 1, 1.);
-  mylight.intensity = 1.F;
+  linear_light mylight2;//mylight, mylight2;
 
-  pass pass_light (&mylight);
+ // mylight.radius = 100000;
+ // mylight.c = colour (1., 1, 1, 1.);
+ // mylight.intensity = 1.F;
+
+  mylight2.radius = 100000;
+  mylight2.c = colour (1., 1., 1., 1.);
+  mylight2.intensity = 1.F;
+  mylight2.orig.x = 0; mylight2.orig.y = 0; mylight2.orig.z = 0;
+  mylight2.p.x = 0; mylight2.p.y = 0; mylight2.p.z = 0;
+
+  //pass_data pass_light (&mylight);
+  pass_data pass_light2 (&mylight2);
 
   while (!done)
     {
@@ -397,17 +440,23 @@
       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;
 
-      mylight.orig = camera.orig;
-      mylight.p = camera.p;
+      //mylight.orig = camera.orig;
+      //mylight.p = camera.p;
+
+      mylight2.orig = camera.orig;
+      mylight2.p = vec3 (sin (timer.now / 2) * 100000, 1, cos (timer.now / 2) * 100000);
 
       //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_light2);
+      //camera.render (view::LIGHTED, pass_light2);
       camera.end ();
 
+      perfom_moves ();
+
       SDL_GL_SwapBuffers ();
       timer.frame ();