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

Comparing libgender/test.C (file contents):
Revision 1.45 by root, Wed Oct 6 17:55:40 2004 UTC vs.
Revision 1.84 by root, Sat Nov 6 00:44:50 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);
151} 139}
152 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 ();
153int 192int
154RunGLTest (int argc, char *argv[], 193RunGLTest (int argc, char *argv[],
155 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)
156{ 195{
157 int i; 196 int i;
158 int rgb_size[3]; 197 int rgb_size[3];
159 int w = 640; 198 int w = 640;
160 int h = 480; 199 int h = 480;
161 int done = 0; 200 int done = 0;
162 int frames; 201 int frames;
163 Uint32 start_time, this_time;
164 Uint32 video_flags; 202 Uint32 video_flags;
165 int value; 203 int value;
166 GLenum gl_error; 204 GLenum gl_error;
167 205
168 if (SDL_Init (SDL_INIT_VIDEO) < 0) 206 if (SDL_Init (SDL_INIT_VIDEO) < 0)
… …
213 } 251 }
214 252
215 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, rgb_size[0]); 253 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, rgb_size[0]);
216 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, rgb_size[1]); 254 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, rgb_size[1]);
217 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, rgb_size[2]); 255 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, rgb_size[2]);
218 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16); 256 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 24);
219 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 257 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
220 258
221 if (fsaa) 259 if (fsaa)
222 { 260 {
223 SDL_GL_SetAttribute (SDL_GL_MULTISAMPLEBUFFERS, 1); 261 SDL_GL_SetAttribute (SDL_GL_MULTISAMPLEBUFFERS, 1);
… …
229 fprintf (stderr, "Couldn't set GL mode: %s\n", SDL_GetError ()); 267 fprintf (stderr, "Couldn't set GL mode: %s\n", SDL_GetError ());
230 SDL_Quit (); 268 SDL_Quit ();
231 exit (1); 269 exit (1);
232 } 270 }
233 271
234 printf ("Screen BPP: %d\n", SDL_GetVideoSurface ()->format->BitsPerPixel); 272 //printf ("Screen BPP: %d\n", SDL_GetVideoSurface ()->format->BitsPerPixel);
235 printf ("\n"); 273 //printf ("\n");
236 printf ("Vendor : %s\n", glGetString (GL_VENDOR)); 274 //printf ("Vendor : %s\n", glGetString (GL_VENDOR));
237 printf ("Renderer : %s\n", glGetString (GL_RENDERER)); 275 //printf ("Renderer : %s\n", glGetString (GL_RENDERER));
238 printf ("Version : %s\n", glGetString (GL_VERSION)); 276 //printf ("Version : %s\n", glGetString (GL_VERSION));
239 printf ("Extensions : %s\n", glGetString (GL_EXTENSIONS)); 277 //printf ("Extensions : %s\n", glGetString (GL_EXTENSIONS));
240 printf ("\n"); 278 printf ("\n");
241 279
242 SDL_GL_GetAttribute (SDL_GL_RED_SIZE, &value); 280 SDL_GL_GetAttribute (SDL_GL_RED_SIZE, &value);
243 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);
244 SDL_GL_GetAttribute (SDL_GL_GREEN_SIZE, &value); 282 SDL_GL_GetAttribute (SDL_GL_GREEN_SIZE, &value);
… …
264 302
265 /* Set the gamma for the window */ 303 /* Set the gamma for the window */
266 if (gamma != 0.0) 304 if (gamma != 0.0)
267 SDL_SetGamma (gamma, gamma, gamma); 305 SDL_SetGamma (gamma, gamma, gamma);
268 306
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
269 for (int i = 0; i < 70; i++) 317 for (int i = 0; i < 20; i++)
270 { 318 {
271 // load a entity 319 // load a entity
272 txtprt_parser p; 320 txtprt_parser p;
273 entity *e; 321 geometry *g;
274 try 322 try
275 { 323 {
276 e = p.read ("test.blasc"); 324 g = p.read ("test.blasc");
277 } 325 }
278 catch (txtprt_i_exception & e) 326 catch (txtprt_i_exception & e)
279 { 327 {
280 cout << "ERR: " << e.msg << endl; 328 cout << "ERR: " << e.msg << endl;
281 } 329 }
282 330
283 entity_transform *f = new entity_transform; 331 entity *e = new entity (g);
284 f->set (e); 332 e->move (vec3 (i*5, -3, -i*10));
285 f->update (matrix::translation (vec3 (i*5, -3, -i*10)));
286 f->show (); 333 e->show ();
334 }
335
287 } 336 {
288 draw_some_random_funky_floor_dance_music (10, -500, -10, -1000); 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 }
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;
289 camera.orig.x = camera.orig.y = camera.orig.z = 0; 365 camera.orig.x = 0; camera.orig.y = 0; camera.orig.z = 0;
290 camera.p = point (0, 0, 10); 366 camera.p = point (0, 0, 10);
291 camera.d = vec3 (0, 0, -1); 367 camera.d = vec3 (0, 0, -1);
292 camera.u = vec3 (0, 1, 0); 368 camera.u = vec3 (0, 1, 0);
293 camera.w = w; camera.h = h; 369 camera.w = w; camera.h = h;
294 camera.fov = 80; 370 camera.fov = 40.;
295
296 glMatrixMode (GL_MODELVIEW);
297 glLoadIdentity ();
298 371
299 glEnable (GL_CULL_FACE); 372 glEnable (GL_CULL_FACE);
300 glEnable (GL_DEPTH_TEST); 373 glDisable (GL_ALPHA_TEST);
301 374 glDisable (GL_BLEND);
302 glShadeModel (GL_SMOOTH);
303
304 glEnable (GL_LIGHTING);
305 glEnable (GL_LIGHT0);
306
307 cgc = cgCreateContext ();
308
309 vsh_profile = CG_PROFILE_ARBVP1;
310 //if (cgGLIsProfileSupported (CG_PROFILE_VP30)) vsh_profile = CG_PROFILE_VP30;
311 //if (cgGLIsProfileSupported (CG_PROFILE_VP40)) vsh_profile = CG_PROFILE_VP40;
312 fsh_profile = CG_PROFILE_ARBFP1;
313 //if (cgGLIsProfileSupported (CG_PROFILE_FP30)) fsh_profile = CG_PROFILE_FP30;
314 //if (cgGLIsProfileSupported (CG_PROFILE_FP40)) fsh_profile = CG_PROFILE_FP40;
315
316 vsh = cgCreateProgramFromFile (cgc, CG_SOURCE, "vsh.cg", vsh_profile, 0, 0);
317 CheckCgError ();
318 cgGLLoadProgram (vsh);
319 CheckCgError ();
320 mv = cgGetNamedParameter (vsh, "WorldProj");
321 mvp = cgGetNamedParameter (vsh, "WorldViewProj");
322 lightpos = cgGetNamedParameter (vsh, "LightPos");
323 CheckCgError ();
324
325 CGparameter g_Texture; // the texture parameter
326
327
328 fsh = cgCreateProgramFromFile (cgc, CG_SOURCE, "fsh.cg", fsh_profile, 0, 0);
329 Texture t("o.jpg");
330 g_Texture = cgGetNamedParameter(fsh, "Texture"); // the texture cg-warper ;)
331 cgGLSetTextureParameter(g_Texture, t.texture); // Bind the texture number 999 to g_Texture
332 CheckCgError ();
333 cgGLLoadProgram (fsh);
334 CheckCgError ();
335
336 cgGLBindProgram (vsh);
337 CheckCgError ();
338 cgGLBindProgram (fsh);
339 CheckCgError ();
340 375
341 /* Loop until done. */ 376 /* Loop until done. */
342 start_time = SDL_GetTicks ();
343 frames = 0; 377 frames = 0;
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);
344 385
345 while (!done) 386 while (!done)
346 { 387 {
347 char *sdl_error; 388 char *sdl_error;
348 SDL_Event event; 389 SDL_Event event;
349 390
350 camera.p.x += camera_velocity_factor * camera_velocity.x * timer.diff;
351 camera.p.y += camera_velocity_factor * camera_velocity.y * timer.diff;
352 camera.p.z += camera_velocity_factor * camera_velocity.z * timer.diff;
353
354 camera_angle += camera_velocity_factor * camera_velocity_angle * timer.diff; 391 camera_angle += 180 * camera_velocity_angle * timer.diff;
355 camera.d.z = -cos (camera_angle * 12 / 180.); 392 camera_angle2 += 180 * camera_velocity_angle2 * timer.diff;
356 camera.d.x = sin (camera_angle * 12 / 180.);
357 393
358 cgGLSetParameter4f (lightpos, camera.p.x, camera.p.y, camera.p.z, 1); 394 vec3 geradeaus = matrix::rotation (-camera_angle, vec3 (0, 1, 0)) * vec3 (0, 0, -1);
395 vec3 right = matrix::rotation (90., vec3 (0, 1, 0)) * geradeaus;
359 396
360 glBindTexture (GL_TEXTURE_2D, t.texture); 397 camera.d = matrix::rotation (camera_angle2, right) * geradeaus;
361 cgGLEnableTextureParameter (g_Texture); // Enable the texture parameter 398 camera.u = cross (camera.d, right);
362 399
363#if 0 400 camera.p = camera.p - camera.d * (camera_velocity_factor * timer.diff) * camera_velocity.z;
364 static GLfloat ry; 401 camera.p = camera.p - camera.u * (camera_velocity_factor * timer.diff) * camera_velocity.y;
365 ry += 0.001;
366 camera.d.x = cos (ry);
367 camera.d.z = sin (ry);
368 //camera.d.y = sin (ry * 0.1);
369#endif
370 402
403 mylight.orig = camera.orig;
404 mylight.p = camera.p;
405
406 //mylight.intensity = max (sinf (timer.now) + 1.2F, 0.2F);
407
371 camera.begin (); 408 camera.begin ();
372 camera.pass (view::DEPTH); 409 camera.render (view::DEPTH, pass_depth);
373 camera.pass (view::LIGHTED); 410 camera.render (view::POSTDEPTH, pass_depth);
411 camera.render (view::LIGHTED, pass_light);
374 camera.end (); 412 camera.end ();
375 413
376 SDL_GL_SwapBuffers (); 414 SDL_GL_SwapBuffers ();
377 timer.frame (); 415 timer.frame ();
378 416
417#if 0
379 /* Check for error conditions. */ 418 /* Check for error conditions. */
380 gl_error = glGetError (); 419 gl_error = glGetError ();
381 420
382 if (gl_error != GL_NO_ERROR) 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);
383 422
… …
388 fprintf (stderr, "testgl: SDL error '%s'\n", sdl_error); 427 fprintf (stderr, "testgl: SDL error '%s'\n", sdl_error);
389 SDL_ClearError (); 428 SDL_ClearError ();
390 } 429 }
391 430
392 /* Allow the user to see what's happening */ 431 /* Allow the user to see what's happening */
393 //SDL_Delay (20); 432 //SDL_Delay (40);
433#endif
394 434
395 /* Check if there's a pending event. */ 435 /* Check if there's a pending event. */
396 while (SDL_PollEvent (&event)) 436 while (SDL_PollEvent (&event))
397 done = HandleEvent (&event); 437 done = HandleEvent (&event);
398 438
399
400 ++frames; 439 ++frames;
401 }
402
403 /* Print out the frames per second */
404 this_time = SDL_GetTicks ();
405 if (this_time != start_time)
406 {
407 printf ("%2.2f FPS\n",
408 ((float) frames / (this_time - start_time)) * 1000.0);
409 } 440 }
410 441
411 if (global_image) 442 if (global_image)
412 { 443 {
413 SDL_FreeSurface (global_image); 444 SDL_FreeSurface (global_image);
414 global_image = NULL; 445 global_image = NULL;
415 } 446 }
447
416 if (global_texture) 448 if (global_texture)
417 { 449 {
418 glDeleteTextures (1, &global_texture); 450 glDeleteTextures (1, &global_texture);
419 global_texture = 0; 451 global_texture = 0;
420 } 452 }
421 453
422 /* Destroy our GL context, etc. */ 454 /* Destroy our GL context, etc. */
423 SDL_Quit (); 455 SDL_Quit ();
424 return (0); 456 return (0);
425} 457}
426
427int 458int
428main (int argc, char *argv[]) 459main (int argc, char *argv[])
429{ 460{
430 int i, logo; 461 int i, logo;
431 int numtests; 462 int numtests;

Diff Legend

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