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

Comparing libgender/test.C (file contents):
Revision 1.43 by root, Wed Oct 6 16:51:20 2004 UTC vs.
Revision 1.92 by root, Wed Nov 10 01:57:15 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;
148 } 136 }
149 137
150 return (done); 138 return (done);
139}
140
141void draw_floor (int size, int dx, int dy, int dz)
142{
143 int x, z, ry;
144
145 for (x = 0; x < 10; x++)
146 {
147 for (z = 0; z < 10; z++)
148 {
149 vector<vertex_t2f_n3f_v3f> pts;
150 pts.push_back (vertex_t2f_n3f_v3f (point ( 0, 0, 0), vec3 (0, 1, 0), tex2 (0, 0)));
151 pts.push_back (vertex_t2f_n3f_v3f (point ( 0, 0, size), vec3 (0, 1, 0), tex2 (0, 1)));
152 pts.push_back (vertex_t2f_n3f_v3f (point (size, 0, size), vec3 (0, 1, 0), tex2 (1, 1)));
153 pts.push_back (vertex_t2f_n3f_v3f (point (size, 0, 0), vec3 (0, 1, 0), tex2 (1, 0)));
154
155 geometry_quads *q = new geometry_quads;
156 //q->m = new simple_material;
157 q->set (pts);
158 entity *e = new entity (q);
159 e->move (vec3 (dx + x * size, dy, dz + z * size));
160 e->show ();
161 }
162 }
163}
164
165void draw_test_nurb ()
166{
167 geometry_nurbs *q = new geometry_nurbs;
168 q->set ();
169 entity *e = new entity (q);
170 e->move (vec3 (10, 3, -4));
171 e->show ();
172}
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 ();
192
193octant *optimize (octant *o)//D
194{
195 if (!o)
196 return o;
197
198 for (int i = 8; --i; )
199 o->sub[i] = optimize (o->sub[i]);
200
201 if (o->fill != 1 || o->size ())
202 return o;
203
204 printf ("skipped\n");
205
206 for (int i = 8; --i; )
207 if (o->sub[i])
208 return o->sub[i];
209
210 abort ();
151} 211}
152 212
153int 213int
154RunGLTest (int argc, char *argv[], 214RunGLTest (int argc, char *argv[],
155 int logo, int slowly, int bpp, float gamma, int noframe, int fsaa) 215 int logo, int slowly, int bpp, float gamma, int noframe, int fsaa)
… …
158 int rgb_size[3]; 218 int rgb_size[3];
159 int w = 640; 219 int w = 640;
160 int h = 480; 220 int h = 480;
161 int done = 0; 221 int done = 0;
162 int frames; 222 int frames;
163 Uint32 start_time, this_time;
164 Uint32 video_flags; 223 Uint32 video_flags;
165 int value; 224 int value;
225 GLenum gl_error;
166 226
167 if (SDL_Init (SDL_INIT_VIDEO) < 0) 227 if (SDL_Init (SDL_INIT_VIDEO) < 0)
168 { 228 {
169 fprintf (stderr, "Couldn't initialize SDL: %s\n", SDL_GetError ()); 229 fprintf (stderr, "Couldn't initialize SDL: %s\n", SDL_GetError ());
170 exit (1); 230 exit (1);
… …
212 } 272 }
213 273
214 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, rgb_size[0]); 274 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, rgb_size[0]);
215 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, rgb_size[1]); 275 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, rgb_size[1]);
216 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, rgb_size[2]); 276 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, rgb_size[2]);
217 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16); 277 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 24);
218 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 278 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
219 279
220 if (fsaa) 280 if (fsaa)
221 { 281 {
222 SDL_GL_SetAttribute (SDL_GL_MULTISAMPLEBUFFERS, 1); 282 SDL_GL_SetAttribute (SDL_GL_MULTISAMPLEBUFFERS, 1);
… …
228 fprintf (stderr, "Couldn't set GL mode: %s\n", SDL_GetError ()); 288 fprintf (stderr, "Couldn't set GL mode: %s\n", SDL_GetError ());
229 SDL_Quit (); 289 SDL_Quit ();
230 exit (1); 290 exit (1);
231 } 291 }
232 292
233 printf ("Screen BPP: %d\n", SDL_GetVideoSurface ()->format->BitsPerPixel); 293 //printf ("Screen BPP: %d\n", SDL_GetVideoSurface ()->format->BitsPerPixel);
234 printf ("\n"); 294 //printf ("\n");
235 printf ("Vendor : %s\n", glGetString (GL_VENDOR)); 295 //printf ("Vendor : %s\n", glGetString (GL_VENDOR));
236 printf ("Renderer : %s\n", glGetString (GL_RENDERER)); 296 //printf ("Renderer : %s\n", glGetString (GL_RENDERER));
237 printf ("Version : %s\n", glGetString (GL_VERSION)); 297 //printf ("Version : %s\n", glGetString (GL_VERSION));
238 printf ("Extensions : %s\n", glGetString (GL_EXTENSIONS)); 298 //printf ("Extensions : %s\n", glGetString (GL_EXTENSIONS));
239 printf ("\n"); 299 printf ("\n");
240 300
241 SDL_GL_GetAttribute (SDL_GL_RED_SIZE, &value); 301 SDL_GL_GetAttribute (SDL_GL_RED_SIZE, &value);
242 printf ("SDL_GL_RED_SIZE: requested %d, got %d\n", rgb_size[0], value); 302 printf ("SDL_GL_RED_SIZE: requested %d, got %d\n", rgb_size[0], value);
243 SDL_GL_GetAttribute (SDL_GL_GREEN_SIZE, &value); 303 SDL_GL_GetAttribute (SDL_GL_GREEN_SIZE, &value);
… …
263 323
264 /* Set the gamma for the window */ 324 /* Set the gamma for the window */
265 if (gamma != 0.0) 325 if (gamma != 0.0)
266 SDL_SetGamma (gamma, gamma, gamma); 326 SDL_SetGamma (gamma, gamma, gamma);
267 327
328 testmat = new test_material;
329
330 entity *planet = new entity (new geometry_sphere (testmat, 10));
331 planet->move (vec3 (0, 0, -20));
332 planet->show ();
333
334 doom3parse ("test.proc");
335
336 for (int i = 8; --i; )
337 world.sub[i] = optimize (world.sub[i]);//D
338
268 for (int i = 0; i < 70; i++) 339 for (int i = 0; i < 20; i++)
269 { 340 {
270 // load a entity 341 // load a entity
271 txtprt_parser p; 342 txtprt_parser p;
272 entity *e; 343 geometry *g;
273 try 344 try
274 { 345 {
275 e = p.read ("test.blasc"); 346 g = p.read ("test.blasc");
276 } 347 }
277 catch (txtprt_i_exception & e) 348 catch (txtprt_i_exception & e)
278 { 349 {
279 cout << "ERR: " << e.msg << endl; 350 cout << "ERR: " << e.msg << endl;
280 } 351 }
281 352
282 entity_transform *f = new entity_transform; 353 entity *e = new entity (g);
283 f->set (e); 354 e->move (vec3 (i*5, -3, -i*10));
284 f->update (matrix::translation (vec3 (i*5, -3, -i*10)));
285 f->show (); 355 e->show ();
356 }
357
358 {
359 fisch (vec3 (0, 0, -2e9), 1e9, 8);
360 //entity *planet = new entity (new geometry_sphere (1e9));
361 //planet->move (vec3 (0, 0, -1.5e9));
362 //planet->show ();
286 } 363 }
287 draw_some_random_funky_floor_dance_music (10, -500, -10, -1000); 364
365 {
366 entity *planet = new entity (new geometry_sphere (testmat, 4e15));
367 planet->move (vec3 (0, 0, 1e17));
368 planet->show ();
369 }
370
371 //draw_floor (10, -500, -10, -1000);
372 draw_level ();
373
374#if 0
375 {
376 geometry_heightfield *hf = new geometry_heightfield (100000., 100000.);
377 entity *e = new entity (hf);
378 e->move (vec3 (-100000, -100000 * 0.01, -100000));
379 e->show ();
380 }
381#endif
382
383 //draw_test_nurb ();
384
385 //camera.orig.x = 108; camera.orig.y = 0; camera.orig.z = -368;
288 camera.orig.x = camera.orig.y = camera.orig.z = 0; 386 camera.orig.x = 0; camera.orig.y = 0; camera.orig.z = 0;
289 camera.p = point (0, 0, 10); 387 camera.p = point (0, 0, 10);
290 camera.d = vec3 (0, 0, -1); 388 camera.d = vec3 (0, 0, -1);
291 camera.u = vec3 (0, 1, 0); 389 camera.u = vec3 (0, 1, 0);
292 camera.w = w; camera.h = h; 390 camera.w = w; camera.h = h;
293 camera.fov = 80; 391 camera.fov = 40.;
294 392
295 glMatrixMode (GL_MODELVIEW);
296 glLoadIdentity ();
297
298 glEnable (GL_CULL_FACE);
299 glEnable (GL_DEPTH_TEST); 393 glDisable (GL_ALPHA_TEST);
300
301 glShadeModel (GL_SMOOTH);
302
303 glEnable (GL_LIGHTING);
304 //GLfloat lightc[4] = { 1, 0.1, 0.1, 1 };
305 //glLightf (GL_LIGHT0, GL_QUADRATIC_ATTENUATION);
306 //glLightfv (GL_LIGHT0, GL_DIFFUSE, lightc);
307 glEnable (GL_LIGHT0);
308
309 cgc = cgCreateContext ();
310
311 vsh_profile = CG_PROFILE_ARBVP1;
312 //if (cgGLIsProfileSupported (CG_PROFILE_VP30)) vsh_profile = CG_PROFILE_VP30;
313 //if (cgGLIsProfileSupported (CG_PROFILE_VP40)) vsh_profile = CG_PROFILE_VP40;
314 fsh_profile = CG_PROFILE_ARBFP1;
315 //if (cgGLIsProfileSupported (CG_PROFILE_FP30)) fsh_profile = CG_PROFILE_FP30;
316 //if (cgGLIsProfileSupported (CG_PROFILE_FP40)) fsh_profile = CG_PROFILE_FP40;
317
318 vsh = cgCreateProgramFromFile (cgc, CG_SOURCE, "vsh.cg", vsh_profile, 0, 0);
319 CheckCgError ();
320 cgGLLoadProgram (vsh);
321 CheckCgError ();
322 mv = cgGetNamedParameter (vsh, "WorldProj");
323 mvp = cgGetNamedParameter (vsh, "WorldViewProj");
324 lightpos = cgGetNamedParameter (vsh, "LightPos");
325 CheckCgError ();
326
327 CGparameter g_Texture; // the texture parameter
328
329
330 fsh = cgCreateProgramFromFile (cgc, CG_SOURCE, "fsh.cg", fsh_profile, 0, 0);
331 Texture t("o.jpg");
332 g_Texture = cgGetNamedParameter(fsh, "Texture"); // the texture cg-warper ;)
333 cgGLSetTextureParameter(g_Texture, t.texture); // Bind the texture number 999 to g_Texture
334 CheckCgError ();
335 cgGLLoadProgram (fsh);
336 CheckCgError ();
337
338 cgGLBindProgram (vsh);
339 CheckCgError ();
340 cgGLBindProgram (fsh);
341 CheckCgError ();
342 394
343 /* Loop until done. */ 395 /* Loop until done. */
344 start_time = SDL_GetTicks ();
345 frames = 0; 396 frames = 0;
346 397
398 linear_light mylight, mylight2;
399
400 mylight.radius = 100000;
401 mylight.c = colour (1., 1, 1, 1.);
402 mylight.intensity = 1.F;
403
404 mylight2.radius = 100000;
405 mylight2.c = colour (1., 0, 0, 1.);
406 mylight2.intensity = 1.F;
407
408 pass_data pass_light (&mylight);
409 pass_data pass_light2 (&mylight2);
410
347 while (!done) 411 while (!done)
348 { 412 {
349 GLenum gl_error;
350 char *sdl_error; 413 char *sdl_error;
351 SDL_Event event; 414 SDL_Event event;
352 415
353 camera.p.x += camera_velocity_factor * camera_velocity.x * timer.diff;
354 camera.p.y += camera_velocity_factor * camera_velocity.y * timer.diff;
355 camera.p.z += camera_velocity_factor * camera_velocity.z * timer.diff;
356
357 camera_angle += camera_velocity_factor * camera_velocity_angle * timer.diff; 416 camera_angle += 90 * camera_velocity_angle * timer.diff;
358 camera.d.z = -cos (camera_angle * 12 / 180.); 417 camera_angle2 += 90 * camera_velocity_angle2 * timer.diff;
359 camera.d.x = sin (camera_angle * 12 / 180.);
360 418
361 cgGLSetParameter4f (lightpos, camera.p.x, camera.p.y, camera.p.z, 1); 419 vec3 geradeaus = matrix::rotation (-camera_angle, vec3 (0, 1, 0)) * vec3 (0, 0, -1);
420 vec3 right = matrix::rotation (90., vec3 (0, 1, 0)) * geradeaus;
362 421
363 glBindTexture (GL_TEXTURE_2D, t.texture); 422 camera.d = matrix::rotation (camera_angle2, right) * geradeaus;
364 cgGLEnableTextureParameter (g_Texture); // Enable the texture parameter 423 camera.u = cross (camera.d, right);
365 424
366#if 0 425 camera.p = camera.p - camera.d * (camera_velocity_factor * timer.diff) * camera_velocity.z;
367 static GLfloat ry; 426 camera.p = camera.p - camera.u * (camera_velocity_factor * timer.diff) * camera_velocity.y;
368 ry += 0.001;
369 camera.d.x = cos (ry);
370 camera.d.z = sin (ry);
371 //camera.d.y = sin (ry * 0.1);
372#endif
373 427
428 mylight.orig = camera.orig;
429 mylight.p = camera.p;
430
431 mylight2.orig = camera.orig;
432 mylight2.p = camera.p + vec3 (sin (timer.now * 2) * 100, 1, cos (timer.now * 2) * 100);
433
434 //mylight.intensity = max (sinf (timer.now) + 1.2F, 0.2F);
435
374 camera.begin (); 436 camera.begin ();
375 camera.pass (view::DEPTH); 437 camera.render (pass_depth);
376 camera.pass (view::LIGHTED); 438 camera.render (pass_postdepth);
439 camera.render (pass_light);
440 //camera.render (view::LIGHTED, pass_light2);
377 camera.end (); 441 camera.end ();
378 442
379 SDL_GL_SwapBuffers (); 443 SDL_GL_SwapBuffers ();
380 timer.frame (); 444 timer.frame ();
381 445
446#if 0
382 /* Check for error conditions. */ 447 /* Check for error conditions. */
383 gl_error = glGetError (); 448 gl_error = glGetError ();
384 449
385 if (gl_error != GL_NO_ERROR)
386 fprintf (stderr, "testgl: OpenGL error: %d\n", gl_error); 450 if (gl_error != GL_NO_ERROR) fprintf (stderr, "testgl: OpenGL error: %d\n", gl_error);
387 451
388 sdl_error = SDL_GetError (); 452 sdl_error = SDL_GetError ();
389 453
390 if (sdl_error[0] != '\0') 454 if (sdl_error[0] != '\0')
391 { 455 {
392 fprintf (stderr, "testgl: SDL error '%s'\n", sdl_error); 456 fprintf (stderr, "testgl: SDL error '%s'\n", sdl_error);
393 SDL_ClearError (); 457 SDL_ClearError ();
394 } 458 }
395 459
396 /* Allow the user to see what's happening */ 460 /* Allow the user to see what's happening */
397 //SDL_Delay (20); 461 //SDL_Delay (40);
462#endif
398 463
399 /* Check if there's a pending event. */ 464 /* Check if there's a pending event. */
400 while (SDL_PollEvent (&event)) 465 while (SDL_PollEvent (&event))
401 done = HandleEvent (&event); 466 done = HandleEvent (&event);
402 467
403
404 ++frames; 468 ++frames;
405 }
406
407 /* Print out the frames per second */
408 this_time = SDL_GetTicks ();
409 if (this_time != start_time)
410 {
411 printf ("%2.2f FPS\n",
412 ((float) frames / (this_time - start_time)) * 1000.0);
413 } 469 }
414 470
415 if (global_image) 471 if (global_image)
416 { 472 {
417 SDL_FreeSurface (global_image); 473 SDL_FreeSurface (global_image);
418 global_image = NULL; 474 global_image = NULL;
419 } 475 }
476
420 if (global_texture) 477 if (global_texture)
421 { 478 {
422 glDeleteTextures (1, &global_texture); 479 glDeleteTextures (1, &global_texture);
423 global_texture = 0; 480 global_texture = 0;
424 } 481 }
425 482
426 /* Destroy our GL context, etc. */ 483 /* Destroy our GL context, etc. */
427 SDL_Quit (); 484 SDL_Quit ();
428 return (0); 485 return (0);
429} 486}
430
431int 487int
432main (int argc, char *argv[]) 488main (int argc, char *argv[])
433{ 489{
434 int i, logo; 490 int i, logo;
435 int numtests; 491 int numtests;

Diff Legend

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