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

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

Diff Legend

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