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

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

Diff Legend

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