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.51 by root, Sat Oct 9 16:36:31 2004 UTC

… …
31 31
32/**********************************************************************/ 32/**********************************************************************/
33 33
34view camera; 34view camera;
35vec3 camera_velocity; 35vec3 camera_velocity;
36float camera_angle = 0, camera_velocity_angle; 36float camera_angle, camera_angle2, camera_velocity_angle, camera_velocity_angle2;
37float camera_velocity_factor = 80; 37float camera_velocity_factor = 80;
38 38
39void 39void
40HotKey_ToggleFullScreen (void) 40HotKey_ToggleFullScreen (void)
41{ 41{
… …
101 101
102 printf ("focus\n"); 102 printf ("focus\n");
103 break; 103 break;
104 104
105 case SDL_KEYDOWN: 105 case SDL_KEYDOWN:
106 if (event->key.keysym.sym == SDLK_UP) camera_velocity.z--; 106 if (event->key.keysym.sym == SDLK_UP) camera_velocity.z--;
107 if (event->key.keysym.sym == SDLK_DOWN) camera_velocity.z++; 107 if (event->key.keysym.sym == SDLK_DOWN) camera_velocity.z++;
108 if (event->key.keysym.sym == SDLK_RIGHT) camera_velocity_angle++; 108 if (event->key.keysym.sym == SDLK_RIGHT) camera_velocity_angle++;
109 if (event->key.keysym.sym == SDLK_LEFT) camera_velocity_angle--; 109 if (event->key.keysym.sym == SDLK_LEFT) camera_velocity_angle--;
110 if (event->key.keysym.sym == SDLK_PAGEUP) camera_velocity_angle2++;
111 if (event->key.keysym.sym == SDLK_PAGEDOWN) camera_velocity_angle2--;
110 if (event->key.keysym.sym == SDLK_e) camera_velocity.y--; 112 if (event->key.keysym.sym == SDLK_e) camera_velocity.y--;
111 if (event->key.keysym.sym == SDLK_q) camera_velocity.y++; 113 if (event->key.keysym.sym == SDLK_q) camera_velocity.y++;
112 if (event->key.keysym.sym == SDLK_v) camera_velocity_factor *= 1.5; 114 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; 115 if (event->key.keysym.sym == SDLK_b) camera_velocity_factor /= 1.5;
114 116
115 if (event->key.keysym.sym == SDLK_ESCAPE) 117 if (event->key.keysym.sym == SDLK_ESCAPE)
116 done = 1; 118 done = 1;
117 119
118 if ((event->key.keysym.sym == SDLK_g) && 120 if ((event->key.keysym.sym == SDLK_g) &&
… …
132 case SDL_KEYUP: 134 case SDL_KEYUP:
133 if (event->key.keysym.sym == SDLK_UP) camera_velocity.z++; 135 if (event->key.keysym.sym == SDLK_UP) camera_velocity.z++;
134 if (event->key.keysym.sym == SDLK_DOWN) camera_velocity.z--; 136 if (event->key.keysym.sym == SDLK_DOWN) camera_velocity.z--;
135 if (event->key.keysym.sym == SDLK_LEFT) camera_velocity_angle++; 137 if (event->key.keysym.sym == SDLK_LEFT) camera_velocity_angle++;
136 if (event->key.keysym.sym == SDLK_RIGHT) camera_velocity_angle--; 138 if (event->key.keysym.sym == SDLK_RIGHT) camera_velocity_angle--;
139 if (event->key.keysym.sym == SDLK_PAGEUP) camera_velocity_angle2--;
140 if (event->key.keysym.sym == SDLK_PAGEDOWN) camera_velocity_angle2++;
137 if (event->key.keysym.sym == SDLK_e) camera_velocity.y++; 141 if (event->key.keysym.sym == SDLK_e) camera_velocity.y++;
138 if (event->key.keysym.sym == SDLK_q) camera_velocity.y--; 142 if (event->key.keysym.sym == SDLK_q) camera_velocity.y--;
139 break; 143 break;
140 144
141 case SDL_QUIT: 145 case SDL_QUIT:
… …
319 camera.p = point (0, 0, 10); 323 camera.p = point (0, 0, 10);
320 camera.d = vec3 (0, 0, -1); 324 camera.d = vec3 (0, 0, -1);
321 camera.u = vec3 (0, 1, 0); 325 camera.u = vec3 (0, 1, 0);
322 camera.w = w; camera.h = h; 326 camera.w = w; camera.h = h;
323 camera.fov = 35; 327 camera.fov = 35;
328 camera.near = 1.;
329 camera.far = 10.;
324 330
325 glMatrixMode (GL_MODELVIEW); 331 glMatrixMode (GL_MODELVIEW);
326 glLoadIdentity (); 332 glLoadIdentity ();
327 333
328 glEnable (GL_CULL_FACE); 334 glEnable (GL_CULL_FACE);
… …
374 while (!done) 380 while (!done)
375 { 381 {
376 char *sdl_error; 382 char *sdl_error;
377 SDL_Event event; 383 SDL_Event event;
378 384
385 camera_angle += 180 * camera_velocity_angle * timer.diff;
386 camera_angle2 += 180 * camera_velocity_angle2 * timer.diff;
387
388 vec3 geradeaus = matrix::rotation (-camera_angle, vec3 (0, 1, 0)) * vec3 (0, 0, -1);
389 vec3 right = matrix::rotation (90., vec3 (0, 1, 0)) * geradeaus;
390
391 camera.d = matrix::rotation (camera_angle2, right) * geradeaus;
392 camera.u = cross (camera.d, right);
393
379 camera.p = camera.p - camera.d * (camera_velocity_factor * timer.diff) * camera_velocity.z; 394 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; 395 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 396
385 cgGLSetParameter4f (lightpos, camera.p.x, camera.p.y, camera.p.z, 1); 397 cgGLSetParameter4f (lightpos, camera.p.x, camera.p.y, camera.p.z, 1);
386 398
387 glBindTexture (GL_TEXTURE_2D, t.texture); 399 glBindTexture (GL_TEXTURE_2D, t.texture);
388 cgGLEnableTextureParameter (g_Texture); // Enable the texture parameter 400 cgGLEnableTextureParameter (g_Texture); // Enable the texture parameter
… …
415 fprintf (stderr, "testgl: SDL error '%s'\n", sdl_error); 427 fprintf (stderr, "testgl: SDL error '%s'\n", sdl_error);
416 SDL_ClearError (); 428 SDL_ClearError ();
417 } 429 }
418 430
419 /* Allow the user to see what's happening */ 431 /* Allow the user to see what's happening */
420 //SDL_Delay (20); 432 //SDL_Delay (40);
421 433
422 /* Check if there's a pending event. */ 434 /* Check if there's a pending event. */
423 while (SDL_PollEvent (&event)) 435 while (SDL_PollEvent (&event))
424 done = HandleEvent (&event); 436 done = HandleEvent (&event);
425 437

Diff Legend

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