--- libgender/test.C 2004/11/04 03:58:32 1.79 +++ 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" /**********************************************************************/ @@ -171,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 (); @@ -302,13 +304,15 @@ if (gamma != 0.0) SDL_SetGamma (gamma, gamma, gamma); + + testmat = new test_material; -#if 0 - entity *planet = new entity (new geometry_sphere (10)); + entity *planet = new entity (new geometry_sphere (testmat, 10)); planet->move (vec3 (0, 0, -20)); planet->show (); -#endif + + //doom3parse ("test.proc"); for (int i = 0; i < 20; i++) { @@ -329,7 +333,6 @@ e->show (); } -#if 0 { fisch (vec3 (0, 0, -2e9), 1e9, 8); //entity *planet = new entity (new geometry_sphere (1e9)); @@ -338,7 +341,7 @@ } { - 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 (); } @@ -347,15 +350,16 @@ draw_level (); +#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 (); -#endif //camera.orig.x = 108; camera.orig.y = 0; camera.orig.z = -368; camera.orig.x = 0; camera.orig.y = 0; camera.orig.z = 0; @@ -375,7 +379,7 @@ linear_light mylight; mylight.radius = 100000; mylight.c = colour (1., 1, 1, 1.); - mylight.intensity = 1.2; + mylight.intensity = 1.F; pass pass_light (&mylight);