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

Diff Legend

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