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.99 by root, Mon Feb 7 08:16:31 2005 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 <list>
6
7#include "opengl.h"
5 8
6#include "SDL.h" 9#include "SDL.h"
7#include "SDL_opengl.h" 10#include "SDL_opengl.h"
8 11
9static SDL_Surface *global_image = NULL; 12static SDL_Surface *global_image = NULL;
10static GLuint global_texture = 0; 13static GLuint global_texture = 0;
11 14
12#include "util.h" 15#include "util.h"
13#include "entity.h" 16#include "entity.h"
14#include "txtprt_import.h" 17#include "txtprt_import.h"
18#include "randlvl.h"
15 19
16CGcontext cgc; 20bool doom3parse (const char *f);
17CGprogram vsh, fsh;
18CGparameter mv, mvp;
19 21
20static void CheckCgError(void) 22#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 23
31/**********************************************************************/ 24/**********************************************************************/
32 25
33view camera; 26view camera;
34vec3 camera_velocity; 27vec3 camera_velocity;
28float camera_angle, camera_angle2, camera_velocity_angle, camera_velocity_angle2;
35float camera_velocity_factor = 10; 29float camera_velocity_factor = 80;
36 30
37void 31void
38HotKey_ToggleFullScreen (void) 32HotKey_ToggleFullScreen (void)
39{ 33{
40 SDL_Surface *screen; 34 SDL_Surface *screen;
41 35
42 screen = SDL_GetVideoSurface (); 36 screen = SDL_GetVideoSurface ();
37
43 if (SDL_WM_ToggleFullScreen (screen)) 38 if (SDL_WM_ToggleFullScreen (screen))
44 printf ("Toggled fullscreen mode - now %s\n", 39 printf ("Toggled fullscreen mode - now %s\n",
45 (screen->flags & SDL_FULLSCREEN) ? "fullscreen" : "windowed"); 40 (screen->flags & SDL_FULLSCREEN) ? "fullscreen" : "windowed");
46 else 41 else
47 printf ("Unable to toggle fullscreen mode\n"); 42 printf ("Unable to toggle fullscreen mode\n");
… …
52{ 47{
53 SDL_GrabMode mode; 48 SDL_GrabMode mode;
54 49
55 printf ("Ctrl-G: toggling input grab!\n"); 50 printf ("Ctrl-G: toggling input grab!\n");
56 mode = SDL_WM_GrabInput (SDL_GRAB_QUERY); 51 mode = SDL_WM_GrabInput (SDL_GRAB_QUERY);
52
57 if (mode == SDL_GRAB_ON) 53 if (mode == SDL_GRAB_ON)
58 printf ("Grab was on\n"); 54 printf ("Grab was on\n");
59 else 55 else
60 printf ("Grab was off\n"); 56 printf ("Grab was off\n");
61 57
62 mode = SDL_WM_GrabInput (mode ? SDL_GRAB_OFF : SDL_GRAB_ON); 58 mode = SDL_WM_GrabInput (mode ? SDL_GRAB_OFF : SDL_GRAB_ON);
59
63 if (mode == SDL_GRAB_ON) 60 if (mode == SDL_GRAB_ON)
64 printf ("Grab is now on\n"); 61 printf ("Grab is now on\n");
65 else 62 else
66 printf ("Grab is now off\n"); 63 printf ("Grab is now off\n");
67} 64}
… …
77HandleEvent (SDL_Event * event) 74HandleEvent (SDL_Event * event)
78{ 75{
79 int done; 76 int done;
80 77
81 done = 0; 78 done = 0;
79
82 switch (event->type) 80 switch (event->type)
83 { 81 {
84 case SDL_ACTIVEEVENT: 82 case SDL_ACTIVEEVENT:
85 /* See what happened */ 83 /* See what happened */
86 printf ("app %s ", event->active.gain ? "gained" : "lost"); 84 printf ("app %s ", event->active.gain ? "gained" : "lost");
87 if (event->active.state & SDL_APPACTIVE) 85 if (event->active.state & SDL_APPACTIVE)
88 {
89 printf ("active "); 86 printf ("active ");
90 }
91 else if (event->active.state & SDL_APPMOUSEFOCUS) 87 else if (event->active.state & SDL_APPMOUSEFOCUS)
92 {
93 printf ("mouse "); 88 printf ("mouse ");
94 }
95 else if (event->active.state & SDL_APPINPUTFOCUS) 89 else if (event->active.state & SDL_APPINPUTFOCUS)
96 {
97 printf ("input "); 90 printf ("input ");
98 }
99 91
100 printf ("focus\n"); 92 printf ("focus\n");
101 break; 93 break;
102 94
103#define VELOCITY 10
104 case SDL_KEYDOWN: 95 case SDL_KEYDOWN:
105 if (event->key.keysym.sym == SDLK_UP) camera_velocity.z--; 96 if (event->key.keysym.sym == SDLK_UP) camera_velocity.z--;
106 if (event->key.keysym.sym == SDLK_DOWN) camera_velocity.z++; 97 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++; 98 if (event->key.keysym.sym == SDLK_RIGHT) camera_velocity_angle++;
99 if (event->key.keysym.sym == SDLK_LEFT) camera_velocity_angle--;
100 if (event->key.keysym.sym == SDLK_PAGEUP) camera_velocity_angle2++;
101 if (event->key.keysym.sym == SDLK_PAGEDOWN) camera_velocity_angle2--;
109 if (event->key.keysym.sym == SDLK_a) camera_velocity.y--; 102 if (event->key.keysym.sym == SDLK_e) camera_velocity.y--;
110 if (event->key.keysym.sym == SDLK_s) camera_velocity.y++; 103 if (event->key.keysym.sym == SDLK_q) camera_velocity.y++;
111 if (event->key.keysym.sym == SDLK_v) camera_velocity_factor *= 1.5; 104 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; 105 if (event->key.keysym.sym == SDLK_b) camera_velocity_factor /= 1.5;
113 106
114 if (event->key.keysym.sym == SDLK_ESCAPE) 107 if (event->key.keysym.sym == SDLK_ESCAPE)
115 done = 1; 108 done = 1;
116 109
117 if ((event->key.keysym.sym == SDLK_g) && 110 if ((event->key.keysym.sym == SDLK_g) &&
… …
129 break; 122 break;
130 123
131 case SDL_KEYUP: 124 case SDL_KEYUP:
132 if (event->key.keysym.sym == SDLK_UP) camera_velocity.z++; 125 if (event->key.keysym.sym == SDLK_UP) camera_velocity.z++;
133 if (event->key.keysym.sym == SDLK_DOWN) camera_velocity.z--; 126 if (event->key.keysym.sym == SDLK_DOWN) camera_velocity.z--;
134 if (event->key.keysym.sym == SDLK_LEFT) camera_velocity.x++; 127 if (event->key.keysym.sym == SDLK_LEFT) camera_velocity_angle++;
135 if (event->key.keysym.sym == SDLK_RIGHT) camera_velocity.x--; 128 if (event->key.keysym.sym == SDLK_RIGHT) camera_velocity_angle--;
129 if (event->key.keysym.sym == SDLK_PAGEUP) camera_velocity_angle2--;
130 if (event->key.keysym.sym == SDLK_PAGEDOWN) camera_velocity_angle2++;
136 if (event->key.keysym.sym == SDLK_a) camera_velocity.y++; 131 if (event->key.keysym.sym == SDLK_e) camera_velocity.y++;
137 if (event->key.keysym.sym == SDLK_s) camera_velocity.y--; 132 if (event->key.keysym.sym == SDLK_q) camera_velocity.y--;
138 break; 133 break;
139 134
140 case SDL_QUIT: 135 case SDL_QUIT:
141 done = 1; 136 done = 1;
142 break; 137 break;
143 } 138 }
144 139
145 return (done); 140 return (done);
146} 141}
147 142
148/* Quick utility function for texture creation */ 143void draw_floor (int size, int dx, int dy, int dz)
149static int
150power_of_two (int input)
151{ 144{
152 int value = 1; 145 int x, z, ry;
153 146
154 while (value < input) 147 for (x = 0; x < 10; x++)
155 {
156 value <<= 1;
157 } 148 {
158 return value; 149 for (z = 0; z < 10; z++)
159} 150 {
151 vector<vertex_t2f_n3f_v3f> pts;
152 pts.push_back (vertex_t2f_n3f_v3f (point ( 0, 0, 0), vec3 (0, 1, 0), tex2 (0, 0)));
153 pts.push_back (vertex_t2f_n3f_v3f (point ( 0, 0, size), vec3 (0, 1, 0), tex2 (0, 1)));
154 pts.push_back (vertex_t2f_n3f_v3f (point (size, 0, size), vec3 (0, 1, 0), tex2 (1, 1)));
155 pts.push_back (vertex_t2f_n3f_v3f (point (size, 0, 0), vec3 (0, 1, 0), tex2 (1, 0)));
160 156
161GLuint 157 geometry_quads *q = new geometry_quads;
162SDL_GL_LoadTexture (SDL_Surface * surface, GLfloat * texcoord) 158 //q->m = new simple_material;
163{ 159 q->set (pts);
164 GLuint texture; 160 entity *e = new entity (q);
165 int w, h; 161 e->move (vec3 (dx + x * size, dy, dz + z * size));
166 SDL_Surface *image; 162 e->show ();
167 SDL_Rect area; 163 }
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 { 164 }
188 return 0; 165}
166
167void draw_test_nurb ()
168{
169 geometry_nurbs *q = new geometry_nurbs;
170 q->set ();
171 entity *e = new entity (q);
172 e->move (vec3 (10, 3, -4));
173 e->show ();
174}
175
176void fisch (vec3 center, GLfloat radius, int depth)
177{
178 entity *planet = new entity (new geometry_sphere (testmat, radius));
179 planet->move (center);
180 planet->show ();
181
182 if (--depth)
189 } 183 {
184 GLfloat r2 = radius * .1F;
185 GLfloat r3 = radius + r2;
190 186
191 /* Save the alpha blending attributes */ 187 fisch (center + vec3 (r3, 0, 0), r2, depth);
192 saved_flags = surface->flags & (SDL_SRCALPHA | SDL_RLEACCELOK); 188 fisch (center + vec3 (0, 0, r3), r2, depth);
193 saved_alpha = surface->format->alpha; 189 fisch (center + vec3 (-r3, 0, 0), r2, depth);
194 if ((saved_flags & SDL_SRCALPHA) == SDL_SRCALPHA)
195 { 190 }
196 SDL_SetAlpha (surface, 0, 0); 191}
192
193extern void draw_level ();
194
195std::list<entity_moveable *> moveables;
196
197void perfom_moves ()
198{
199 for (std::list<entity_moveable *>::iterator i = moveables.begin (); i != moveables.end (); ++i)
197 } 200 {
198 201 (*i)->perform_step (timer.diff);
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 { 202 }
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} 203}
224 204
225int 205int
226RunGLTest (int argc, char *argv[], 206RunGLTest (int argc, char *argv[],
227 int logo, int slowly, int bpp, float gamma, int noframe, int fsaa) 207 int logo, int slowly, int bpp, float gamma, int noframe, int fsaa)
… …
230 int rgb_size[3]; 210 int rgb_size[3];
231 int w = 640; 211 int w = 640;
232 int h = 480; 212 int h = 480;
233 int done = 0; 213 int done = 0;
234 int frames; 214 int frames;
235 Uint32 start_time, this_time;
236 Uint32 video_flags; 215 Uint32 video_flags;
237 int value; 216 int value;
217 GLenum gl_error;
238 218
239 if (SDL_Init (SDL_INIT_VIDEO) < 0) 219 if (SDL_Init (SDL_INIT_VIDEO) < 0)
240 { 220 {
241 fprintf (stderr, "Couldn't initialize SDL: %s\n", SDL_GetError ()); 221 fprintf (stderr, "Couldn't initialize SDL: %s\n", SDL_GetError ());
242 exit (1); 222 exit (1);
… …
284 } 264 }
285 265
286 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, rgb_size[0]); 266 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, rgb_size[0]);
287 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, rgb_size[1]); 267 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, rgb_size[1]);
288 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, rgb_size[2]); 268 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, rgb_size[2]);
289 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16); 269 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 24);
290 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 270 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
291 271
292 if (fsaa) 272 if (fsaa)
293 { 273 {
294 SDL_GL_SetAttribute (SDL_GL_MULTISAMPLEBUFFERS, 1); 274 SDL_GL_SetAttribute (SDL_GL_MULTISAMPLEBUFFERS, 1);
… …
300 fprintf (stderr, "Couldn't set GL mode: %s\n", SDL_GetError ()); 280 fprintf (stderr, "Couldn't set GL mode: %s\n", SDL_GetError ());
301 SDL_Quit (); 281 SDL_Quit ();
302 exit (1); 282 exit (1);
303 } 283 }
304 284
305 printf ("Screen BPP: %d\n", SDL_GetVideoSurface ()->format->BitsPerPixel); 285 //printf ("Screen BPP: %d\n", SDL_GetVideoSurface ()->format->BitsPerPixel);
306 printf ("\n"); 286 //printf ("\n");
307 printf ("Vendor : %s\n", glGetString (GL_VENDOR)); 287 //printf ("Vendor : %s\n", glGetString (GL_VENDOR));
308 printf ("Renderer : %s\n", glGetString (GL_RENDERER)); 288 //printf ("Renderer : %s\n", glGetString (GL_RENDERER));
309 printf ("Version : %s\n", glGetString (GL_VERSION)); 289 //printf ("Version : %s\n", glGetString (GL_VERSION));
310 printf ("Extensions : %s\n", glGetString (GL_EXTENSIONS)); 290 //printf ("Extensions : %s\n", glGetString (GL_EXTENSIONS));
311 printf ("\n"); 291 printf ("\n");
312 292
313 SDL_GL_GetAttribute (SDL_GL_RED_SIZE, &value); 293 SDL_GL_GetAttribute (SDL_GL_RED_SIZE, &value);
314 printf ("SDL_GL_RED_SIZE: requested %d, got %d\n", rgb_size[0], value); 294 printf ("SDL_GL_RED_SIZE: requested %d, got %d\n", rgb_size[0], value);
315 SDL_GL_GetAttribute (SDL_GL_GREEN_SIZE, &value); 295 SDL_GL_GetAttribute (SDL_GL_GREEN_SIZE, &value);
… …
335 315
336 /* Set the gamma for the window */ 316 /* Set the gamma for the window */
337 if (gamma != 0.0) 317 if (gamma != 0.0)
338 SDL_SetGamma (gamma, gamma, gamma); 318 SDL_SetGamma (gamma, gamma, gamma);
339 319
340 // load a entity 320 testmat = new test_material;
321 testmat2 = new test_material2;
322
323 entity_moveable *planet = new entity_moveable (new geometry_sphere (testmat, 10));
324 planet->move (vec3 (0, 0, -20));
325 planet->show ();
326
327 planet->v = vec3 (10, 0, 0);
328 moveables.push_back (planet);
329
330 doom3parse ("test.proc");
331
341 for (int i = 0; i < 7; i++) 332 for (int i = 0; i < 20; i++)
342 { 333 {
334 // load a entity
343 txtprt_parser p; 335 txtprt_parser p;
344 entity_transform *f = new entity_transform; 336 geometry *g;
345 entity *e;
346 try 337 try
347 { 338 {
348 e = p.read ("test.blasc"); 339 g = p.read ("test.blasc");
340 }
349 } catch (txtprt_i_exception & e) 341 catch (txtprt_i_exception & e)
350 { 342 {
351 cout << "ERR: " << e.msg << endl; 343 cout << "ERR: " << e.msg << endl;
352 } 344 }
353 f->set (e); 345
354 f->update (matrix::translation (vec3 (0, -1, -i*5))); 346 entity *e = new entity (g);
347 e->move (vec3 (i*5, -3, -i*10));
355 f->show (); 348 e->show ();
349 }
350
351 {
352 fisch (vec3 (0, 0, -2e9), 1e9, 8);
353 //entity *planet = new entity (new geometry_sphere (1e9));
354 //planet->move (vec3 (0, 0, -1.5e9));
355 //planet->show ();
356 } 356 }
357 357
358 {
359 entity *planet = new entity (new geometry_sphere (testmat, 4e15));
360 planet->move (vec3 (0, 0, 1e17));
361 planet->show ();
362 }
363
364 {
365 RandomBuilding r;
366 entity *randlvl = r.draw (1000, 1000, 200);
367 randlvl->move (vec3 (0, 0, 0));
368 randlvl->show ();
369
370 entity *randlvl2 = r.draw (1000, 10000, 1000);
371 randlvl2->move (vec3 (-20000, 0, 0));
372 randlvl2->show ();
373
374 entity *randlvl3 = r.draw (100, 30, 3);
375 randlvl3->move (vec3 (-1000, 0, 0));
376 randlvl3->show ();
377
378
379 entity *randlvl4 = r.draw (100, 1000000, 100000);
380 randlvl4->move (vec3 (0, -1001000, 0));
381 randlvl4->show ();
382 }
383
384 //draw_floor (10, -500, -10, -1000);
385 draw_level ();
386
387#if 0
388 {
389 geometry_heightfield *hf = new geometry_heightfield (100000., 100000.);
390 entity *e = new entity (hf);
391 e->move (vec3 (-100000, -100000 * 0.01, -100000));
392 e->show ();
393 }
394#endif
395
396 //draw_test_nurb ();
397
398 //camera.orig.x = 108; camera.orig.y = 0; camera.orig.z = -368;
358 camera.orig.x = camera.orig.y = camera.orig.z = 0; 399 camera.orig.x = 0; camera.orig.y = 0; camera.orig.z = 0;
359 camera.p = point (0, 0, 10); 400 camera.p = point (0, 0, 10);
360 camera.d = vec3 (0, 0, -1); 401 camera.d = vec3 (0, 0, -1);
361 camera.u = vec3 (0, 1, 0); 402 camera.u = vec3 (0, 1, 0);
362 camera.w = w; camera.h = h; 403 camera.w = w; camera.h = h;
363 camera.fov = 90; 404 camera.fov = 40.;
364 405
365 glMatrixMode (GL_MODELVIEW);
366 glLoadIdentity ();
367
368 glEnable (GL_CULL_FACE);
369 glEnable (GL_DEPTH_TEST); 406 glDisable (GL_ALPHA_TEST);
370 //glEnable(GL_VERTEX_PROGRAM_ARB);
371 //glEnable(GL_FRAGMENT_PROGRAM_ARB);
372
373 glShadeModel (GL_SMOOTH);
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 407
400 /* Loop until done. */ 408 /* Loop until done. */
401 start_time = SDL_GetTicks ();
402 frames = 0; 409 frames = 0;
403 410
404 draw_context c (camera); 411 linear_light mylight2;//mylight, mylight2;
412
413 // mylight.radius = 100000;
414 // mylight.c = colour (1., 1, 1, 1.);
415 // mylight.intensity = 1.F;
416
417 mylight2.radius = 100000;
418 mylight2.c = colour (1., 1., 1., 1.);
419 mylight2.intensity = 1.F;
420 mylight2.orig.x = 0; mylight2.orig.y = 0; mylight2.orig.z = 0;
421 mylight2.p.x = 0; mylight2.p.y = 0; mylight2.p.z = 0;
422
423 //pass_data pass_light (&mylight);
424 pass_data pass_light2 (&mylight2);
405 425
406 while (!done) 426 while (!done)
407 { 427 {
408 GLenum gl_error;
409 char *sdl_error; 428 char *sdl_error;
410 SDL_Event event; 429 SDL_Event event;
411 430
412 glClear (GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); 431 camera_angle += 90 * camera_velocity_angle * timer.diff;
432 camera_angle2 += 90 * camera_velocity_angle2 * timer.diff;
413 433
414 camera.p.x += (camera_velocity_factor * camera_velocity.x) * timer.diff; 434 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; 435 vec3 right = matrix::rotation (90., vec3 (0, 1, 0)) * geradeaus;
416 camera.p.z += (camera_velocity_factor * camera_velocity.z) * timer.diff;
417 436
418 GLfloat lightp[4]; 437 camera.d = matrix::rotation (camera_angle2, right) * geradeaus;
438 camera.u = cross (camera.d, right);
439
440 camera.p = camera.p - camera.d * (camera_velocity_factor * timer.diff) * camera_velocity.z;
441 camera.p = camera.p - camera.u * (camera_velocity_factor * timer.diff) * camera_velocity.y;
442
443 //mylight.orig = camera.orig;
419 lightp[0] = camera.p.x; 444 //mylight.p = camera.p;
420 lightp[1] = camera.p.y;
421 lightp[2] = camera.p.z;
422 lightp[3] = 1;
423 glLightfv (GL_LIGHT0, GL_POSITION, lightp);
424 445
425#if 0 446 mylight2.orig = camera.orig;
426 static GLfloat ry; 447 mylight2.p = vec3 (sin (timer.now / 2) * 100000, 1, cos (timer.now / 2) * 100000);
427 ry += 0.001; 448
428 camera.d.x = cos (ry); 449 //mylight.intensity = max (sinf (timer.now) + 1.2F, 0.2F);
450
429 camera.d.z = sin (ry); 451 camera.begin ();
430 //camera.d.y = sin (ry * 0.1); 452 camera.render (pass_depth);
431#endif 453 camera.render (pass_postdepth);
432 454 camera.render (pass_light2);
433 c.mode = draw_context::DEPTH; 455 //camera.render (view::LIGHTED, pass_light2);
434 camera.draw (c); 456 camera.end ();
435 c.mode = draw_context::LIGHTED; 457
436 camera.draw (c); 458 perfom_moves ();
437 459
438 SDL_GL_SwapBuffers (); 460 SDL_GL_SwapBuffers ();
439 timer.frame (); 461 timer.frame ();
440 462
463#if 0
441 /* Check for error conditions. */ 464 /* Check for error conditions. */
442 gl_error = glGetError (); 465 gl_error = glGetError ();
443 466
444 if (gl_error != GL_NO_ERROR)
445 fprintf (stderr, "testgl: OpenGL error: %d\n", gl_error); 467 if (gl_error != GL_NO_ERROR) fprintf (stderr, "testgl: OpenGL error: %d\n", gl_error);
446 468
447 sdl_error = SDL_GetError (); 469 sdl_error = SDL_GetError ();
448 470
449 if (sdl_error[0] != '\0') 471 if (sdl_error[0] != '\0')
450 { 472 {
451 fprintf (stderr, "testgl: SDL error '%s'\n", sdl_error); 473 fprintf (stderr, "testgl: SDL error '%s'\n", sdl_error);
452 SDL_ClearError (); 474 SDL_ClearError ();
453 } 475 }
454 476
455 /* Allow the user to see what's happening */ 477 /* Allow the user to see what's happening */
456 //SDL_Delay (20); 478 //SDL_Delay (40);
479#endif
457 480
458 /* Check if there's a pending event. */ 481 /* Check if there's a pending event. */
459 while (SDL_PollEvent (&event)) 482 while (SDL_PollEvent (&event))
460 done = HandleEvent (&event); 483 done = HandleEvent (&event);
461 484
462
463 ++frames; 485 ++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 } 486 }
473 487
474 if (global_image) 488 if (global_image)
475 { 489 {
476 SDL_FreeSurface (global_image); 490 SDL_FreeSurface (global_image);
477 global_image = NULL; 491 global_image = NULL;
478 } 492 }
493
479 if (global_texture) 494 if (global_texture)
480 { 495 {
481 glDeleteTextures (1, &global_texture); 496 glDeleteTextures (1, &global_texture);
482 global_texture = 0; 497 global_texture = 0;
483 } 498 }
484 499
485 /* Destroy our GL context, etc. */ 500 /* Destroy our GL context, etc. */
486 SDL_Quit (); 501 SDL_Quit ();
487 return (0); 502 return (0);
488} 503}
489
490int 504int
491main (int argc, char *argv[]) 505main (int argc, char *argv[])
492{ 506{
493 int i, logo; 507 int i, logo;
494 int numtests; 508 int numtests;

Diff Legend

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