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

Comparing libgender/test.C (file contents):
Revision 1.49 by root, Fri Oct 8 16:52:49 2004 UTC vs.
Revision 1.89 by root, Sat Nov 6 01:56:20 2004 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 5
6#include "opengl.h"
7
6#include "SDL.h" 8#include "SDL.h"
7#include "SDL_opengl.h" 9#include "SDL_opengl.h"
8 10
9static SDL_Surface *global_image = NULL; 11static SDL_Surface *global_image = NULL;
10static GLuint global_texture = 0; 12static GLuint global_texture = 0;
11 13
12#include "util.h" 14#include "util.h"
13#include "entity.h" 15#include "entity.h"
14#include "txtprt_import.h" 16#include "txtprt_import.h"
15 17
16CGcontext cgc; 18bool doom3parse (const char *f);
17CGprogram vsh, fsh;
18CGparameter mv, mvp, lightpos;
19CGprofile vsh_profile, fsh_profile;
20 19
21static void CheckCgError (void) 20#include "shader.h"
22{
23 CGerror err = cgGetError ();
24
25 if (err != CG_NO_ERROR)
26 {
27 printf("CG error: %s\n", cgGetErrorString (err));
28 exit(1);
29 }
30}
31 21
32/**********************************************************************/ 22/**********************************************************************/
33 23
34view camera; 24view camera;
35vec3 camera_velocity; 25vec3 camera_velocity;
36float camera_angle = 0, camera_velocity_angle; 26float camera_angle, camera_angle2, camera_velocity_angle, camera_velocity_angle2;
37float camera_velocity_factor = 20; 27float camera_velocity_factor = 80;
38 28
39void 29void
40HotKey_ToggleFullScreen (void) 30HotKey_ToggleFullScreen (void)
41{ 31{
42 SDL_Surface *screen; 32 SDL_Surface *screen;
43 33
44 screen = SDL_GetVideoSurface (); 34 screen = SDL_GetVideoSurface ();
35
45 if (SDL_WM_ToggleFullScreen (screen)) 36 if (SDL_WM_ToggleFullScreen (screen))
46 printf ("Toggled fullscreen mode - now %s\n", 37 printf ("Toggled fullscreen mode - now %s\n",
47 (screen->flags & SDL_FULLSCREEN) ? "fullscreen" : "windowed"); 38 (screen->flags & SDL_FULLSCREEN) ? "fullscreen" : "windowed");
48 else 39 else
49 printf ("Unable to toggle fullscreen mode\n"); 40 printf ("Unable to toggle fullscreen mode\n");
… …
54{ 45{
55 SDL_GrabMode mode; 46 SDL_GrabMode mode;
56 47
57 printf ("Ctrl-G: toggling input grab!\n"); 48 printf ("Ctrl-G: toggling input grab!\n");
58 mode = SDL_WM_GrabInput (SDL_GRAB_QUERY); 49 mode = SDL_WM_GrabInput (SDL_GRAB_QUERY);
50
59 if (mode == SDL_GRAB_ON) 51 if (mode == SDL_GRAB_ON)
60 printf ("Grab was on\n"); 52 printf ("Grab was on\n");
61 else 53 else
62 printf ("Grab was off\n"); 54 printf ("Grab was off\n");
63 55
64 mode = SDL_WM_GrabInput (mode ? SDL_GRAB_OFF : SDL_GRAB_ON); 56 mode = SDL_WM_GrabInput (mode ? SDL_GRAB_OFF : SDL_GRAB_ON);
57
65 if (mode == SDL_GRAB_ON) 58 if (mode == SDL_GRAB_ON)
66 printf ("Grab is now on\n"); 59 printf ("Grab is now on\n");
67 else 60 else
68 printf ("Grab is now off\n"); 61 printf ("Grab is now off\n");
69} 62}
… …
79HandleEvent (SDL_Event * event) 72HandleEvent (SDL_Event * event)
80{ 73{
81 int done; 74 int done;
82 75
83 done = 0; 76 done = 0;
77
84 switch (event->type) 78 switch (event->type)
85 { 79 {
86 case SDL_ACTIVEEVENT: 80 case SDL_ACTIVEEVENT:
87 /* See what happened */ 81 /* See what happened */
88 printf ("app %s ", event->active.gain ? "gained" : "lost"); 82 printf ("app %s ", event->active.gain ? "gained" : "lost");
89 if (event->active.state & SDL_APPACTIVE) 83 if (event->active.state & SDL_APPACTIVE)
90 {
91 printf ("active "); 84 printf ("active ");
92 }
93 else if (event->active.state & SDL_APPMOUSEFOCUS) 85 else if (event->active.state & SDL_APPMOUSEFOCUS)
94 {
95 printf ("mouse "); 86 printf ("mouse ");
96 }
97 else if (event->active.state & SDL_APPINPUTFOCUS) 87 else if (event->active.state & SDL_APPINPUTFOCUS)
98 {
99 printf ("input "); 88 printf ("input ");
100 }
101 89
102 printf ("focus\n"); 90 printf ("focus\n");
103 break; 91 break;
104 92
105 case SDL_KEYDOWN: 93 case SDL_KEYDOWN:
106 if (event->key.keysym.sym == SDLK_UP) camera_velocity.z--; 94 if (event->key.keysym.sym == SDLK_UP) camera_velocity.z--;
107 if (event->key.keysym.sym == SDLK_DOWN) camera_velocity.z++; 95 if (event->key.keysym.sym == SDLK_DOWN) camera_velocity.z++;
108 if (event->key.keysym.sym == SDLK_LEFT) camera_velocity.x--;
109 if (event->key.keysym.sym == SDLK_RIGHT) camera_velocity.x++; 96 if (event->key.keysym.sym == SDLK_RIGHT) camera_velocity_angle++;
97 if (event->key.keysym.sym == SDLK_LEFT) camera_velocity_angle--;
98 if (event->key.keysym.sym == SDLK_PAGEUP) camera_velocity_angle2++;
99 if (event->key.keysym.sym == SDLK_PAGEDOWN) camera_velocity_angle2--;
110 if (event->key.keysym.sym == SDLK_a) camera_velocity.y--; 100 if (event->key.keysym.sym == SDLK_e) camera_velocity.y--;
111 if (event->key.keysym.sym == SDLK_s) camera_velocity.y++; 101 if (event->key.keysym.sym == SDLK_q) camera_velocity.y++;
112 if (event->key.keysym.sym == SDLK_v) camera_velocity_factor *= 1.5; 102 if (event->key.keysym.sym == SDLK_v) camera_velocity_factor *= 1.5;
113 if (event->key.keysym.sym == SDLK_b) camera_velocity_factor /= 1.5; 103 if (event->key.keysym.sym == SDLK_b) camera_velocity_factor /= 1.5;
114 if (event->key.keysym.sym == SDLK_e) camera_velocity_angle++;
115 if (event->key.keysym.sym == SDLK_q) camera_velocity_angle--;
116 104
117 if (event->key.keysym.sym == SDLK_ESCAPE) 105 if (event->key.keysym.sym == SDLK_ESCAPE)
118 done = 1; 106 done = 1;
119 107
120 if ((event->key.keysym.sym == SDLK_g) && 108 if ((event->key.keysym.sym == SDLK_g) &&
… …
132 break; 120 break;
133 121
134 case SDL_KEYUP: 122 case SDL_KEYUP:
135 if (event->key.keysym.sym == SDLK_UP) camera_velocity.z++; 123 if (event->key.keysym.sym == SDLK_UP) camera_velocity.z++;
136 if (event->key.keysym.sym == SDLK_DOWN) camera_velocity.z--; 124 if (event->key.keysym.sym == SDLK_DOWN) camera_velocity.z--;
137 if (event->key.keysym.sym == SDLK_LEFT) camera_velocity.x++; 125 if (event->key.keysym.sym == SDLK_LEFT) camera_velocity_angle++;
138 if (event->key.keysym.sym == SDLK_RIGHT) camera_velocity.x--; 126 if (event->key.keysym.sym == SDLK_RIGHT) camera_velocity_angle--;
127 if (event->key.keysym.sym == SDLK_PAGEUP) camera_velocity_angle2--;
128 if (event->key.keysym.sym == SDLK_PAGEDOWN) camera_velocity_angle2++;
139 if (event->key.keysym.sym == SDLK_a) camera_velocity.y++; 129 if (event->key.keysym.sym == SDLK_e) camera_velocity.y++;
140 if (event->key.keysym.sym == SDLK_s) camera_velocity.y--; 130 if (event->key.keysym.sym == SDLK_q) camera_velocity.y--;
141 if (event->key.keysym.sym == SDLK_e) camera_velocity_angle--;
142 if (event->key.keysym.sym == SDLK_q) camera_velocity_angle++;
143 break; 131 break;
144 132
145 case SDL_QUIT: 133 case SDL_QUIT:
146 done = 1; 134 done = 1;
147 break; 135 break;
… …
152 140
153void draw_floor (int size, int dx, int dy, int dz) 141void draw_floor (int size, int dx, int dy, int dz)
154{ 142{
155 int x, z, ry; 143 int x, z, ry;
156 144
157 for (x = 0; x < 100; x++) 145 for (x = 0; x < 10; x++)
158 { 146 {
159 for (z = 0; z < 100; z++) 147 for (z = 0; z < 10; z++)
160 { 148 {
161 vector<vertex2d> pts; 149 vector<vertex_t2f_n3f_v3f> pts;
162 pts.push_back (vertex2d (point ( 0, 0, 0), vec3 (0, 1, 0), texc (0, 0))); 150 pts.push_back (vertex_t2f_n3f_v3f (point ( 0, 0, 0), vec3 (0, 1, 0), tex2 (0, 0)));
163 pts.push_back (vertex2d (point ( 0, 0, size), vec3 (0, 1, 0), texc (0, 1))); 151 pts.push_back (vertex_t2f_n3f_v3f (point ( 0, 0, size), vec3 (0, 1, 0), tex2 (0, 1)));
164 pts.push_back (vertex2d (point (size, 0, size), vec3 (0, 1, 0), texc (1, 1))); 152 pts.push_back (vertex_t2f_n3f_v3f (point (size, 0, size), vec3 (0, 1, 0), tex2 (1, 1)));
165 pts.push_back (vertex2d (point (size, 0, 0), vec3 (0, 1, 0), texc (1, 0))); 153 pts.push_back (vertex_t2f_n3f_v3f (point (size, 0, 0), vec3 (0, 1, 0), tex2 (1, 0)));
166 154
167 geometry_quads *q = new geometry_quads; 155 geometry_quads *q = new geometry_quads;
156 //q->m = new simple_material;
168 q->set (pts); 157 q->set (pts);
169 entity *e = new entity (q); 158 entity *e = new entity (q);
170 e->move (vec3 (dx + x * size, dy, dz + z * size)); 159 e->move (vec3 (dx + x * size, dy, dz + z * size));
171 e->show (); 160 e->show ();
172 } 161 }
173 } 162 }
174} 163}
175 164
176void draw_test_nurb () { 165void draw_test_nurb ()
166{
177 geometry_nurbs *q = new geometry_nurbs; 167 geometry_nurbs *q = new geometry_nurbs;
178 q->set (); 168 q->set ();
179 entity *e = new entity (q); 169 entity *e = new entity (q);
180 e->move (vec3 (10, 3, -4)); 170 e->move (vec3 (10, 3, -4));
181 e->show (); 171 e->show ();
182} 172}
183 173
174void fisch (vec3 center, GLfloat radius, int depth)
175{
176 entity *planet = new entity (new geometry_sphere (testmat, radius));
177 planet->move (center);
178 planet->show ();
179
180 if (--depth)
181 {
182 GLfloat r2 = radius * .1F;
183 GLfloat r3 = radius + r2;
184
185 fisch (center + vec3 (r3, 0, 0), r2, depth);
186 fisch (center + vec3 (0, 0, r3), r2, depth);
187 fisch (center + vec3 (-r3, 0, 0), r2, depth);
188 }
189}
190
191extern void draw_level ();
184int 192int
185RunGLTest (int argc, char *argv[], 193RunGLTest (int argc, char *argv[],
186 int logo, int slowly, int bpp, float gamma, int noframe, int fsaa) 194 int logo, int slowly, int bpp, float gamma, int noframe, int fsaa)
187{ 195{
188 int i; 196 int i;
189 int rgb_size[3]; 197 int rgb_size[3];
190 int w = 640; 198 int w = 640;
191 int h = 480; 199 int h = 480;
192 int done = 0; 200 int done = 0;
193 int frames; 201 int frames;
194 Uint32 start_time, this_time;
195 Uint32 video_flags; 202 Uint32 video_flags;
196 int value; 203 int value;
197 GLenum gl_error; 204 GLenum gl_error;
198 205
199 if (SDL_Init (SDL_INIT_VIDEO) < 0) 206 if (SDL_Init (SDL_INIT_VIDEO) < 0)
… …
244 } 251 }
245 252
246 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, rgb_size[0]); 253 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, rgb_size[0]);
247 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, rgb_size[1]); 254 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, rgb_size[1]);
248 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, rgb_size[2]); 255 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, rgb_size[2]);
249 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16); 256 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 24);
250 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 257 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
251 258
252 if (fsaa) 259 if (fsaa)
253 { 260 {
254 SDL_GL_SetAttribute (SDL_GL_MULTISAMPLEBUFFERS, 1); 261 SDL_GL_SetAttribute (SDL_GL_MULTISAMPLEBUFFERS, 1);
… …
260 fprintf (stderr, "Couldn't set GL mode: %s\n", SDL_GetError ()); 267 fprintf (stderr, "Couldn't set GL mode: %s\n", SDL_GetError ());
261 SDL_Quit (); 268 SDL_Quit ();
262 exit (1); 269 exit (1);
263 } 270 }
264 271
265 printf ("Screen BPP: %d\n", SDL_GetVideoSurface ()->format->BitsPerPixel); 272 //printf ("Screen BPP: %d\n", SDL_GetVideoSurface ()->format->BitsPerPixel);
266 printf ("\n"); 273 //printf ("\n");
267 printf ("Vendor : %s\n", glGetString (GL_VENDOR)); 274 //printf ("Vendor : %s\n", glGetString (GL_VENDOR));
268 printf ("Renderer : %s\n", glGetString (GL_RENDERER)); 275 //printf ("Renderer : %s\n", glGetString (GL_RENDERER));
269 printf ("Version : %s\n", glGetString (GL_VERSION)); 276 //printf ("Version : %s\n", glGetString (GL_VERSION));
270 printf ("Extensions : %s\n", glGetString (GL_EXTENSIONS)); 277 //printf ("Extensions : %s\n", glGetString (GL_EXTENSIONS));
271 printf ("\n"); 278 printf ("\n");
272 279
273 SDL_GL_GetAttribute (SDL_GL_RED_SIZE, &value); 280 SDL_GL_GetAttribute (SDL_GL_RED_SIZE, &value);
274 printf ("SDL_GL_RED_SIZE: requested %d, got %d\n", rgb_size[0], value); 281 printf ("SDL_GL_RED_SIZE: requested %d, got %d\n", rgb_size[0], value);
275 SDL_GL_GetAttribute (SDL_GL_GREEN_SIZE, &value); 282 SDL_GL_GetAttribute (SDL_GL_GREEN_SIZE, &value);
… …
295 302
296 /* Set the gamma for the window */ 303 /* Set the gamma for the window */
297 if (gamma != 0.0) 304 if (gamma != 0.0)
298 SDL_SetGamma (gamma, gamma, gamma); 305 SDL_SetGamma (gamma, gamma, gamma);
299 306
307 testmat = new test_material;
308
309 entity *planet = new entity (new geometry_sphere (testmat, 10));
310 planet->move (vec3 (0, 0, -20));
311 planet->show ();
312
313 doom3parse ("test.proc");
314
300 for (int i = 0; i < 1; i++) 315 for (int i = 0; i < 20; i++)
301 { 316 {
302 // load a entity 317 // load a entity
303 txtprt_parser p; 318 txtprt_parser p;
304 geometry *g; 319 geometry *g;
305 try 320 try
… …
314 entity *e = new entity (g); 329 entity *e = new entity (g);
315 e->move (vec3 (i*5, -3, -i*10)); 330 e->move (vec3 (i*5, -3, -i*10));
316 e->show (); 331 e->show ();
317 } 332 }
318 333
334 {
335 fisch (vec3 (0, 0, -2e9), 1e9, 8);
336 //entity *planet = new entity (new geometry_sphere (1e9));
337 //planet->move (vec3 (0, 0, -1.5e9));
338 //planet->show ();
339 }
340
341 {
342 entity *planet = new entity (new geometry_sphere (testmat, 4e15));
343 planet->move (vec3 (0, 0, 1e17));
344 planet->show ();
345 }
346
319 draw_floor (10, -500, -10, -1000); 347 //draw_floor (10, -500, -10, -1000);
348 draw_level ();
349
350#if 0
351 {
352 geometry_heightfield *hf = new geometry_heightfield (100000., 100000.);
353 entity *e = new entity (hf);
354 e->move (vec3 (-100000, -100000 * 0.01, -100000));
355 e->show ();
356 }
357#endif
358
320 draw_test_nurb (); 359 //draw_test_nurb ();
321 360
361 //camera.orig.x = 108; camera.orig.y = 0; camera.orig.z = -368;
322 camera.orig.x = camera.orig.y = camera.orig.z = 0; 362 camera.orig.x = 0; camera.orig.y = 0; camera.orig.z = 0;
323 camera.p = point (0, 0, 10); 363 camera.p = point (0, 0, 10);
324 camera.d = vec3 (0, 0, -1); 364 camera.d = vec3 (0, 0, -1);
325 camera.u = vec3 (0, 1, 0); 365 camera.u = vec3 (0, 1, 0);
326 camera.w = w; camera.h = h; 366 camera.w = w; camera.h = h;
327 camera.fov = 35; 367 camera.fov = 40.;
328
329 glMatrixMode (GL_MODELVIEW);
330 glLoadIdentity ();
331 368
332 glEnable (GL_CULL_FACE); 369 glEnable (GL_CULL_FACE);
333 glEnable (GL_DEPTH_TEST); 370 glDisable (GL_ALPHA_TEST);
334 371 glDisable (GL_BLEND);
335 glShadeModel (GL_SMOOTH);
336
337 glEnable (GL_LIGHTING);
338 glEnable (GL_LIGHT0);
339
340 cgc = cgCreateContext ();
341
342 vsh_profile = CG_PROFILE_ARBVP1;
343 //if (cgGLIsProfileSupported (CG_PROFILE_VP30)) vsh_profile = CG_PROFILE_VP30;
344 //if (cgGLIsProfileSupported (CG_PROFILE_VP40)) vsh_profile = CG_PROFILE_VP40;
345 fsh_profile = CG_PROFILE_ARBFP1;
346 //if (cgGLIsProfileSupported (CG_PROFILE_FP30)) fsh_profile = CG_PROFILE_FP30;
347 //if (cgGLIsProfileSupported (CG_PROFILE_FP40)) fsh_profile = CG_PROFILE_FP40;
348
349 vsh = cgCreateProgramFromFile (cgc, CG_SOURCE, "vsh.cg", vsh_profile, 0, 0);
350 CheckCgError ();
351 cgGLLoadProgram (vsh);
352 CheckCgError ();
353 mv = cgGetNamedParameter (vsh, "WorldProj");
354 mvp = cgGetNamedParameter (vsh, "WorldViewProj");
355 lightpos = cgGetNamedParameter (vsh, "LightPos");
356 CheckCgError ();
357
358 CGparameter g_Texture; // the texture parameter
359
360
361 fsh = cgCreateProgramFromFile (cgc, CG_SOURCE, "fsh.cg", fsh_profile, 0, 0);
362 Texture t("o.jpg");
363 g_Texture = cgGetNamedParameter(fsh, "Texture"); // the texture cg-warper ;)
364 cgGLSetTextureParameter(g_Texture, t.texture); // Bind the texture number 999 to g_Texture
365 CheckCgError ();
366 cgGLLoadProgram (fsh);
367 CheckCgError ();
368
369 cgGLBindProgram (vsh);
370 CheckCgError ();
371 cgGLBindProgram (fsh);
372 CheckCgError ();
373 372
374 /* Loop until done. */ 373 /* Loop until done. */
375 start_time = SDL_GetTicks ();
376 frames = 0; 374 frames = 0;
375
376 linear_light mylight;
377 mylight.radius = 100000;
378 mylight.c = colour (1., 1, 1, 1.);
379 mylight.intensity = 1.F;
380
381 pass pass_light (&mylight);
377 382
378 while (!done) 383 while (!done)
379 { 384 {
380 char *sdl_error; 385 char *sdl_error;
381 SDL_Event event; 386 SDL_Event event;
382 387
383 camera.p.x += camera_velocity_factor * camera_velocity.x * timer.diff;
384 camera.p.y += camera_velocity_factor * camera_velocity.y * timer.diff;
385 camera.p.z += camera_velocity_factor * camera_velocity.z * timer.diff;
386
387 camera_angle += camera_velocity_factor * camera_velocity_angle * timer.diff; 388 camera_angle += 90 * camera_velocity_angle * timer.diff;
388 camera.d.z = -cos (camera_angle * 12 / 180.); 389 camera_angle2 += 90 * camera_velocity_angle2 * timer.diff;
389 camera.d.x = sin (camera_angle * 12 / 180.);
390 390
391 cgGLSetParameter4f (lightpos, camera.p.x, camera.p.y, camera.p.z, 1); 391 vec3 geradeaus = matrix::rotation (-camera_angle, vec3 (0, 1, 0)) * vec3 (0, 0, -1);
392 vec3 right = matrix::rotation (90., vec3 (0, 1, 0)) * geradeaus;
392 393
393 glBindTexture (GL_TEXTURE_2D, t.texture); 394 camera.d = matrix::rotation (camera_angle2, right) * geradeaus;
394 cgGLEnableTextureParameter (g_Texture); // Enable the texture parameter 395 camera.u = cross (camera.d, right);
395 396
396#if 0 397 camera.p = camera.p - camera.d * (camera_velocity_factor * timer.diff) * camera_velocity.z;
397 static GLfloat ry; 398 camera.p = camera.p - camera.u * (camera_velocity_factor * timer.diff) * camera_velocity.y;
398 ry += 0.001;
399 camera.d.x = cos (ry);
400 camera.d.z = sin (ry);
401 //camera.d.y = sin (ry * 0.1);
402#endif
403 399
400 mylight.orig = camera.orig;
401 mylight.p = camera.p;
402
403 //mylight.intensity = max (sinf (timer.now) + 1.2F, 0.2F);
404
404 camera.begin (); 405 camera.begin ();
405 camera.pass (view::DEPTH); 406 camera.render (view::DEPTH, pass_depth);
406 camera.pass (view::LIGHTED); 407 camera.render (view::POSTDEPTH, pass_depth);
408 camera.render (view::LIGHTED, pass_light);
407 camera.end (); 409 camera.end ();
408 410
409 SDL_GL_SwapBuffers (); 411 SDL_GL_SwapBuffers ();
410 timer.frame (); 412 timer.frame ();
411 413
414#if 0
412 /* Check for error conditions. */ 415 /* Check for error conditions. */
413 gl_error = glGetError (); 416 gl_error = glGetError ();
414 417
415 if (gl_error != GL_NO_ERROR) fprintf (stderr, "testgl: OpenGL error: %d\n", gl_error); 418 if (gl_error != GL_NO_ERROR) fprintf (stderr, "testgl: OpenGL error: %d\n", gl_error);
416 419
… …
421 fprintf (stderr, "testgl: SDL error '%s'\n", sdl_error); 424 fprintf (stderr, "testgl: SDL error '%s'\n", sdl_error);
422 SDL_ClearError (); 425 SDL_ClearError ();
423 } 426 }
424 427
425 /* Allow the user to see what's happening */ 428 /* Allow the user to see what's happening */
426 //SDL_Delay (20); 429 //SDL_Delay (40);
430#endif
427 431
428 /* Check if there's a pending event. */ 432 /* Check if there's a pending event. */
429 while (SDL_PollEvent (&event)) 433 while (SDL_PollEvent (&event))
430 done = HandleEvent (&event); 434 done = HandleEvent (&event);
431 435
432
433 ++frames; 436 ++frames;
434 }
435
436 /* Print out the frames per second */
437 this_time = SDL_GetTicks ();
438 if (this_time != start_time)
439 {
440 printf ("%2.2f FPS\n",
441 ((float) frames / (this_time - start_time)) * 1000.0);
442 } 437 }
443 438
444 if (global_image) 439 if (global_image)
445 { 440 {
446 SDL_FreeSurface (global_image); 441 SDL_FreeSurface (global_image);
447 global_image = NULL; 442 global_image = NULL;
448 } 443 }
444
449 if (global_texture) 445 if (global_texture)
450 { 446 {
451 glDeleteTextures (1, &global_texture); 447 glDeleteTextures (1, &global_texture);
452 global_texture = 0; 448 global_texture = 0;
453 } 449 }
454 450
455 /* Destroy our GL context, etc. */ 451 /* Destroy our GL context, etc. */
456 SDL_Quit (); 452 SDL_Quit ();
457 return (0); 453 return (0);
458} 454}
459
460int 455int
461main (int argc, char *argv[]) 456main (int argc, char *argv[])
462{ 457{
463 int i, logo; 458 int i, logo;
464 int numtests; 459 int numtests;

Diff Legend

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