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

Comparing libgender/test.C (file contents):
Revision 1.4 by root, Sun Oct 3 02:19:07 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
8#include "SDL_opengl.h" 10#include "SDL_opengl.h"
9
10/* Undefine this if you want a flat cube instead of a rainbow cube */
11#define SHADED_CUBE
12
13/* Define this to be the name of the logo image to use with -logo */
14#define LOGO_FILE "icon.bmp"
15 11
16static SDL_Surface *global_image = NULL; 12static SDL_Surface *global_image = NULL;
17static GLuint global_texture = 0; 13static GLuint global_texture = 0;
18 14
15#include "util.h"
19#include "entity.h" 16#include "entity.h"
20
21#include "txtprt_import.h" 17#include "txtprt_import.h"
18#include "randlvl.h"
19
20bool doom3parse (const char *f);
21
22#include "shader.h"
22 23
23/**********************************************************************/ 24/**********************************************************************/
25
26view camera;
27vec3 camera_velocity;
28float camera_angle, camera_angle2, camera_velocity_angle, camera_velocity_angle2;
29float camera_velocity_factor = 80;
24 30
25void 31void
26HotKey_ToggleFullScreen (void) 32HotKey_ToggleFullScreen (void)
27{ 33{
28 SDL_Surface *screen; 34 SDL_Surface *screen;
29 35
30 screen = SDL_GetVideoSurface (); 36 screen = SDL_GetVideoSurface ();
37
31 if (SDL_WM_ToggleFullScreen (screen)) 38 if (SDL_WM_ToggleFullScreen (screen))
32 {
33 printf ("Toggled fullscreen mode - now %s\n", 39 printf ("Toggled fullscreen mode - now %s\n",
34 (screen->flags & SDL_FULLSCREEN) ? "fullscreen" : "windowed"); 40 (screen->flags & SDL_FULLSCREEN) ? "fullscreen" : "windowed");
35 }
36 else 41 else
37 {
38 printf ("Unable to toggle fullscreen mode\n"); 42 printf ("Unable to toggle fullscreen mode\n");
39 }
40} 43}
41 44
42void 45void
43HotKey_ToggleGrab (void) 46HotKey_ToggleGrab (void)
44{ 47{
45 SDL_GrabMode mode; 48 SDL_GrabMode mode;
46 49
47 printf ("Ctrl-G: toggling input grab!\n"); 50 printf ("Ctrl-G: toggling input grab!\n");
48 mode = SDL_WM_GrabInput (SDL_GRAB_QUERY); 51 mode = SDL_WM_GrabInput (SDL_GRAB_QUERY);
52
49 if (mode == SDL_GRAB_ON) 53 if (mode == SDL_GRAB_ON)
50 {
51 printf ("Grab was on\n"); 54 printf ("Grab was on\n");
52 }
53 else 55 else
54 {
55 printf ("Grab was off\n"); 56 printf ("Grab was off\n");
56 }
57 57
58 mode = SDL_WM_GrabInput (mode ? SDL_GRAB_OFF : SDL_GRAB_ON); 58 mode = SDL_WM_GrabInput (mode ? SDL_GRAB_OFF : SDL_GRAB_ON);
59
59 if (mode == SDL_GRAB_ON) 60 if (mode == SDL_GRAB_ON)
60 {
61 printf ("Grab is now on\n"); 61 printf ("Grab is now on\n");
62 }
63 else 62 else
64 {
65 printf ("Grab is now off\n"); 63 printf ("Grab is now off\n");
66 }
67} 64}
68 65
69void 66void
70HotKey_Iconify (void) 67HotKey_Iconify (void)
71{ 68{
… …
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 case SDL_KEYDOWN: 95 case SDL_KEYDOWN:
96 if (event->key.keysym.sym == SDLK_UP) camera_velocity.z--;
97 if (event->key.keysym.sym == SDLK_DOWN) camera_velocity.z++;
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--;
102 if (event->key.keysym.sym == SDLK_e) camera_velocity.y--;
103 if (event->key.keysym.sym == SDLK_q) camera_velocity.y++;
104 if (event->key.keysym.sym == SDLK_v) camera_velocity_factor *= 1.5;
105 if (event->key.keysym.sym == SDLK_b) camera_velocity_factor /= 1.5;
106
104 if (event->key.keysym.sym == SDLK_ESCAPE) 107 if (event->key.keysym.sym == SDLK_ESCAPE)
105 {
106 done = 1; 108 done = 1;
107 }
108 109
109 if ((event->key.keysym.sym == SDLK_g) && 110 if ((event->key.keysym.sym == SDLK_g) &&
110 (event->key.keysym.mod & KMOD_CTRL)) 111 (event->key.keysym.mod & KMOD_CTRL))
111 {
112 HotKey_ToggleGrab (); 112 HotKey_ToggleGrab ();
113 }
114 113
115 if ((event->key.keysym.sym == SDLK_z) && 114 if ((event->key.keysym.sym == SDLK_z) &&
116 (event->key.keysym.mod & KMOD_CTRL)) 115 (event->key.keysym.mod & KMOD_CTRL))
117 {
118 HotKey_Iconify (); 116 HotKey_Iconify ();
119 }
120 117
121 if ((event->key.keysym.sym == SDLK_RETURN) && 118 if ((event->key.keysym.sym == SDLK_RETURN) &&
122 (event->key.keysym.mod & KMOD_ALT)) 119 (event->key.keysym.mod & KMOD_ALT))
123 {
124 HotKey_ToggleFullScreen (); 120 HotKey_ToggleFullScreen ();
125 }
126 121
127 printf ("key '%s' pressed\n", SDL_GetKeyName (event->key.keysym.sym)); 122 break;
123
124 case SDL_KEYUP:
125 if (event->key.keysym.sym == SDLK_UP) camera_velocity.z++;
126 if (event->key.keysym.sym == SDLK_DOWN) camera_velocity.z--;
127 if (event->key.keysym.sym == SDLK_LEFT) 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++;
131 if (event->key.keysym.sym == SDLK_e) camera_velocity.y++;
132 if (event->key.keysym.sym == SDLK_q) camera_velocity.y--;
128 break; 133 break;
129 134
130 case SDL_QUIT: 135 case SDL_QUIT:
131 done = 1; 136 done = 1;
132 break; 137 break;
133 } 138 }
134 139
135 return (done); 140 return (done);
136} 141}
137 142
138void 143void draw_floor (int size, int dx, int dy, int dz)
139SDL_GL_Enter2DMode ()
140{ 144{
141 SDL_Surface *screen = SDL_GetVideoSurface (); 145 int x, z, ry;
142 146
143 /* Note, there may be other things you need to change, 147 for (x = 0; x < 10; x++)
144 depending on how you have your OpenGL state set up.
145 */
146 glPushAttrib (GL_ENABLE_BIT);
147 glDisable (GL_DEPTH_TEST);
148 glDisable (GL_CULL_FACE);
149 glEnable (GL_TEXTURE_2D);
150
151 /* This allows alpha blending of 2D textures with the scene */
152 glEnable (GL_BLEND);
153 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
154
155 glViewport (0, 0, screen->w, screen->h);
156
157 glMatrixMode (GL_PROJECTION);
158 glPushMatrix ();
159 glLoadIdentity ();
160
161 glOrtho (0.0, (GLdouble) screen->w, (GLdouble) screen->h, 0.0, 0.0, 1.0);
162
163 glMatrixMode (GL_MODELVIEW);
164 glPushMatrix ();
165 glLoadIdentity ();
166
167 glTexEnvf (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_DECAL);
168}
169
170void
171SDL_GL_Leave2DMode ()
172{
173 glMatrixMode (GL_MODELVIEW);
174 glPopMatrix ();
175
176 glMatrixMode (GL_PROJECTION);
177 glPopMatrix ();
178
179 glPopAttrib ();
180}
181
182/* Quick utility function for texture creation */
183static int
184power_of_two (int input)
185{
186 int value = 1;
187
188 while (value < input)
189 {
190 value <<= 1;
191 } 148 {
192 return value; 149 for (z = 0; z < 10; z++)
193} 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)));
194 156
195GLuint 157 geometry_quads *q = new geometry_quads;
196SDL_GL_LoadTexture (SDL_Surface * surface, GLfloat * texcoord) 158 //q->m = new simple_material;
197{ 159 q->set (pts);
198 GLuint texture; 160 entity *e = new entity (q);
199 int w, h; 161 e->move (vec3 (dx + x * size, dy, dz + z * size));
200 SDL_Surface *image; 162 e->show ();
201 SDL_Rect area; 163 }
202 Uint32 saved_flags;
203 Uint8 saved_alpha;
204
205 /* Use the surface width and height expanded to powers of 2 */
206 w = power_of_two (surface->w);
207 h = power_of_two (surface->h);
208 texcoord[0] = 0.0f; /* Min X */
209 texcoord[1] = 0.0f; /* Min Y */
210 texcoord[2] = (GLfloat) surface->w / w; /* Max X */
211 texcoord[3] = (GLfloat) surface->h / h; /* Max Y */
212
213 image = SDL_CreateRGBSurface (SDL_SWSURFACE, w, h, 32,
214#if SDL_BYTEORDER == SDL_LIL_ENDIAN /* OpenGL RGBA masks */
215 0x000000FF, 0x0000FF00, 0x00FF0000, 0xFF000000
216#else
217 0xFF000000, 0x00FF0000, 0x0000FF00, 0x000000FF
218#endif
219 );
220 if (image == NULL)
221 { 164 }
222 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)
223 } 183 {
184 GLfloat r2 = radius * .1F;
185 GLfloat r3 = radius + r2;
224 186
225 /* Save the alpha blending attributes */ 187 fisch (center + vec3 (r3, 0, 0), r2, depth);
226 saved_flags = surface->flags & (SDL_SRCALPHA | SDL_RLEACCELOK); 188 fisch (center + vec3 (0, 0, r3), r2, depth);
227 saved_alpha = surface->format->alpha; 189 fisch (center + vec3 (-r3, 0, 0), r2, depth);
228 if ((saved_flags & SDL_SRCALPHA) == SDL_SRCALPHA)
229 { 190 }
230 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)
231 } 200 {
232 201 (*i)->perform_step (timer.diff);
233 /* Copy the surface into the GL texture image */
234 area.x = 0;
235 area.y = 0;
236 area.w = surface->w;
237 area.h = surface->h;
238 SDL_BlitSurface (surface, &area, image, &area);
239
240 /* Restore the alpha blending attributes */
241 if ((saved_flags & SDL_SRCALPHA) == SDL_SRCALPHA)
242 { 202 }
243 SDL_SetAlpha (surface, saved_flags, saved_alpha);
244 }
245
246 /* Create an OpenGL texture for the image */
247 glGenTextures (1, &texture);
248 glBindTexture (GL_TEXTURE_2D, texture);
249 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
250 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
251 glTexImage2D (GL_TEXTURE_2D,
252 0,
253 GL_RGBA, w, h, 0, GL_RGBA, GL_UNSIGNED_BYTE, image->pixels);
254 SDL_FreeSurface (image); /* No longer needed */
255
256 return texture;
257} 203}
258 204
259int 205int
260RunGLTest (int argc, char *argv[], 206RunGLTest (int argc, char *argv[],
261 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)
… …
264 int rgb_size[3]; 210 int rgb_size[3];
265 int w = 640; 211 int w = 640;
266 int h = 480; 212 int h = 480;
267 int done = 0; 213 int done = 0;
268 int frames; 214 int frames;
269 Uint32 start_time, this_time;
270 Uint32 video_flags; 215 Uint32 video_flags;
271 int value; 216 int value;
217 GLenum gl_error;
272 218
273 if (SDL_Init (SDL_INIT_VIDEO) < 0) 219 if (SDL_Init (SDL_INIT_VIDEO) < 0)
274 { 220 {
275 fprintf (stderr, "Couldn't initialize SDL: %s\n", SDL_GetError ()); 221 fprintf (stderr, "Couldn't initialize SDL: %s\n", SDL_GetError ());
276 exit (1); 222 exit (1);
… …
314 rgb_size[0] = 8; 260 rgb_size[0] = 8;
315 rgb_size[1] = 8; 261 rgb_size[1] = 8;
316 rgb_size[2] = 8; 262 rgb_size[2] = 8;
317 break; 263 break;
318 } 264 }
265
319 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, rgb_size[0]); 266 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, rgb_size[0]);
320 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, rgb_size[1]); 267 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, rgb_size[1]);
321 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, rgb_size[2]); 268 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, rgb_size[2]);
322 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16); 269 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 24);
323 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 270 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
324 271
325 if (fsaa) 272 if (fsaa)
326 { 273 {
327 SDL_GL_SetAttribute (SDL_GL_MULTISAMPLEBUFFERS, 1); 274 SDL_GL_SetAttribute (SDL_GL_MULTISAMPLEBUFFERS, 1);
… …
333 fprintf (stderr, "Couldn't set GL mode: %s\n", SDL_GetError ()); 280 fprintf (stderr, "Couldn't set GL mode: %s\n", SDL_GetError ());
334 SDL_Quit (); 281 SDL_Quit ();
335 exit (1); 282 exit (1);
336 } 283 }
337 284
338 printf ("Screen BPP: %d\n", SDL_GetVideoSurface ()->format->BitsPerPixel); 285 //printf ("Screen BPP: %d\n", SDL_GetVideoSurface ()->format->BitsPerPixel);
339 printf ("\n"); 286 //printf ("\n");
340 printf ("Vendor : %s\n", glGetString (GL_VENDOR)); 287 //printf ("Vendor : %s\n", glGetString (GL_VENDOR));
341 printf ("Renderer : %s\n", glGetString (GL_RENDERER)); 288 //printf ("Renderer : %s\n", glGetString (GL_RENDERER));
342 printf ("Version : %s\n", glGetString (GL_VERSION)); 289 //printf ("Version : %s\n", glGetString (GL_VERSION));
343 printf ("Extensions : %s\n", glGetString (GL_EXTENSIONS)); 290 //printf ("Extensions : %s\n", glGetString (GL_EXTENSIONS));
344 printf ("\n"); 291 printf ("\n");
345 292
346 SDL_GL_GetAttribute (SDL_GL_RED_SIZE, &value); 293 SDL_GL_GetAttribute (SDL_GL_RED_SIZE, &value);
347 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);
348 SDL_GL_GetAttribute (SDL_GL_GREEN_SIZE, &value); 295 SDL_GL_GetAttribute (SDL_GL_GREEN_SIZE, &value);
… …
362 printf ("SDL_GL_MULTISAMPLESAMPLES: requested %d, got %d\n", fsaa, 309 printf ("SDL_GL_MULTISAMPLESAMPLES: requested %d, got %d\n", fsaa,
363 value); 310 value);
364 } 311 }
365 312
366 /* Set the window manager title bar */ 313 /* Set the window manager title bar */
367 SDL_WM_SetCaption ("SDL GL test", "testgl"); 314 SDL_WM_SetCaption ("libgender rendering test", "gendertest");
368 315
369 /* Set the gamma for the window */ 316 /* Set the gamma for the window */
370 if (gamma != 0.0) 317 if (gamma != 0.0)
371 SDL_SetGamma (gamma, gamma, gamma); 318 SDL_SetGamma (gamma, gamma, gamma);
372 319
373 view v; 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
332 for (int i = 0; i < 20; i++)
333 {
334 // load a entity
335 txtprt_parser p;
336 geometry *g;
337 try
338 {
339 g = p.read ("test.blasc");
340 }
341 catch (txtprt_i_exception & e)
342 {
343 cout << "ERR: " << e.msg << endl;
344 }
345
346 entity *e = new entity (g);
347 e->move (vec3 (i*5, -3, -i*10));
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 }
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;
399 camera.orig.x = 0; camera.orig.y = 0; camera.orig.z = 0;
374 v.p = point (0, 0, 0); 400 camera.p = point (0, 0, 10);
375 v.d = vec3 (0, 0, -1); 401 camera.d = vec3 (0, 0, -1);
376 v.u = vec3 (0, 1, 0); 402 camera.u = vec3 (0, 1, 0);
377 v.w = w; v.h = h; 403 camera.w = w; camera.h = h;
378 v.fov = 90; 404 camera.fov = 40.;
379 405
380 glMatrixMode (GL_MODELVIEW);
381 glLoadIdentity ();
382
383 glEnable (GL_DEPTH_TEST); 406 glDisable (GL_ALPHA_TEST);
384
385 glDepthFunc (GL_LESS);
386
387 glShadeModel (GL_SMOOTH);
388 GLfloat ambient[4] = { 1, 1, 1, 1 };
389 glEnable (GL_LIGHTING);
390 glEnable (GL_COLOR_MATERIAL);
391 glLightModelfv (GL_LIGHT_MODEL_AMBIENT, ambient);
392 407
393 /* Loop until done. */ 408 /* Loop until done. */
394 start_time = SDL_GetTicks ();
395 frames = 0; 409 frames = 0;
410
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);
425
396 while (!done) 426 while (!done)
397 { 427 {
398 GLenum gl_error;
399 char *sdl_error; 428 char *sdl_error;
400 SDL_Event event; 429 SDL_Event event;
401 430
402 /* Do our drawing, too. */ 431 camera_angle += 90 * camera_velocity_angle * timer.diff;
403 glClearColor (0.0, 0.0, 0.0, 1.0); 432 camera_angle2 += 90 * camera_velocity_angle2 * timer.diff;
404 glClear (GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
405 433
406 static GLfloat ry; 434 vec3 geradeaus = matrix::rotation (-camera_angle, vec3 (0, 1, 0)) * vec3 (0, 0, -1);
407 ry += 0.1; 435 vec3 right = matrix::rotation (90., vec3 (0, 1, 0)) * geradeaus;
408 v.d.x = cos (ry);
409 v.d.z = sin (ry);
410 436
411 draw_context c; 437 camera.d = matrix::rotation (camera_angle2, right) * geradeaus;
412 v.draw (c); 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;
444 //mylight.p = camera.p;
445
446 mylight2.orig = camera.orig;
447 mylight2.p = vec3 (sin (timer.now / 2) * 100000, 1, cos (timer.now / 2) * 100000);
448
449 //mylight.intensity = max (sinf (timer.now) + 1.2F, 0.2F);
450
451 camera.begin ();
452 camera.render (pass_depth);
453 camera.render (pass_postdepth);
454 camera.render (pass_light2);
455 //camera.render (view::LIGHTED, pass_light2);
456 camera.end ();
457
458 perfom_moves ();
413 459
414 SDL_GL_SwapBuffers (); 460 SDL_GL_SwapBuffers ();
461 timer.frame ();
415 462
463#if 0
416 /* Check for error conditions. */ 464 /* Check for error conditions. */
417 gl_error = glGetError (); 465 gl_error = glGetError ();
418 466
419 if (gl_error != GL_NO_ERROR)
420 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);
421 468
422 sdl_error = SDL_GetError (); 469 sdl_error = SDL_GetError ();
423 470
424 if (sdl_error[0] != '\0') 471 if (sdl_error[0] != '\0')
425 { 472 {
426 fprintf (stderr, "testgl: SDL error '%s'\n", sdl_error); 473 fprintf (stderr, "testgl: SDL error '%s'\n", sdl_error);
427 SDL_ClearError (); 474 SDL_ClearError ();
428 } 475 }
429 476
430 /* Allow the user to see what's happening */ 477 /* Allow the user to see what's happening */
431 SDL_Delay (20); 478 //SDL_Delay (40);
479#endif
432 480
433 /* Check if there's a pending event. */ 481 /* Check if there's a pending event. */
434 while (SDL_PollEvent (&event)) 482 while (SDL_PollEvent (&event))
435 {
436 done = HandleEvent (&event); 483 done = HandleEvent (&event);
437 } 484
438 ++frames; 485 ++frames;
439 }
440
441 /* Print out the frames per second */
442 this_time = SDL_GetTicks ();
443 if (this_time != start_time)
444 {
445 printf ("%2.2f FPS\n",
446 ((float) frames / (this_time - start_time)) * 1000.0);
447 } 486 }
448 487
449 if (global_image) 488 if (global_image)
450 { 489 {
451 SDL_FreeSurface (global_image); 490 SDL_FreeSurface (global_image);
452 global_image = NULL; 491 global_image = NULL;
453 } 492 }
493
454 if (global_texture) 494 if (global_texture)
455 { 495 {
456 glDeleteTextures (1, &global_texture); 496 glDeleteTextures (1, &global_texture);
457 global_texture = 0; 497 global_texture = 0;
458 } 498 }
459 499
460 /* Destroy our GL context, etc. */ 500 /* Destroy our GL context, etc. */
461 SDL_Quit (); 501 SDL_Quit ();
462 return (0); 502 return (0);
463} 503}
464
465int 504int
466main (int argc, char *argv[]) 505main (int argc, char *argv[])
467{ 506{
468 int i, logo; 507 int i, logo;
469 int numtests; 508 int numtests;
… …
471 int slowly; 510 int slowly;
472 float gamma = 0.0; 511 float gamma = 0.0;
473 int noframe = 0; 512 int noframe = 0;
474 int fsaa = 0; 513 int fsaa = 0;
475 514
476 // load a entity
477 txtprt_parser p;
478 try {
479 entity *e = p.read ("test.blasc");
480 } catch (txtprt_i_exception & e) {
481 cout << "ERR: " << e.msg << endl;
482 }
483 // now please draw my entity ;)
484
485 logo = 0; 515 logo = 0;
486 slowly = 0; 516 slowly = 0;
487 numtests = 1; 517 numtests = 1;
488 for (i = 1; argv[i]; ++i) 518 for (i = 1; argv[i]; ++i)
489 { 519 {
… …
517 ("Usage: %s [-twice] [-logo] [-slow] [-bpp n] [-gamma n] [-noframe] [-fsaa]\n", 547 ("Usage: %s [-twice] [-logo] [-slow] [-bpp n] [-gamma n] [-noframe] [-fsaa]\n",
518 argv[0]); 548 argv[0]);
519 exit (0); 549 exit (0);
520 } 550 }
521 } 551 }
552
522 for (i = 0; i < numtests; ++i) 553 for (i = 0; i < numtests; ++i)
523 {
524 RunGLTest (argc, argv, logo, slowly, bpp, gamma, noframe, fsaa); 554 RunGLTest (argc, argv, logo, slowly, bpp, gamma, noframe, fsaa);
525 } 555
526 return 0; 556 return 0;
527} 557}

Diff Legend

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