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

Comparing libgender/test.C (file contents):
Revision 1.34 by root, Wed Oct 6 01:41:30 2004 UTC vs.
Revision 1.85 by root, Sat Nov 6 00:52:36 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;
19 19
20static void CheckCgError(void) 20#include "shader.h"
21{
22 CGerror err = cgGetError();
23
24 if (err != CG_NO_ERROR)
25 {
26 printf("CG error: %s\n", cgGetErrorString(err));
27 exit(1);
28 }
29}
30 21
31/**********************************************************************/ 22/**********************************************************************/
32 23
33view camera; 24view camera;
34vec3 camera_velocity; 25vec3 camera_velocity;
26float camera_angle, camera_angle2, camera_velocity_angle, camera_velocity_angle2;
35float camera_velocity_factor = 20; 27float camera_velocity_factor = 80;
36 28
37void 29void
38HotKey_ToggleFullScreen (void) 30HotKey_ToggleFullScreen (void)
39{ 31{
40 SDL_Surface *screen; 32 SDL_Surface *screen;
41 33
42 screen = SDL_GetVideoSurface (); 34 screen = SDL_GetVideoSurface ();
35
43 if (SDL_WM_ToggleFullScreen (screen)) 36 if (SDL_WM_ToggleFullScreen (screen))
44 printf ("Toggled fullscreen mode - now %s\n", 37 printf ("Toggled fullscreen mode - now %s\n",
45 (screen->flags & SDL_FULLSCREEN) ? "fullscreen" : "windowed"); 38 (screen->flags & SDL_FULLSCREEN) ? "fullscreen" : "windowed");
46 else 39 else
47 printf ("Unable to toggle fullscreen mode\n"); 40 printf ("Unable to toggle fullscreen mode\n");
… …
52{ 45{
53 SDL_GrabMode mode; 46 SDL_GrabMode mode;
54 47
55 printf ("Ctrl-G: toggling input grab!\n"); 48 printf ("Ctrl-G: toggling input grab!\n");
56 mode = SDL_WM_GrabInput (SDL_GRAB_QUERY); 49 mode = SDL_WM_GrabInput (SDL_GRAB_QUERY);
50
57 if (mode == SDL_GRAB_ON) 51 if (mode == SDL_GRAB_ON)
58 printf ("Grab was on\n"); 52 printf ("Grab was on\n");
59 else 53 else
60 printf ("Grab was off\n"); 54 printf ("Grab was off\n");
61 55
62 mode = SDL_WM_GrabInput (mode ? SDL_GRAB_OFF : SDL_GRAB_ON); 56 mode = SDL_WM_GrabInput (mode ? SDL_GRAB_OFF : SDL_GRAB_ON);
57
63 if (mode == SDL_GRAB_ON) 58 if (mode == SDL_GRAB_ON)
64 printf ("Grab is now on\n"); 59 printf ("Grab is now on\n");
65 else 60 else
66 printf ("Grab is now off\n"); 61 printf ("Grab is now off\n");
67} 62}
… …
77HandleEvent (SDL_Event * event) 72HandleEvent (SDL_Event * event)
78{ 73{
79 int done; 74 int done;
80 75
81 done = 0; 76 done = 0;
77
82 switch (event->type) 78 switch (event->type)
83 { 79 {
84 case SDL_ACTIVEEVENT: 80 case SDL_ACTIVEEVENT:
85 /* See what happened */ 81 /* See what happened */
86 printf ("app %s ", event->active.gain ? "gained" : "lost"); 82 printf ("app %s ", event->active.gain ? "gained" : "lost");
87 if (event->active.state & SDL_APPACTIVE) 83 if (event->active.state & SDL_APPACTIVE)
88 {
89 printf ("active "); 84 printf ("active ");
90 }
91 else if (event->active.state & SDL_APPMOUSEFOCUS) 85 else if (event->active.state & SDL_APPMOUSEFOCUS)
92 {
93 printf ("mouse "); 86 printf ("mouse ");
94 }
95 else if (event->active.state & SDL_APPINPUTFOCUS) 87 else if (event->active.state & SDL_APPINPUTFOCUS)
96 {
97 printf ("input "); 88 printf ("input ");
98 }
99 89
100 printf ("focus\n"); 90 printf ("focus\n");
101 break; 91 break;
102 92
103 case SDL_KEYDOWN: 93 case SDL_KEYDOWN:
104 if (event->key.keysym.sym == SDLK_UP) camera_velocity.z--; 94 if (event->key.keysym.sym == SDLK_UP) camera_velocity.z--;
105 if (event->key.keysym.sym == SDLK_DOWN) camera_velocity.z++; 95 if (event->key.keysym.sym == SDLK_DOWN) camera_velocity.z++;
106 if (event->key.keysym.sym == SDLK_LEFT) camera_velocity.x--;
107 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--;
108 if (event->key.keysym.sym == SDLK_a) camera_velocity.y--; 100 if (event->key.keysym.sym == SDLK_e) camera_velocity.y--;
109 if (event->key.keysym.sym == SDLK_s) camera_velocity.y++; 101 if (event->key.keysym.sym == SDLK_q) camera_velocity.y++;
110 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;
111 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;
112 104
113 if (event->key.keysym.sym == SDLK_ESCAPE) 105 if (event->key.keysym.sym == SDLK_ESCAPE)
114 done = 1; 106 done = 1;
115 107
116 if ((event->key.keysym.sym == SDLK_g) && 108 if ((event->key.keysym.sym == SDLK_g) &&
… …
128 break; 120 break;
129 121
130 case SDL_KEYUP: 122 case SDL_KEYUP:
131 if (event->key.keysym.sym == SDLK_UP) camera_velocity.z++; 123 if (event->key.keysym.sym == SDLK_UP) camera_velocity.z++;
132 if (event->key.keysym.sym == SDLK_DOWN) camera_velocity.z--; 124 if (event->key.keysym.sym == SDLK_DOWN) camera_velocity.z--;
133 if (event->key.keysym.sym == SDLK_LEFT) camera_velocity.x++; 125 if (event->key.keysym.sym == SDLK_LEFT) camera_velocity_angle++;
134 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++;
135 if (event->key.keysym.sym == SDLK_a) camera_velocity.y++; 129 if (event->key.keysym.sym == SDLK_e) camera_velocity.y++;
136 if (event->key.keysym.sym == SDLK_s) camera_velocity.y--; 130 if (event->key.keysym.sym == SDLK_q) camera_velocity.y--;
137 break; 131 break;
138 132
139 case SDL_QUIT: 133 case SDL_QUIT:
140 done = 1; 134 done = 1;
141 break; 135 break;
142 } 136 }
143 137
144 return (done); 138 return (done);
145} 139}
146 140
147/* Quick utility function for texture creation */ 141void draw_floor (int size, int dx, int dy, int dz)
148static int
149power_of_two (int input)
150{ 142{
151 int value = 1; 143 int x, z, ry;
152 144
153 while (value < input) 145 for (x = 0; x < 10; x++)
154 {
155 value <<= 1;
156 } 146 {
157 return value; 147 for (z = 0; z < 10; z++)
158} 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)));
159 154
160GLuint 155 geometry_quads *q = new geometry_quads;
161SDL_GL_LoadTexture (SDL_Surface * surface, GLfloat * texcoord) 156 //q->m = new simple_material;
162{ 157 q->set (pts);
163 GLuint texture; 158 entity *e = new entity (q);
164 int w, h; 159 e->move (vec3 (dx + x * size, dy, dz + z * size));
165 SDL_Surface *image; 160 e->show ();
166 SDL_Rect area; 161 }
167 Uint32 saved_flags;
168 Uint8 saved_alpha;
169
170 /* Use the surface width and height expanded to powers of 2 */
171 w = power_of_two (surface->w);
172 h = power_of_two (surface->h);
173 texcoord[0] = 0.0f; /* Min X */
174 texcoord[1] = 0.0f; /* Min Y */
175 texcoord[2] = (GLfloat) surface->w / w; /* Max X */
176 texcoord[3] = (GLfloat) surface->h / h; /* Max Y */
177
178 image = SDL_CreateRGBSurface (SDL_SWSURFACE, w, h, 32,
179#if SDL_BYTEORDER == SDL_LIL_ENDIAN /* OpenGL RGBA masks */
180 0x000000FF, 0x0000FF00, 0x00FF0000, 0xFF000000
181#else
182 0xFF000000, 0x00FF0000, 0x0000FF00, 0x000000FF
183#endif
184 );
185 if (image == NULL)
186 { 162 }
187 return 0; 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)
188 } 181 {
182 GLfloat r2 = radius * .1F;
183 GLfloat r3 = radius + r2;
189 184
190 /* Save the alpha blending attributes */ 185 fisch (center + vec3 (r3, 0, 0), r2, depth);
191 saved_flags = surface->flags & (SDL_SRCALPHA | SDL_RLEACCELOK); 186 fisch (center + vec3 (0, 0, r3), r2, depth);
192 saved_alpha = surface->format->alpha; 187 fisch (center + vec3 (-r3, 0, 0), r2, depth);
193 if ((saved_flags & SDL_SRCALPHA) == SDL_SRCALPHA)
194 { 188 }
195 SDL_SetAlpha (surface, 0, 0);
196 }
197
198 /* Copy the surface into the GL texture image */
199 area.x = 0;
200 area.y = 0;
201 area.w = surface->w;
202 area.h = surface->h;
203 SDL_BlitSurface (surface, &area, image, &area);
204
205 /* Restore the alpha blending attributes */
206 if ((saved_flags & SDL_SRCALPHA) == SDL_SRCALPHA)
207 {
208 SDL_SetAlpha (surface, saved_flags, saved_alpha);
209 }
210
211 /* Create an OpenGL texture for the image */
212 glGenTextures (1, &texture);
213 glBindTexture (GL_TEXTURE_2D, texture);
214 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
215 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
216 glTexImage2D (GL_TEXTURE_2D,
217 0,
218 GL_RGBA, w, h, 0, GL_RGBA, GL_UNSIGNED_BYTE, image->pixels);
219 SDL_FreeSurface (image); /* No longer needed */
220
221 return texture;
222} 189}
223 190
191extern void draw_level ();
224int 192int
225RunGLTest (int argc, char *argv[], 193RunGLTest (int argc, char *argv[],
226 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)
227{ 195{
228 int i; 196 int i;
229 int rgb_size[3]; 197 int rgb_size[3];
230 int w = 640; 198 int w = 640;
231 int h = 480; 199 int h = 480;
232 int done = 0; 200 int done = 0;
233 int frames; 201 int frames;
234 Uint32 start_time, this_time;
235 Uint32 video_flags; 202 Uint32 video_flags;
236 int value; 203 int value;
204 GLenum gl_error;
237 205
238 if (SDL_Init (SDL_INIT_VIDEO) < 0) 206 if (SDL_Init (SDL_INIT_VIDEO) < 0)
239 { 207 {
240 fprintf (stderr, "Couldn't initialize SDL: %s\n", SDL_GetError ()); 208 fprintf (stderr, "Couldn't initialize SDL: %s\n", SDL_GetError ());
241 exit (1); 209 exit (1);
… …
283 } 251 }
284 252
285 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, rgb_size[0]); 253 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, rgb_size[0]);
286 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, rgb_size[1]); 254 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, rgb_size[1]);
287 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, rgb_size[2]); 255 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, rgb_size[2]);
288 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16); 256 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 24);
289 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 257 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
290 258
291 if (fsaa) 259 if (fsaa)
292 { 260 {
293 SDL_GL_SetAttribute (SDL_GL_MULTISAMPLEBUFFERS, 1); 261 SDL_GL_SetAttribute (SDL_GL_MULTISAMPLEBUFFERS, 1);
… …
299 fprintf (stderr, "Couldn't set GL mode: %s\n", SDL_GetError ()); 267 fprintf (stderr, "Couldn't set GL mode: %s\n", SDL_GetError ());
300 SDL_Quit (); 268 SDL_Quit ();
301 exit (1); 269 exit (1);
302 } 270 }
303 271
304 printf ("Screen BPP: %d\n", SDL_GetVideoSurface ()->format->BitsPerPixel); 272 //printf ("Screen BPP: %d\n", SDL_GetVideoSurface ()->format->BitsPerPixel);
305 printf ("\n"); 273 //printf ("\n");
306 printf ("Vendor : %s\n", glGetString (GL_VENDOR)); 274 //printf ("Vendor : %s\n", glGetString (GL_VENDOR));
307 printf ("Renderer : %s\n", glGetString (GL_RENDERER)); 275 //printf ("Renderer : %s\n", glGetString (GL_RENDERER));
308 printf ("Version : %s\n", glGetString (GL_VERSION)); 276 //printf ("Version : %s\n", glGetString (GL_VERSION));
309 printf ("Extensions : %s\n", glGetString (GL_EXTENSIONS)); 277 //printf ("Extensions : %s\n", glGetString (GL_EXTENSIONS));
310 printf ("\n"); 278 printf ("\n");
311 279
312 SDL_GL_GetAttribute (SDL_GL_RED_SIZE, &value); 280 SDL_GL_GetAttribute (SDL_GL_RED_SIZE, &value);
313 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);
314 SDL_GL_GetAttribute (SDL_GL_GREEN_SIZE, &value); 282 SDL_GL_GetAttribute (SDL_GL_GREEN_SIZE, &value);
… …
334 302
335 /* Set the gamma for the window */ 303 /* Set the gamma for the window */
336 if (gamma != 0.0) 304 if (gamma != 0.0)
337 SDL_SetGamma (gamma, gamma, gamma); 305 SDL_SetGamma (gamma, gamma, gamma);
338 306
339 // load a entity 307
308
309 testmat = new test_material;
310
311 entity *planet = new entity (new geometry_sphere (testmat, 10));
312 planet->move (vec3 (0, 0, -20));
313 planet->show ();
314
315 doom3parse ("test.proc");
316
340 for (int i = 0; i < 7; i++) 317 for (int i = 0; i < 20; i++)
341 { 318 {
319 // load a entity
342 txtprt_parser p; 320 txtprt_parser p;
343 entity_transform *f = new entity_transform; 321 geometry *g;
344 entity *e;
345 try 322 try
346 { 323 {
347 e = p.read ("test.blasc"); 324 g = p.read ("test.blasc");
325 }
348 } catch (txtprt_i_exception & e) 326 catch (txtprt_i_exception & e)
349 { 327 {
350 cout << "ERR: " << e.msg << endl; 328 cout << "ERR: " << e.msg << endl;
351 } 329 }
352 f->set (e); 330
353 f->update (matrix::translation (vec3 (0, -1, -i*5))); 331 entity *e = new entity (g);
332 e->move (vec3 (i*5, -3, -i*10));
354 f->show (); 333 e->show ();
334 }
335
355 } 336 {
337 fisch (vec3 (0, 0, -2e9), 1e9, 8);
338 //entity *planet = new entity (new geometry_sphere (1e9));
339 //planet->move (vec3 (0, 0, -1.5e9));
340 //planet->show ();
341 }
356 342
343 {
344 entity *planet = new entity (new geometry_sphere (testmat, 4e15));
345 planet->move (vec3 (0, 0, 1e17));
346 planet->show ();
347 }
348
349 //draw_floor (10, -500, -10, -1000);
350 draw_level ();
351
352
353#if 0
354 {
355 geometry_heightfield *hf = new geometry_heightfield (100000., 100000.);
356 entity *e = new entity (hf);
357 e->move (vec3 (-100000, -100000 * 0.01, -100000));
358 e->show ();
359 }
360#endif
361
362 //draw_test_nurb ();
363
364 //camera.orig.x = 108; camera.orig.y = 0; camera.orig.z = -368;
357 camera.orig.x = camera.orig.y = camera.orig.z = 0; 365 camera.orig.x = 0; camera.orig.y = 0; camera.orig.z = 0;
358 camera.p = point (0, 0, 10); 366 camera.p = point (0, 0, 10);
359 camera.d = vec3 (0, 0, -1); 367 camera.d = vec3 (0, 0, -1);
360 camera.u = vec3 (0, 1, 0); 368 camera.u = vec3 (0, 1, 0);
361 camera.w = w; camera.h = h; 369 camera.w = w; camera.h = h;
362 camera.fov = 90; 370 camera.fov = 40.;
363
364 glMatrixMode (GL_MODELVIEW);
365 glLoadIdentity ();
366 371
367 glEnable (GL_CULL_FACE); 372 glEnable (GL_CULL_FACE);
368 glEnable (GL_DEPTH_TEST); 373 glDisable (GL_ALPHA_TEST);
369 374 glDisable (GL_BLEND);
370 glShadeModel (GL_SMOOTH);
371
372 glEnable (GL_LIGHTING);
373 //GLfloat lightc[4] = { 1, 0.1, 0.1, 1 };
374 //glLightf (GL_LIGHT0, GL_QUADRATIC_ATTENUATION);
375 //glLightfv (GL_LIGHT0, GL_DIFFUSE, lightc);
376 glEnable (GL_LIGHT0);
377
378 cgc = cgCreateContext ();
379 vsh = cgCreateProgramFromFile (cgc, CG_SOURCE, "vsh.cg", CG_PROFILE_ARBVP1, 0, 0);
380 CheckCgError ();
381 cgGLLoadProgram (vsh);
382 CheckCgError ();
383 mv = cgGetNamedParameter (vsh, "WorldProj");
384 mvp = cgGetNamedParameter (vsh, "WorldViewProj");
385 lightpos = cgGetNamedParameter (vsh, "LightPos");
386 CheckCgError ();
387
388 fsh = cgCreateProgramFromFile (cgc, CG_SOURCE, "fsh.cg", CG_PROFILE_ARBFP1, 0, 0);
389 CheckCgError ();
390 cgGLLoadProgram (fsh);
391 CheckCgError ();
392
393 cgGLBindProgram (vsh);
394 CheckCgError ();
395 cgGLBindProgram (fsh);
396 CheckCgError ();
397 375
398 /* Loop until done. */ 376 /* Loop until done. */
399 start_time = SDL_GetTicks ();
400 frames = 0; 377 frames = 0;
401 378
379 linear_light mylight;
380 mylight.radius = 100000;
381 mylight.c = colour (1., 1, 1, 1.);
382 mylight.intensity = 1.F;
383
384 pass pass_light (&mylight);
385
402 while (!done) 386 while (!done)
403 { 387 {
404 GLenum gl_error;
405 char *sdl_error; 388 char *sdl_error;
406 SDL_Event event; 389 SDL_Event event;
407 390
408 glClear (GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); 391 camera_angle += 180 * camera_velocity_angle * timer.diff;
392 camera_angle2 += 180 * camera_velocity_angle2 * timer.diff;
409 393
410 camera.p.x += (camera_velocity_factor * camera_velocity.x) * timer.diff; 394 vec3 geradeaus = matrix::rotation (-camera_angle, vec3 (0, 1, 0)) * vec3 (0, 0, -1);
411 camera.p.y += (camera_velocity_factor * camera_velocity.y) * timer.diff; 395 vec3 right = matrix::rotation (90., vec3 (0, 1, 0)) * geradeaus;
412 camera.p.z += (camera_velocity_factor * camera_velocity.z) * timer.diff;
413 396
414 cgGLSetParameter4f (lightpos, camera.p.x, camera.p.y, camera.p.z, 1); 397 camera.d = matrix::rotation (camera_angle2, right) * geradeaus;
398 camera.u = cross (camera.d, right);
415 399
416#if 0 400 camera.p = camera.p - camera.d * (camera_velocity_factor * timer.diff) * camera_velocity.z;
417 static GLfloat ry; 401 camera.p = camera.p - camera.u * (camera_velocity_factor * timer.diff) * camera_velocity.y;
418 ry += 0.001;
419 camera.d.x = cos (ry);
420 camera.d.z = sin (ry);
421 //camera.d.y = sin (ry * 0.1);
422#endif
423 402
403 mylight.orig = camera.orig;
404 mylight.p = camera.p;
405
406 //mylight.intensity = max (sinf (timer.now) + 1.2F, 0.2F);
407
424 camera.begin (); 408 camera.begin ();
425 camera.pass (view::DEPTH); 409 camera.render (view::DEPTH, pass_depth);
426 camera.pass (view::LIGHTED); 410 camera.render (view::POSTDEPTH, pass_depth);
411 camera.render (view::LIGHTED, pass_light);
427 camera.end (); 412 camera.end ();
428 413
429 SDL_GL_SwapBuffers (); 414 SDL_GL_SwapBuffers ();
430 timer.frame (); 415 timer.frame ();
431 416
417#if 0
432 /* Check for error conditions. */ 418 /* Check for error conditions. */
433 gl_error = glGetError (); 419 gl_error = glGetError ();
434 420
435 if (gl_error != GL_NO_ERROR)
436 fprintf (stderr, "testgl: OpenGL error: %d\n", gl_error); 421 if (gl_error != GL_NO_ERROR) fprintf (stderr, "testgl: OpenGL error: %d\n", gl_error);
437 422
438 sdl_error = SDL_GetError (); 423 sdl_error = SDL_GetError ();
439 424
440 if (sdl_error[0] != '\0') 425 if (sdl_error[0] != '\0')
441 { 426 {
442 fprintf (stderr, "testgl: SDL error '%s'\n", sdl_error); 427 fprintf (stderr, "testgl: SDL error '%s'\n", sdl_error);
443 SDL_ClearError (); 428 SDL_ClearError ();
444 } 429 }
445 430
446 /* Allow the user to see what's happening */ 431 /* Allow the user to see what's happening */
447 //SDL_Delay (20); 432 //SDL_Delay (40);
433#endif
448 434
449 /* Check if there's a pending event. */ 435 /* Check if there's a pending event. */
450 while (SDL_PollEvent (&event)) 436 while (SDL_PollEvent (&event))
451 done = HandleEvent (&event); 437 done = HandleEvent (&event);
452 438
453
454 ++frames; 439 ++frames;
455 }
456
457 /* Print out the frames per second */
458 this_time = SDL_GetTicks ();
459 if (this_time != start_time)
460 {
461 printf ("%2.2f FPS\n",
462 ((float) frames / (this_time - start_time)) * 1000.0);
463 } 440 }
464 441
465 if (global_image) 442 if (global_image)
466 { 443 {
467 SDL_FreeSurface (global_image); 444 SDL_FreeSurface (global_image);
468 global_image = NULL; 445 global_image = NULL;
469 } 446 }
447
470 if (global_texture) 448 if (global_texture)
471 { 449 {
472 glDeleteTextures (1, &global_texture); 450 glDeleteTextures (1, &global_texture);
473 global_texture = 0; 451 global_texture = 0;
474 } 452 }
475 453
476 /* Destroy our GL context, etc. */ 454 /* Destroy our GL context, etc. */
477 SDL_Quit (); 455 SDL_Quit ();
478 return (0); 456 return (0);
479} 457}
480
481int 458int
482main (int argc, char *argv[]) 459main (int argc, char *argv[])
483{ 460{
484 int i, logo; 461 int i, logo;
485 int numtests; 462 int numtests;

Diff Legend

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