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

Comparing libgender/test.C (file contents):
Revision 1.50 by root, Sat Oct 9 11:56:50 2004 UTC vs.
Revision 1.108 by root, Wed Aug 10 02:37:11 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, lightpos;
19CGprofile vsh_profile, fsh_profile;
20 21
21static void CheckCgError (void) 22#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 23
32/**********************************************************************/ 24/**********************************************************************/
33 25
34view camera; 26view camera;
35vec3 camera_velocity; 27vec3 camera_velocity;
36float camera_angle = 0, camera_velocity_angle; 28float camera_angle, camera_angle2, camera_velocity_angle, camera_velocity_angle2;
37float camera_velocity_factor = 80; 29float camera_velocity_factor = 80;
38 30
39void 31void
40HotKey_ToggleFullScreen (void) 32HotKey_ToggleFullScreen (void)
41{ 33{
42 SDL_Surface *screen; 34 SDL_Surface *screen;
43 35
44 screen = SDL_GetVideoSurface (); 36 screen = SDL_GetVideoSurface ();
37
45 if (SDL_WM_ToggleFullScreen (screen)) 38 if (SDL_WM_ToggleFullScreen (screen))
46 printf ("Toggled fullscreen mode - now %s\n", 39 printf ("Toggled fullscreen mode - now %s\n",
47 (screen->flags & SDL_FULLSCREEN) ? "fullscreen" : "windowed"); 40 (screen->flags & SDL_FULLSCREEN) ? "fullscreen" : "windowed");
48 else 41 else
49 printf ("Unable to toggle fullscreen mode\n"); 42 printf ("Unable to toggle fullscreen mode\n");
… …
54{ 47{
55 SDL_GrabMode mode; 48 SDL_GrabMode mode;
56 49
57 printf ("Ctrl-G: toggling input grab!\n"); 50 printf ("Ctrl-G: toggling input grab!\n");
58 mode = SDL_WM_GrabInput (SDL_GRAB_QUERY); 51 mode = SDL_WM_GrabInput (SDL_GRAB_QUERY);
52
59 if (mode == SDL_GRAB_ON) 53 if (mode == SDL_GRAB_ON)
60 printf ("Grab was on\n"); 54 printf ("Grab was on\n");
61 else 55 else
62 printf ("Grab was off\n"); 56 printf ("Grab was off\n");
63 57
64 mode = SDL_WM_GrabInput (mode ? SDL_GRAB_OFF : SDL_GRAB_ON); 58 mode = SDL_WM_GrabInput (mode ? SDL_GRAB_OFF : SDL_GRAB_ON);
59
65 if (mode == SDL_GRAB_ON) 60 if (mode == SDL_GRAB_ON)
66 printf ("Grab is now on\n"); 61 printf ("Grab is now on\n");
67 else 62 else
68 printf ("Grab is now off\n"); 63 printf ("Grab is now off\n");
69} 64}
… …
79HandleEvent (SDL_Event * event) 74HandleEvent (SDL_Event * event)
80{ 75{
81 int done; 76 int done;
82 77
83 done = 0; 78 done = 0;
79
84 switch (event->type) 80 switch (event->type)
85 { 81 {
86 case SDL_ACTIVEEVENT: 82 case SDL_ACTIVEEVENT:
87 /* See what happened */ 83 /* See what happened */
88 printf ("app %s ", event->active.gain ? "gained" : "lost"); 84 printf ("app %s ", event->active.gain ? "gained" : "lost");
89 if (event->active.state & SDL_APPACTIVE) 85 if (event->active.state & SDL_APPACTIVE)
90 {
91 printf ("active "); 86 printf ("active ");
92 }
93 else if (event->active.state & SDL_APPMOUSEFOCUS) 87 else if (event->active.state & SDL_APPMOUSEFOCUS)
94 {
95 printf ("mouse "); 88 printf ("mouse ");
96 }
97 else if (event->active.state & SDL_APPINPUTFOCUS) 89 else if (event->active.state & SDL_APPINPUTFOCUS)
98 {
99 printf ("input "); 90 printf ("input ");
100 }
101 91
102 printf ("focus\n"); 92 printf ("focus\n");
103 break; 93 break;
104 94
105 case SDL_KEYDOWN: 95 case SDL_KEYDOWN:
106 if (event->key.keysym.sym == SDLK_UP) camera_velocity.z--; 96 if (event->key.keysym.sym == SDLK_UP) camera_velocity.z--;
107 if (event->key.keysym.sym == SDLK_DOWN) camera_velocity.z++; 97 if (event->key.keysym.sym == SDLK_DOWN) camera_velocity.z++;
108 if (event->key.keysym.sym == SDLK_RIGHT) camera_velocity_angle++; 98 if (event->key.keysym.sym == SDLK_RIGHT) camera_velocity_angle++;
109 if (event->key.keysym.sym == SDLK_LEFT) 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--;
110 if (event->key.keysym.sym == SDLK_e) camera_velocity.y--; 102 if (event->key.keysym.sym == SDLK_e) camera_velocity.y--;
111 if (event->key.keysym.sym == SDLK_q) camera_velocity.y++; 103 if (event->key.keysym.sym == SDLK_q) camera_velocity.y++;
112 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;
113 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;
114 106
115 if (event->key.keysym.sym == SDLK_ESCAPE) 107 if (event->key.keysym.sym == SDLK_ESCAPE)
116 done = 1; 108 done = 1;
117 109
118 if ((event->key.keysym.sym == SDLK_g) && 110 if ((event->key.keysym.sym == SDLK_g) &&
… …
132 case SDL_KEYUP: 124 case SDL_KEYUP:
133 if (event->key.keysym.sym == SDLK_UP) camera_velocity.z++; 125 if (event->key.keysym.sym == SDLK_UP) camera_velocity.z++;
134 if (event->key.keysym.sym == SDLK_DOWN) camera_velocity.z--; 126 if (event->key.keysym.sym == SDLK_DOWN) camera_velocity.z--;
135 if (event->key.keysym.sym == SDLK_LEFT) camera_velocity_angle++; 127 if (event->key.keysym.sym == SDLK_LEFT) camera_velocity_angle++;
136 if (event->key.keysym.sym == SDLK_RIGHT) camera_velocity_angle--; 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++;
137 if (event->key.keysym.sym == SDLK_e) camera_velocity.y++; 131 if (event->key.keysym.sym == SDLK_e) camera_velocity.y++;
138 if (event->key.keysym.sym == SDLK_q) camera_velocity.y--; 132 if (event->key.keysym.sym == SDLK_q) camera_velocity.y--;
139 break; 133 break;
140 134
141 case SDL_QUIT: 135 case SDL_QUIT:
… …
148 142
149void draw_floor (int size, int dx, int dy, int dz) 143void draw_floor (int size, int dx, int dy, int dz)
150{ 144{
151 int x, z, ry; 145 int x, z, ry;
152 146
153 for (x = 0; x < 100; x++) 147 for (x = 0; x < 10; x++)
154 { 148 {
155 for (z = 0; z < 100; z++) 149 for (z = 0; z < 10; z++)
156 { 150 {
157 vector<vertex2d> pts; 151 vector<vertex_t2f_n3f_v3f> pts;
158 pts.push_back (vertex2d (point ( 0, 0, 0), vec3 (0, 1, 0), texc (0, 0))); 152 pts.push_back (vertex_t2f_n3f_v3f (point ( 0, 0, 0), vec3 (0, 1, 0), tex2 (0, 0)));
159 pts.push_back (vertex2d (point ( 0, 0, size), vec3 (0, 1, 0), texc (0, 1))); 153 pts.push_back (vertex_t2f_n3f_v3f (point ( 0, 0, size), vec3 (0, 1, 0), tex2 (0, 1)));
160 pts.push_back (vertex2d (point (size, 0, size), vec3 (0, 1, 0), texc (1, 1))); 154 pts.push_back (vertex_t2f_n3f_v3f (point (size, 0, size), vec3 (0, 1, 0), tex2 (1, 1)));
161 pts.push_back (vertex2d (point (size, 0, 0), vec3 (0, 1, 0), texc (1, 0))); 155 pts.push_back (vertex_t2f_n3f_v3f (point (size, 0, 0), vec3 (0, 1, 0), tex2 (1, 0)));
162 156
163 geometry_quads *q = new geometry_quads; 157 geometry_quads *q = new geometry_quads;
158 //q->m = new simple_material;
164 q->set (pts); 159 q->set (pts);
165 entity *e = new entity (q); 160 entity *e = new entity (q);
166 e->move (vec3 (dx + x * size, dy, dz + z * size)); 161 e->move (vec3 (dx + x * size, dy, dz + z * size));
167 e->show (); 162 e->show ();
168 } 163 }
169 } 164 }
170} 165}
171 166
172void draw_test_nurb () { 167void draw_test_nurb ()
168{
173 geometry_nurbs *q = new geometry_nurbs; 169 geometry_nurbs *q = new geometry_nurbs;
174 q->set (); 170 q->set ();
175 entity *e = new entity (q); 171 entity *e = new entity (q);
176 e->move (vec3 (10, 3, -4)); 172 e->move (vec3 (10, 3, -4));
177 e->show (); 173 e->show ();
178} 174}
179 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)
183 {
184 GLfloat r2 = radius * .1F;
185 GLfloat r3 = radius + r2;
186
187 fisch (center + vec3 (r3, 0, 0), r2, depth);
188 fisch (center + vec3 (0, 0, r3), r2, depth);
189 fisch (center + vec3 (-r3, 0, 0), r2, depth);
190 }
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)
200 {
201 (*i)->perform_step (timer.diff);
202 }
203}
204
180int 205int
181RunGLTest (int argc, char *argv[], 206RunGLTest (int argc, char *argv[],
182 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)
183{ 208{
184 int i; 209 int i;
185 int rgb_size[3]; 210 int rgb_size[3];
186 int w = 640; 211 int w = 800;
187 int h = 480; 212 int h = 600;
188 int done = 0; 213 int done = 0;
189 int frames; 214 int frames;
190 Uint32 start_time, this_time;
191 Uint32 video_flags; 215 Uint32 video_flags;
192 int value; 216 int value;
193 GLenum gl_error; 217 GLenum gl_error;
194 218
195 if (SDL_Init (SDL_INIT_VIDEO) < 0) 219 if (SDL_Init (SDL_INIT_VIDEO) < 0)
196 { 220 {
197 fprintf (stderr, "Couldn't initialize SDL: %s\n", SDL_GetError ()); 221 fprintf (stderr, "Couldn't initialize SDL: %s\n", SDL_GetError ());
198 exit (1); 222 exit (1);
… …
240 } 264 }
241 265
242 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, rgb_size[0]); 266 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, rgb_size[0]);
243 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, rgb_size[1]); 267 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, rgb_size[1]);
244 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, rgb_size[2]); 268 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, rgb_size[2]);
269 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 0);
245 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16); 270 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 24);
246 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 271 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
247 272
248 if (fsaa) 273 if (fsaa)
249 { 274 {
250 SDL_GL_SetAttribute (SDL_GL_MULTISAMPLEBUFFERS, 1); 275 SDL_GL_SetAttribute (SDL_GL_MULTISAMPLEBUFFERS, 1);
… …
256 fprintf (stderr, "Couldn't set GL mode: %s\n", SDL_GetError ()); 281 fprintf (stderr, "Couldn't set GL mode: %s\n", SDL_GetError ());
257 SDL_Quit (); 282 SDL_Quit ();
258 exit (1); 283 exit (1);
259 } 284 }
260 285
261 printf ("Screen BPP: %d\n", SDL_GetVideoSurface ()->format->BitsPerPixel); 286 //printf ("Screen BPP: %d\n", SDL_GetVideoSurface ()->format->BitsPerPixel);
262 printf ("\n"); 287 //printf ("\n");
263 printf ("Vendor : %s\n", glGetString (GL_VENDOR)); 288 //printf ("Vendor : %s\n", glGetString (GL_VENDOR));
264 printf ("Renderer : %s\n", glGetString (GL_RENDERER)); 289 //printf ("Renderer : %s\n", glGetString (GL_RENDERER));
265 printf ("Version : %s\n", glGetString (GL_VERSION)); 290 //printf ("Version : %s\n", glGetString (GL_VERSION));
266 printf ("Extensions : %s\n", glGetString (GL_EXTENSIONS)); 291 //printf ("Extensions : %s\n", glGetString (GL_EXTENSIONS));
267 printf ("\n"); 292 printf ("\n");
268 293
269 SDL_GL_GetAttribute (SDL_GL_RED_SIZE, &value); 294 SDL_GL_GetAttribute (SDL_GL_RED_SIZE, &value);
270 printf ("SDL_GL_RED_SIZE: requested %d, got %d\n", rgb_size[0], value); 295 printf ("SDL_GL_RED_SIZE: requested %d, got %d\n", rgb_size[0], value);
271 SDL_GL_GetAttribute (SDL_GL_GREEN_SIZE, &value); 296 SDL_GL_GetAttribute (SDL_GL_GREEN_SIZE, &value);
272 printf ("SDL_GL_GREEN_SIZE: requested %d, got %d\n", rgb_size[1], value); 297 printf ("SDL_GL_GREEN_SIZE: requested %d, got %d\n", rgb_size[1], value);
273 SDL_GL_GetAttribute (SDL_GL_BLUE_SIZE, &value); 298 SDL_GL_GetAttribute (SDL_GL_BLUE_SIZE, &value);
274 printf ("SDL_GL_BLUE_SIZE: requested %d, got %d\n", rgb_size[2], value); 299 printf ("SDL_GL_BLUE_SIZE: requested %d, got %d\n", rgb_size[2], value);
300 SDL_GL_GetAttribute (SDL_GL_ALPHA_SIZE, &value);
301 printf ("SDL_GL_ALPHA_SIZE: requested ?, got %d\n", value);
275 SDL_GL_GetAttribute (SDL_GL_DEPTH_SIZE, &value); 302 SDL_GL_GetAttribute (SDL_GL_DEPTH_SIZE, &value);
276 printf ("SDL_GL_DEPTH_SIZE: requested %d, got %d\n", bpp, value); 303 printf ("SDL_GL_DEPTH_SIZE: requested %d, got %d\n", bpp, value);
277 SDL_GL_GetAttribute (SDL_GL_DOUBLEBUFFER, &value); 304 SDL_GL_GetAttribute (SDL_GL_DOUBLEBUFFER, &value);
278 printf ("SDL_GL_DOUBLEBUFFER: requested 1, got %d\n", value); 305 printf ("SDL_GL_DOUBLEBUFFER: requested 1, got %d\n", value);
279 306
… …
291 318
292 /* Set the gamma for the window */ 319 /* Set the gamma for the window */
293 if (gamma != 0.0) 320 if (gamma != 0.0)
294 SDL_SetGamma (gamma, gamma, gamma); 321 SDL_SetGamma (gamma, gamma, gamma);
295 322
323 testmat = new test_material;
324 testmat2 = new mat_gouraud_shaded (colour (1, 1, 0));
325 testmat3 = new mat_timed ();
326 debugmat = new mat_debug ();
327
328#if 1
329 entity_moveable *planet = new entity_moveable (new geometry_sphere (testmat2, 10));
330 planet->move (vec3 (0, 0, -20));
331 planet->show ();
332
333 planet->v = vec3 (10, 0, 0);
334 moveables.push_back (planet);
335#endif
336
337 doom3parse ("test.proc");
338
339 skybox sb (
340 "textures/skybox_mystery/1.jpg",
341 "textures/skybox_mystery/2.jpg",
342 "textures/skybox_mystery/3.jpg",
343 "textures/skybox_mystery/4.jpg",
344 "textures/skybox_mystery/5.jpg",
345 "textures/skybox_mystery/6.jpg"
346 );
347 world_skybox = &sb;
348
296 for (int i = 0; i < 1; i++) 349 for (int i = 0; i <= 0; i++)
297 { 350 {
298 // load a entity 351 // load a entity
299 txtprt_parser p; 352 txtprt_parser p;
300 geometry *g; 353 geometry *g;
301 try 354 try
… …
310 entity *e = new entity (g); 363 entity *e = new entity (g);
311 e->move (vec3 (i*5, -3, -i*10)); 364 e->move (vec3 (i*5, -3, -i*10));
312 e->show (); 365 e->show ();
313 } 366 }
314 367
368#if 1
369 {
370 fisch (vec3 (0, 0, -2e9), 1e9, 8);
371 //entity *planet = new entity (new geometry_sphere (1e9));
372 //planet->move (vec3 (0, 0, -1.5e9));
373 //planet->show ();
374 }
375
376 {
377 entity *planet = new entity (new geometry_sphere (testmat3, 4e15));
378 planet->move (vec3 (0, 0, 1e17));
379 planet->show ();
380 }
381
382 {
383 RandomBuilding r;
384 entity *randlvl = r.draw (1000, 1000, 200);
385 randlvl->move (vec3 (0, 0, 0));
386 randlvl->show ();
387
388 entity *randlvl2 = r.draw (1000, 10000, 1000);
389 randlvl2->move (vec3 (-20000, 0, 0));
390 randlvl2->show ();
391
392 entity *randlvl3 = r.draw (100, 30, 3);
393 randlvl3->move (vec3 (-1000, 0, 0));
394 randlvl3->show ();
395
396
397 entity *randlvl4 = r.draw (100, 1000000, 100000);
398 randlvl4->move (vec3 (0, -1001000, 0));
399 randlvl4->show ();
400 }
401
315 draw_floor (10, -500, -10, -1000); 402 //draw_floor (10, -500, -10, -1000);
403#endif
404 draw_level ();
405
406#if 0
407 {
408 geometry_heightfield *hf = new geometry_heightfield (100000., 100000.);
409 entity *e = new entity (hf);
410 e->move (vec3 (-100000, -100000 * 0.01, -100000));
411 e->show ();
412 }
413#endif
414
316 draw_test_nurb (); 415 //draw_test_nurb ();
317 416
417 //camera.orig.x = 108; camera.orig.y = 0; camera.orig.z = -368;
318 camera.orig.x = camera.orig.y = camera.orig.z = 0; 418 camera.orig.x = 0; camera.orig.y = 0; camera.orig.z = 0;
319 camera.p = point (0, 0, 10); 419 camera.p = point (0, 0, 10);
320 camera.d = vec3 (0, 0, -1); 420 camera.d = vec3 (0, 0, -1);
321 camera.u = vec3 (0, 1, 0); 421 camera.u = vec3 (0, 1, 0);
322 camera.w = w; camera.h = h; 422 camera.w = w; camera.h = h;
323 camera.fov = 35; 423 camera.fov = 40.;
324 424
325 glMatrixMode (GL_MODELVIEW);
326 glLoadIdentity ();
327
328 glEnable (GL_CULL_FACE);
329 glEnable (GL_DEPTH_TEST); 425 glDisable (GL_ALPHA_TEST);
330
331 glShadeModel (GL_SMOOTH);
332
333 glEnable (GL_LIGHTING);
334 glEnable (GL_LIGHT0);
335
336 cgc = cgCreateContext ();
337
338 vsh_profile = CG_PROFILE_ARBVP1;
339 //if (cgGLIsProfileSupported (CG_PROFILE_VP30)) vsh_profile = CG_PROFILE_VP30;
340 //if (cgGLIsProfileSupported (CG_PROFILE_VP40)) vsh_profile = CG_PROFILE_VP40;
341 fsh_profile = CG_PROFILE_ARBFP1;
342 //if (cgGLIsProfileSupported (CG_PROFILE_FP30)) fsh_profile = CG_PROFILE_FP30;
343 //if (cgGLIsProfileSupported (CG_PROFILE_FP40)) fsh_profile = CG_PROFILE_FP40;
344
345 vsh = cgCreateProgramFromFile (cgc, CG_SOURCE, "vsh.cg", vsh_profile, 0, 0);
346 CheckCgError ();
347 cgGLLoadProgram (vsh);
348 CheckCgError ();
349 mv = cgGetNamedParameter (vsh, "WorldProj");
350 mvp = cgGetNamedParameter (vsh, "WorldViewProj");
351 lightpos = cgGetNamedParameter (vsh, "LightPos");
352 CheckCgError ();
353
354 CGparameter g_Texture; // the texture parameter
355
356
357 fsh = cgCreateProgramFromFile (cgc, CG_SOURCE, "fsh.cg", fsh_profile, 0, 0);
358 Texture t("o.jpg");
359 g_Texture = cgGetNamedParameter(fsh, "Texture"); // the texture cg-warper ;)
360 cgGLSetTextureParameter(g_Texture, t.texture); // Bind the texture number 999 to g_Texture
361 CheckCgError ();
362 cgGLLoadProgram (fsh);
363 CheckCgError ();
364
365 cgGLBindProgram (vsh);
366 CheckCgError ();
367 cgGLBindProgram (fsh);
368 CheckCgError ();
369 426
370 /* Loop until done. */ 427 /* Loop until done. */
371 start_time = SDL_GetTicks ();
372 frames = 0; 428 frames = 0;
429
430 linear_light mylight2;//mylight, mylight2;
431
432 // mylight.radius = 100000;
433 // mylight.c = colour (1., 1, 1, 1.);
434 // mylight.intensity = 1.F;
435
436 mylight2.radius = 100000;
437 mylight2.c = colour (0., 1., 1., 1.);
438 mylight2.intensity = 1.F;
439 mylight2.orig.x = 0; mylight2.orig.y = 0; mylight2.orig.z = 0;
440 mylight2.p.x = 0; mylight2.p.y = 0; mylight2.p.z = 0;
441
442 //pass_data pass_light (&mylight);
443 pass_data pass_light2 (&mylight2);
373 444
374 while (!done) 445 while (!done)
375 { 446 {
376 char *sdl_error; 447 char *sdl_error;
377 SDL_Event event; 448 SDL_Event event;
378 449
450 camera_angle += 90 * camera_velocity_angle * timer.diff;
451 camera_angle2 += 90 * camera_velocity_angle2 * timer.diff;
452
453 vec3 geradeaus = matrix::rotation (-camera_angle, vec3 (0, 1, 0)) * vec3 (0, 0, -1);
454 vec3 right = matrix::rotation (90., vec3 (0, 1, 0)) * geradeaus;
455
456 camera.d = matrix::rotation (camera_angle2, right) * geradeaus;
457 camera.u = cross (camera.d, right);
458
379 camera.p = camera.p - camera.d * (camera_velocity_factor * timer.diff) * camera_velocity.z; 459 camera.p = camera.p - camera.d * (camera_velocity_factor * timer.diff) * camera_velocity.z;
380 camera.p = camera.p - camera.u * (camera_velocity_factor * timer.diff) * camera_velocity.y; 460 camera.p = camera.p - camera.u * (camera_velocity_factor * timer.diff) * camera_velocity.y;
381 camera_angle += 30 * camera_velocity_angle * timer.diff;
382 camera.d.z = -cos (camera_angle * 12 / 180.);
383 camera.d.x = sin (camera_angle * 12 / 180.);
384 461
385 cgGLSetParameter4f (lightpos, camera.p.x, camera.p.y, camera.p.z, 1); 462 //mylight.orig = camera.orig;
463 //mylight.p = camera.p;
386 464
387 glBindTexture (GL_TEXTURE_2D, t.texture); 465 mylight2.orig = camera.orig;
388 cgGLEnableTextureParameter (g_Texture); // Enable the texture parameter 466 //mylight2.p = vec3 (sin (timer.now / 2) * 100000, 1, cos (timer.now / 2) * 100000);
389 467
390#if 0 468 //mylight.intensity = max (sinf (timer.now) + 1.2F, 0.2F);
391 static GLfloat ry; 469
392 ry += 0.001;
393 camera.d.x = cos (ry);
394 camera.d.z = sin (ry);
395 //camera.d.y = sin (ry * 0.1);
396#endif
397
398 camera.begin (); 470 camera.begin ();
399 camera.pass (view::DEPTH); 471 camera.render (pass_depth);
400 camera.pass (view::LIGHTED); 472 camera.render (pass_postdepth);
473 camera.render (pass_light2);
474 //camera.render (view::LIGHTED, pass_light2);
401 camera.end (); 475 camera.end ();
476
477 perfom_moves ();
402 478
403 SDL_GL_SwapBuffers (); 479 SDL_GL_SwapBuffers ();
404 timer.frame (); 480 timer.frame ();
405 481
482#if 0
406 /* Check for error conditions. */ 483 /* Check for error conditions. */
407 gl_error = glGetError (); 484 gl_error = glGetError ();
408 485
409 if (gl_error != GL_NO_ERROR) fprintf (stderr, "testgl: OpenGL error: %d\n", gl_error); 486 if (gl_error != GL_NO_ERROR) fprintf (stderr, "testgl: OpenGL error: %d\n", gl_error);
410 487
… …
415 fprintf (stderr, "testgl: SDL error '%s'\n", sdl_error); 492 fprintf (stderr, "testgl: SDL error '%s'\n", sdl_error);
416 SDL_ClearError (); 493 SDL_ClearError ();
417 } 494 }
418 495
419 /* Allow the user to see what's happening */ 496 /* Allow the user to see what's happening */
420 //SDL_Delay (20); 497 //SDL_Delay (40);
498#endif
421 499
422 /* Check if there's a pending event. */ 500 /* Check if there's a pending event. */
423 while (SDL_PollEvent (&event)) 501 while (SDL_PollEvent (&event))
424 done = HandleEvent (&event); 502 done = HandleEvent (&event);
425 503
426
427 ++frames; 504 ++frames;
428 }
429
430 /* Print out the frames per second */
431 this_time = SDL_GetTicks ();
432 if (this_time != start_time)
433 {
434 printf ("%2.2f FPS\n",
435 ((float) frames / (this_time - start_time)) * 1000.0);
436 } 505 }
437 506
438 if (global_image) 507 if (global_image)
439 { 508 {
440 SDL_FreeSurface (global_image); 509 SDL_FreeSurface (global_image);
441 global_image = NULL; 510 global_image = NULL;
442 } 511 }
512
443 if (global_texture) 513 if (global_texture)
444 { 514 {
445 glDeleteTextures (1, &global_texture); 515 glDeleteTextures (1, &global_texture);
446 global_texture = 0; 516 global_texture = 0;
447 } 517 }
448 518
449 /* Destroy our GL context, etc. */ 519 /* Destroy our GL context, etc. */
450 SDL_Quit (); 520 SDL_Quit ();
451 return (0); 521 return (0);
452} 522}
453
454int 523int
455main (int argc, char *argv[]) 524main (int argc, char *argv[])
456{ 525{
457 int i, logo; 526 int i, logo;
458 int numtests; 527 int numtests;

Diff Legend

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