ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/libgender/test.C
(Generate patch)

Comparing libgender/test.C (file contents):
Revision 1.9 by root, Sun Oct 3 04:00:51 2004 UTC vs.
Revision 1.99 by root, Mon Feb 7 08:16:31 2005 UTC

1#include <stdlib.h> 1#include <stdlib.h>
2#include <stdio.h> 2#include <stdio.h>
3#include <string.h> 3#include <string.h>
4#include <math.h> 4#include <math.h>
5#include <list>
6
7#include "opengl.h"
5 8
6#include "SDL.h" 9#include "SDL.h"
7
8#include "SDL_opengl.h" 10#include "SDL_opengl.h"
9
10/* Undefine this if you want a flat cube instead of a rainbow cube */
11#define SHADED_CUBE
12
13/* Define this to be the name of the logo image to use with -logo */
14#define LOGO_FILE "icon.bmp"
15 11
16static SDL_Surface *global_image = NULL; 12static SDL_Surface *global_image = NULL;
17static GLuint global_texture = 0; 13static GLuint global_texture = 0;
18 14
15#include "util.h"
19#include "entity.h" 16#include "entity.h"
20
21#include "txtprt_import.h" 17#include "txtprt_import.h"
18#include "randlvl.h"
19
20bool doom3parse (const char *f);
21
22#include "shader.h"
22 23
23/**********************************************************************/ 24/**********************************************************************/
24 25
25view camera; 26view camera;
27vec3 camera_velocity;
28float camera_angle, camera_angle2, camera_velocity_angle, camera_velocity_angle2;
29float camera_velocity_factor = 80;
26 30
27void 31void
28HotKey_ToggleFullScreen (void) 32HotKey_ToggleFullScreen (void)
29{ 33{
30 SDL_Surface *screen; 34 SDL_Surface *screen;
31 35
32 screen = SDL_GetVideoSurface (); 36 screen = SDL_GetVideoSurface ();
37
33 if (SDL_WM_ToggleFullScreen (screen)) 38 if (SDL_WM_ToggleFullScreen (screen))
34 printf ("Toggled fullscreen mode - now %s\n", 39 printf ("Toggled fullscreen mode - now %s\n",
35 (screen->flags & SDL_FULLSCREEN) ? "fullscreen" : "windowed"); 40 (screen->flags & SDL_FULLSCREEN) ? "fullscreen" : "windowed");
36 else 41 else
37 printf ("Unable to toggle fullscreen mode\n"); 42 printf ("Unable to toggle fullscreen mode\n");
… …
42{ 47{
43 SDL_GrabMode mode; 48 SDL_GrabMode mode;
44 49
45 printf ("Ctrl-G: toggling input grab!\n"); 50 printf ("Ctrl-G: toggling input grab!\n");
46 mode = SDL_WM_GrabInput (SDL_GRAB_QUERY); 51 mode = SDL_WM_GrabInput (SDL_GRAB_QUERY);
52
47 if (mode == SDL_GRAB_ON) 53 if (mode == SDL_GRAB_ON)
48 printf ("Grab was on\n"); 54 printf ("Grab was on\n");
49 else 55 else
50 printf ("Grab was off\n"); 56 printf ("Grab was off\n");
51 57
52 mode = SDL_WM_GrabInput (mode ? SDL_GRAB_OFF : SDL_GRAB_ON); 58 mode = SDL_WM_GrabInput (mode ? SDL_GRAB_OFF : SDL_GRAB_ON);
59
53 if (mode == SDL_GRAB_ON) 60 if (mode == SDL_GRAB_ON)
54 printf ("Grab is now on\n"); 61 printf ("Grab is now on\n");
55 else 62 else
56 printf ("Grab is now off\n"); 63 printf ("Grab is now off\n");
57} 64}
… …
67HandleEvent (SDL_Event * event) 74HandleEvent (SDL_Event * event)
68{ 75{
69 int done; 76 int done;
70 77
71 done = 0; 78 done = 0;
79
72 switch (event->type) 80 switch (event->type)
73 { 81 {
74 case SDL_ACTIVEEVENT: 82 case SDL_ACTIVEEVENT:
75 /* See what happened */ 83 /* See what happened */
76 printf ("app %s ", event->active.gain ? "gained" : "lost"); 84 printf ("app %s ", event->active.gain ? "gained" : "lost");
77 if (event->active.state & SDL_APPACTIVE) 85 if (event->active.state & SDL_APPACTIVE)
78 {
79 printf ("active "); 86 printf ("active ");
80 }
81 else if (event->active.state & SDL_APPMOUSEFOCUS) 87 else if (event->active.state & SDL_APPMOUSEFOCUS)
82 {
83 printf ("mouse "); 88 printf ("mouse ");
84 }
85 else if (event->active.state & SDL_APPINPUTFOCUS) 89 else if (event->active.state & SDL_APPINPUTFOCUS)
86 {
87 printf ("input "); 90 printf ("input ");
88 }
89 91
90 printf ("focus\n"); 92 printf ("focus\n");
91 break; 93 break;
92 94
93 case SDL_KEYDOWN: 95 case SDL_KEYDOWN:
94
95 if (event->key.keysym.sym == SDLK_UP) 96 if (event->key.keysym.sym == SDLK_UP) camera_velocity.z--;
96 camera.p.z -= 1;
97 if (event->key.keysym.sym == SDLK_DOWN) 97 if (event->key.keysym.sym == SDLK_DOWN) camera_velocity.z++;
98 camera.p.z += 1;
99 if (event->key.keysym.sym == SDLK_LEFT)
100 camera.p.x -= 1;
101 if (event->key.keysym.sym == SDLK_RIGHT) 98 if (event->key.keysym.sym == SDLK_RIGHT) camera_velocity_angle++;
102 camera.p.x += 1; 99 if (event->key.keysym.sym == SDLK_LEFT) camera_velocity_angle--;
100 if (event->key.keysym.sym == SDLK_PAGEUP) camera_velocity_angle2++;
101 if (event->key.keysym.sym == SDLK_PAGEDOWN) camera_velocity_angle2--;
102 if (event->key.keysym.sym == SDLK_e) camera_velocity.y--;
103 if (event->key.keysym.sym == SDLK_q) camera_velocity.y++;
104 if (event->key.keysym.sym == SDLK_v) camera_velocity_factor *= 1.5;
105 if (event->key.keysym.sym == SDLK_b) camera_velocity_factor /= 1.5;
103 106
104 if (event->key.keysym.sym == SDLK_ESCAPE) 107 if (event->key.keysym.sym == SDLK_ESCAPE)
105 done = 1; 108 done = 1;
106 109
107 if ((event->key.keysym.sym == SDLK_g) && 110 if ((event->key.keysym.sym == SDLK_g) &&
… …
116 (event->key.keysym.mod & KMOD_ALT)) 119 (event->key.keysym.mod & KMOD_ALT))
117 HotKey_ToggleFullScreen (); 120 HotKey_ToggleFullScreen ();
118 121
119 break; 122 break;
120 123
124 case SDL_KEYUP:
125 if (event->key.keysym.sym == SDLK_UP) camera_velocity.z++;
126 if (event->key.keysym.sym == SDLK_DOWN) camera_velocity.z--;
127 if (event->key.keysym.sym == SDLK_LEFT) camera_velocity_angle++;
128 if (event->key.keysym.sym == SDLK_RIGHT) camera_velocity_angle--;
129 if (event->key.keysym.sym == SDLK_PAGEUP) camera_velocity_angle2--;
130 if (event->key.keysym.sym == SDLK_PAGEDOWN) camera_velocity_angle2++;
131 if (event->key.keysym.sym == SDLK_e) camera_velocity.y++;
132 if (event->key.keysym.sym == SDLK_q) camera_velocity.y--;
133 break;
134
121 case SDL_QUIT: 135 case SDL_QUIT:
122 done = 1; 136 done = 1;
123 break; 137 break;
124 } 138 }
125 139
126 return (done); 140 return (done);
127} 141}
128 142
129/* Quick utility function for texture creation */ 143void draw_floor (int size, int dx, int dy, int dz)
130static int
131power_of_two (int input)
132{ 144{
133 int value = 1; 145 int x, z, ry;
134 146
135 while (value < input) 147 for (x = 0; x < 10; x++)
136 {
137 value <<= 1;
138 } 148 {
139 return value; 149 for (z = 0; z < 10; z++)
140} 150 {
151 vector<vertex_t2f_n3f_v3f> pts;
152 pts.push_back (vertex_t2f_n3f_v3f (point ( 0, 0, 0), vec3 (0, 1, 0), tex2 (0, 0)));
153 pts.push_back (vertex_t2f_n3f_v3f (point ( 0, 0, size), vec3 (0, 1, 0), tex2 (0, 1)));
154 pts.push_back (vertex_t2f_n3f_v3f (point (size, 0, size), vec3 (0, 1, 0), tex2 (1, 1)));
155 pts.push_back (vertex_t2f_n3f_v3f (point (size, 0, 0), vec3 (0, 1, 0), tex2 (1, 0)));
141 156
142GLuint 157 geometry_quads *q = new geometry_quads;
143SDL_GL_LoadTexture (SDL_Surface * surface, GLfloat * texcoord) 158 //q->m = new simple_material;
144{ 159 q->set (pts);
145 GLuint texture; 160 entity *e = new entity (q);
146 int w, h; 161 e->move (vec3 (dx + x * size, dy, dz + z * size));
147 SDL_Surface *image; 162 e->show ();
148 SDL_Rect area; 163 }
149 Uint32 saved_flags;
150 Uint8 saved_alpha;
151
152 /* Use the surface width and height expanded to powers of 2 */
153 w = power_of_two (surface->w);
154 h = power_of_two (surface->h);
155 texcoord[0] = 0.0f; /* Min X */
156 texcoord[1] = 0.0f; /* Min Y */
157 texcoord[2] = (GLfloat) surface->w / w; /* Max X */
158 texcoord[3] = (GLfloat) surface->h / h; /* Max Y */
159
160 image = SDL_CreateRGBSurface (SDL_SWSURFACE, w, h, 32,
161#if SDL_BYTEORDER == SDL_LIL_ENDIAN /* OpenGL RGBA masks */
162 0x000000FF, 0x0000FF00, 0x00FF0000, 0xFF000000
163#else
164 0xFF000000, 0x00FF0000, 0x0000FF00, 0x000000FF
165#endif
166 );
167 if (image == NULL)
168 { 164 }
169 return 0; 165}
166
167void draw_test_nurb ()
168{
169 geometry_nurbs *q = new geometry_nurbs;
170 q->set ();
171 entity *e = new entity (q);
172 e->move (vec3 (10, 3, -4));
173 e->show ();
174}
175
176void fisch (vec3 center, GLfloat radius, int depth)
177{
178 entity *planet = new entity (new geometry_sphere (testmat, radius));
179 planet->move (center);
180 planet->show ();
181
182 if (--depth)
170 } 183 {
184 GLfloat r2 = radius * .1F;
185 GLfloat r3 = radius + r2;
171 186
172 /* Save the alpha blending attributes */ 187 fisch (center + vec3 (r3, 0, 0), r2, depth);
173 saved_flags = surface->flags & (SDL_SRCALPHA | SDL_RLEACCELOK); 188 fisch (center + vec3 (0, 0, r3), r2, depth);
174 saved_alpha = surface->format->alpha; 189 fisch (center + vec3 (-r3, 0, 0), r2, depth);
175 if ((saved_flags & SDL_SRCALPHA) == SDL_SRCALPHA)
176 { 190 }
177 SDL_SetAlpha (surface, 0, 0); 191}
192
193extern void draw_level ();
194
195std::list<entity_moveable *> moveables;
196
197void perfom_moves ()
198{
199 for (std::list<entity_moveable *>::iterator i = moveables.begin (); i != moveables.end (); ++i)
178 } 200 {
179 201 (*i)->perform_step (timer.diff);
180 /* Copy the surface into the GL texture image */
181 area.x = 0;
182 area.y = 0;
183 area.w = surface->w;
184 area.h = surface->h;
185 SDL_BlitSurface (surface, &area, image, &area);
186
187 /* Restore the alpha blending attributes */
188 if ((saved_flags & SDL_SRCALPHA) == SDL_SRCALPHA)
189 { 202 }
190 SDL_SetAlpha (surface, saved_flags, saved_alpha);
191 }
192
193 /* Create an OpenGL texture for the image */
194 glGenTextures (1, &texture);
195 glBindTexture (GL_TEXTURE_2D, texture);
196 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
197 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
198 glTexImage2D (GL_TEXTURE_2D,
199 0,
200 GL_RGBA, w, h, 0, GL_RGBA, GL_UNSIGNED_BYTE, image->pixels);
201 SDL_FreeSurface (image); /* No longer needed */
202
203 return texture;
204} 203}
205 204
206int 205int
207RunGLTest (int argc, char *argv[], 206RunGLTest (int argc, char *argv[],
208 int logo, int slowly, int bpp, float gamma, int noframe, int fsaa) 207 int logo, int slowly, int bpp, float gamma, int noframe, int fsaa)
… …
211 int rgb_size[3]; 210 int rgb_size[3];
212 int w = 640; 211 int w = 640;
213 int h = 480; 212 int h = 480;
214 int done = 0; 213 int done = 0;
215 int frames; 214 int frames;
216 Uint32 start_time, this_time;
217 Uint32 video_flags; 215 Uint32 video_flags;
218 int value; 216 int value;
217 GLenum gl_error;
219 218
220 if (SDL_Init (SDL_INIT_VIDEO) < 0) 219 if (SDL_Init (SDL_INIT_VIDEO) < 0)
221 { 220 {
222 fprintf (stderr, "Couldn't initialize SDL: %s\n", SDL_GetError ()); 221 fprintf (stderr, "Couldn't initialize SDL: %s\n", SDL_GetError ());
223 exit (1); 222 exit (1);
… …
261 rgb_size[0] = 8; 260 rgb_size[0] = 8;
262 rgb_size[1] = 8; 261 rgb_size[1] = 8;
263 rgb_size[2] = 8; 262 rgb_size[2] = 8;
264 break; 263 break;
265 } 264 }
265
266 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, rgb_size[0]); 266 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, rgb_size[0]);
267 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, rgb_size[1]); 267 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, rgb_size[1]);
268 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, rgb_size[2]); 268 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, rgb_size[2]);
269 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16); 269 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 24);
270 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 270 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
271 271
272 if (fsaa) 272 if (fsaa)
273 { 273 {
274 SDL_GL_SetAttribute (SDL_GL_MULTISAMPLEBUFFERS, 1); 274 SDL_GL_SetAttribute (SDL_GL_MULTISAMPLEBUFFERS, 1);
… …
280 fprintf (stderr, "Couldn't set GL mode: %s\n", SDL_GetError ()); 280 fprintf (stderr, "Couldn't set GL mode: %s\n", SDL_GetError ());
281 SDL_Quit (); 281 SDL_Quit ();
282 exit (1); 282 exit (1);
283 } 283 }
284 284
285 printf ("Screen BPP: %d\n", SDL_GetVideoSurface ()->format->BitsPerPixel); 285 //printf ("Screen BPP: %d\n", SDL_GetVideoSurface ()->format->BitsPerPixel);
286 printf ("\n"); 286 //printf ("\n");
287 printf ("Vendor : %s\n", glGetString (GL_VENDOR)); 287 //printf ("Vendor : %s\n", glGetString (GL_VENDOR));
288 printf ("Renderer : %s\n", glGetString (GL_RENDERER)); 288 //printf ("Renderer : %s\n", glGetString (GL_RENDERER));
289 printf ("Version : %s\n", glGetString (GL_VERSION)); 289 //printf ("Version : %s\n", glGetString (GL_VERSION));
290 printf ("Extensions : %s\n", glGetString (GL_EXTENSIONS)); 290 //printf ("Extensions : %s\n", glGetString (GL_EXTENSIONS));
291 printf ("\n"); 291 printf ("\n");
292 292
293 SDL_GL_GetAttribute (SDL_GL_RED_SIZE, &value); 293 SDL_GL_GetAttribute (SDL_GL_RED_SIZE, &value);
294 printf ("SDL_GL_RED_SIZE: requested %d, got %d\n", rgb_size[0], value); 294 printf ("SDL_GL_RED_SIZE: requested %d, got %d\n", rgb_size[0], value);
295 SDL_GL_GetAttribute (SDL_GL_GREEN_SIZE, &value); 295 SDL_GL_GetAttribute (SDL_GL_GREEN_SIZE, &value);
… …
309 printf ("SDL_GL_MULTISAMPLESAMPLES: requested %d, got %d\n", fsaa, 309 printf ("SDL_GL_MULTISAMPLESAMPLES: requested %d, got %d\n", fsaa,
310 value); 310 value);
311 } 311 }
312 312
313 /* Set the window manager title bar */ 313 /* Set the window manager title bar */
314 SDL_WM_SetCaption ("SDL GL test", "testgl"); 314 SDL_WM_SetCaption ("libgender rendering test", "gendertest");
315 315
316 /* Set the gamma for the window */ 316 /* Set the gamma for the window */
317 if (gamma != 0.0) 317 if (gamma != 0.0)
318 SDL_SetGamma (gamma, gamma, gamma); 318 SDL_SetGamma (gamma, gamma, gamma);
319 319
320 testmat = new test_material;
321 testmat2 = new test_material2;
322
323 entity_moveable *planet = new entity_moveable (new geometry_sphere (testmat, 10));
324 planet->move (vec3 (0, 0, -20));
325 planet->show ();
326
327 planet->v = vec3 (10, 0, 0);
328 moveables.push_back (planet);
329
330 doom3parse ("test.proc");
331
332 for (int i = 0; i < 20; i++)
333 {
334 // load a entity
335 txtprt_parser p;
336 geometry *g;
337 try
338 {
339 g = p.read ("test.blasc");
340 }
341 catch (txtprt_i_exception & e)
342 {
343 cout << "ERR: " << e.msg << endl;
344 }
345
346 entity *e = new entity (g);
347 e->move (vec3 (i*5, -3, -i*10));
348 e->show ();
349 }
350
351 {
352 fisch (vec3 (0, 0, -2e9), 1e9, 8);
353 //entity *planet = new entity (new geometry_sphere (1e9));
354 //planet->move (vec3 (0, 0, -1.5e9));
355 //planet->show ();
356 }
357
358 {
359 entity *planet = new entity (new geometry_sphere (testmat, 4e15));
360 planet->move (vec3 (0, 0, 1e17));
361 planet->show ();
362 }
363
364 {
365 RandomBuilding r;
366 entity *randlvl = r.draw (1000, 1000, 200);
367 randlvl->move (vec3 (0, 0, 0));
368 randlvl->show ();
369
370 entity *randlvl2 = r.draw (1000, 10000, 1000);
371 randlvl2->move (vec3 (-20000, 0, 0));
372 randlvl2->show ();
373
374 entity *randlvl3 = r.draw (100, 30, 3);
375 randlvl3->move (vec3 (-1000, 0, 0));
376 randlvl3->show ();
377
378
379 entity *randlvl4 = r.draw (100, 1000000, 100000);
380 randlvl4->move (vec3 (0, -1001000, 0));
381 randlvl4->show ();
382 }
383
384 //draw_floor (10, -500, -10, -1000);
385 draw_level ();
386
387#if 0
388 {
389 geometry_heightfield *hf = new geometry_heightfield (100000., 100000.);
390 entity *e = new entity (hf);
391 e->move (vec3 (-100000, -100000 * 0.01, -100000));
392 e->show ();
393 }
394#endif
395
396 //draw_test_nurb ();
397
398 //camera.orig.x = 108; camera.orig.y = 0; camera.orig.z = -368;
399 camera.orig.x = 0; camera.orig.y = 0; camera.orig.z = 0;
320 camera.p = point (0, 0, 10); 400 camera.p = point (0, 0, 10);
321 camera.d = vec3 (0, 0, -1); 401 camera.d = vec3 (0, 0, -1);
322 camera.u = vec3 (0, 1, 0); 402 camera.u = vec3 (0, 1, 0);
323 camera.w = w; camera.h = h; 403 camera.w = w; camera.h = h;
324 camera.fov = 90; 404 camera.fov = 40.;
325 405
326 glMatrixMode (GL_MODELVIEW);
327 glLoadIdentity ();
328
329 glEnable (GL_DEPTH_TEST); 406 glDisable (GL_ALPHA_TEST);
330
331 glDepthFunc (GL_LESS);
332
333 glShadeModel (GL_SMOOTH);
334
335 glEnable (GL_LIGHTING);
336
337 //GLfloat lightc[4] = { 1, 0.1, 0.1, 1 };
338 //glLightf (GL_LIGHT0, GL_QUADRATIC_ATTENUATION);
339 //glLightfv (GL_LIGHT0, GL_DIFFUSE, lightc);
340 glEnable (GL_LIGHT0);
341 glEnable (GL_COLOR_MATERIAL);
342 407
343 /* Loop until done. */ 408 /* Loop until done. */
344 start_time = SDL_GetTicks ();
345 frames = 0; 409 frames = 0;
410
411 linear_light mylight2;//mylight, mylight2;
412
413 // mylight.radius = 100000;
414 // mylight.c = colour (1., 1, 1, 1.);
415 // mylight.intensity = 1.F;
416
417 mylight2.radius = 100000;
418 mylight2.c = colour (1., 1., 1., 1.);
419 mylight2.intensity = 1.F;
420 mylight2.orig.x = 0; mylight2.orig.y = 0; mylight2.orig.z = 0;
421 mylight2.p.x = 0; mylight2.p.y = 0; mylight2.p.z = 0;
422
423 //pass_data pass_light (&mylight);
424 pass_data pass_light2 (&mylight2);
425
346 while (!done) 426 while (!done)
347 { 427 {
348 GLenum gl_error;
349 char *sdl_error; 428 char *sdl_error;
350 SDL_Event event; 429 SDL_Event event;
351 430
352 /* Do our drawing, too. */ 431 camera_angle += 90 * camera_velocity_angle * timer.diff;
353 glClearColor (0.0, 0.0, 0.0, 1.0); 432 camera_angle2 += 90 * camera_velocity_angle2 * timer.diff;
354 glClear (GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
355 433
356 GLfloat lightp[4]; 434 vec3 geradeaus = matrix::rotation (-camera_angle, vec3 (0, 1, 0)) * vec3 (0, 0, -1);
435 vec3 right = matrix::rotation (90., vec3 (0, 1, 0)) * geradeaus;
436
437 camera.d = matrix::rotation (camera_angle2, right) * geradeaus;
438 camera.u = cross (camera.d, right);
439
440 camera.p = camera.p - camera.d * (camera_velocity_factor * timer.diff) * camera_velocity.z;
441 camera.p = camera.p - camera.u * (camera_velocity_factor * timer.diff) * camera_velocity.y;
442
443 //mylight.orig = camera.orig;
357 lightp[0] = camera.p.x; 444 //mylight.p = camera.p;
358 lightp[1] = camera.p.y; 445
359 lightp[2] = camera.p.z; 446 mylight2.orig = camera.orig;
360 lightp[3] = 1; 447 mylight2.p = vec3 (sin (timer.now / 2) * 100000, 1, cos (timer.now / 2) * 100000);
361 glLightfv (GL_LIGHT0, GL_POSITION, lightp); 448
449 //mylight.intensity = max (sinf (timer.now) + 1.2F, 0.2F);
450
451 camera.begin ();
452 camera.render (pass_depth);
453 camera.render (pass_postdepth);
454 camera.render (pass_light2);
455 //camera.render (view::LIGHTED, pass_light2);
456 camera.end ();
457
458 perfom_moves ();
459
460 SDL_GL_SwapBuffers ();
461 timer.frame ();
362 462
363#if 0 463#if 0
364 static GLfloat ry;
365 ry += 0.03;
366 v.d.x = cos (ry);
367 v.d.z = sin (ry);
368#endif
369
370 draw_context c;
371 c.mode = draw_context::LIGHTED;
372 camera.draw (c);
373
374 SDL_GL_SwapBuffers ();
375
376 /* Check for error conditions. */ 464 /* Check for error conditions. */
377 gl_error = glGetError (); 465 gl_error = glGetError ();
378 466
379 if (gl_error != GL_NO_ERROR)
380 fprintf (stderr, "testgl: OpenGL error: %d\n", gl_error); 467 if (gl_error != GL_NO_ERROR) fprintf (stderr, "testgl: OpenGL error: %d\n", gl_error);
381 468
382 sdl_error = SDL_GetError (); 469 sdl_error = SDL_GetError ();
383 470
384 if (sdl_error[0] != '\0') 471 if (sdl_error[0] != '\0')
385 { 472 {
386 fprintf (stderr, "testgl: SDL error '%s'\n", sdl_error); 473 fprintf (stderr, "testgl: SDL error '%s'\n", sdl_error);
387 SDL_ClearError (); 474 SDL_ClearError ();
388 } 475 }
389 476
390 /* Allow the user to see what's happening */ 477 /* Allow the user to see what's happening */
391 //SDL_Delay (20); 478 //SDL_Delay (40);
479#endif
392 480
393 /* Check if there's a pending event. */ 481 /* Check if there's a pending event. */
394 while (SDL_PollEvent (&event)) 482 while (SDL_PollEvent (&event))
395 {
396 done = HandleEvent (&event); 483 done = HandleEvent (&event);
397 } 484
398 ++frames; 485 ++frames;
399 }
400
401 /* Print out the frames per second */
402 this_time = SDL_GetTicks ();
403 if (this_time != start_time)
404 {
405 printf ("%2.2f FPS\n",
406 ((float) frames / (this_time - start_time)) * 1000.0);
407 } 486 }
408 487
409 if (global_image) 488 if (global_image)
410 { 489 {
411 SDL_FreeSurface (global_image); 490 SDL_FreeSurface (global_image);
412 global_image = NULL; 491 global_image = NULL;
413 } 492 }
493
414 if (global_texture) 494 if (global_texture)
415 { 495 {
416 glDeleteTextures (1, &global_texture); 496 glDeleteTextures (1, &global_texture);
417 global_texture = 0; 497 global_texture = 0;
418 } 498 }
419 499
420 /* Destroy our GL context, etc. */ 500 /* Destroy our GL context, etc. */
421 SDL_Quit (); 501 SDL_Quit ();
422 return (0); 502 return (0);
423} 503}
424
425int 504int
426main (int argc, char *argv[]) 505main (int argc, char *argv[])
427{ 506{
428 int i, logo; 507 int i, logo;
429 int numtests; 508 int numtests;
… …
431 int slowly; 510 int slowly;
432 float gamma = 0.0; 511 float gamma = 0.0;
433 int noframe = 0; 512 int noframe = 0;
434 int fsaa = 0; 513 int fsaa = 0;
435 514
436 // load a entity
437 txtprt_parser p;
438 entity *e;
439 try {
440 e = p.read ("test.blasc");
441 } catch (txtprt_i_exception & e) {
442 cout << "ERR: " << e.msg << endl;
443 }
444 e->show ();
445
446 logo = 0; 515 logo = 0;
447 slowly = 0; 516 slowly = 0;
448 numtests = 1; 517 numtests = 1;
449 for (i = 1; argv[i]; ++i) 518 for (i = 1; argv[i]; ++i)
450 { 519 {
… …
478 ("Usage: %s [-twice] [-logo] [-slow] [-bpp n] [-gamma n] [-noframe] [-fsaa]\n", 547 ("Usage: %s [-twice] [-logo] [-slow] [-bpp n] [-gamma n] [-noframe] [-fsaa]\n",
479 argv[0]); 548 argv[0]);
480 exit (0); 549 exit (0);
481 } 550 }
482 } 551 }
552
483 for (i = 0; i < numtests; ++i) 553 for (i = 0; i < numtests; ++i)
484 {
485 RunGLTest (argc, argv, logo, slowly, bpp, gamma, noframe, fsaa); 554 RunGLTest (argc, argv, logo, slowly, bpp, gamma, noframe, fsaa);
486 } 555
487 return 0; 556 return 0;
488} 557}

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines