--- libgender/test.C 2004/11/04 04:46:58 1.80 +++ libgender/test.C 2004/11/06 01:56:20 1.89 @@ -15,6 +15,8 @@ #include "entity.h" #include "txtprt_import.h" +bool doom3parse (const char *f); + #include "shader.h" /**********************************************************************/ @@ -304,11 +306,11 @@ 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,23 +331,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.); @@ -353,9 +354,9 @@ 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; @@ -384,8 +385,8 @@ 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;