--- libgender/test.C	2004/10/03 04:00:51	1.9
+++ libgender/test.C	2004/10/04 02:32:20	1.17
@@ -311,12 +311,34 @@
     }
 
   /* Set the window manager title bar */
-  SDL_WM_SetCaption ("SDL GL test", "testgl");
+  SDL_WM_SetCaption ("libgender rendering test", "gendertest");
 
   /* Set the gamma for the window */
   if (gamma != 0.0)
     SDL_SetGamma (gamma, gamma, gamma);
 
+  // load a entity
+  for (int i = 0; i < 7; i++)
+    {
+      txtprt_parser p;
+      entity_anim *f = new entity_anim;
+      entity *e;
+      try
+      {
+        e = p.read ("test.blasc");
+      } catch (txtprt_i_exception & e)
+      {
+        cout << "ERR: " << e.msg << endl;
+      }
+      f->set (e);
+      f->m.translate (vec3 (i, -1, 0));
+      f->vx = 0;
+      f->vy = 0;
+      f->vz = 0;
+      f->show ();
+    }
+
+  camera.orig.x = camera.orig.y = camera.orig.z = 0;
   camera.p = point (0, 0, 10);
   camera.d = vec3 (0, 0, -1);
   camera.u = vec3 (0, 1, 0);
@@ -326,23 +348,22 @@
   glMatrixMode (GL_MODELVIEW);
   glLoadIdentity ();
 
+  glEnable (GL_CULL_FACE);
   glEnable (GL_DEPTH_TEST);
-
-  glDepthFunc (GL_LESS);
-
   glShadeModel (GL_SMOOTH);
 
   glEnable (GL_LIGHTING);
-
   //GLfloat lightc[4] = { 1, 0.1, 0.1, 1 };
   //glLightf (GL_LIGHT0, GL_QUADRATIC_ATTENUATION);
   //glLightfv (GL_LIGHT0, GL_DIFFUSE, lightc);
   glEnable (GL_LIGHT0);
-  glEnable (GL_COLOR_MATERIAL);
 
   /* Loop until done. */
   start_time = SDL_GetTicks ();
   frames = 0;
+
+  draw_context c (camera);
+
   while (!done)
     {
       GLenum gl_error;
@@ -362,16 +383,20 @@
 
 #if 0
       static GLfloat ry;
-      ry += 0.03;
-      v.d.x = cos (ry);
-      v.d.z = sin (ry);
+      ry += 0.001;
+      camera.d.x = cos (ry);
+      camera.d.z = sin (ry);
+      //camera.d.y = sin (ry * 0.1);
 #endif
 
-      draw_context c;
+      c.mode = draw_context::DEPTH;  
+      camera.draw (c);
+      c.drawn.clear ();
       c.mode = draw_context::LIGHTED;
       camera.draw (c);
 
       SDL_GL_SwapBuffers ();
+      timer.frame ();
 
       /* Check for error conditions. */
       gl_error = glGetError ();
@@ -433,16 +458,6 @@
   int noframe = 0;
   int fsaa = 0;
 
-  // load a entity
-  txtprt_parser p;
-  entity *e;
-  try {
-     e = p.read ("test.blasc");
-  } catch (txtprt_i_exception & e) {
-     cout << "ERR: " << e.msg << endl;
-  }
-  e->show ();
-
   logo = 0;
   slowly = 0;
   numtests = 1;
@@ -480,9 +495,9 @@
 	  exit (0);
 	}
     }
+
   for (i = 0; i < numtests; ++i)
-    {
-      RunGLTest (argc, argv, logo, slowly, bpp, gamma, noframe, fsaa);
-    }
+    RunGLTest (argc, argv, logo, slowly, bpp, gamma, noframe, fsaa);
+
   return 0;
 }