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

Comparing libgender/test.C (file contents):
Revision 1.97 by root, Sun Feb 6 01:36:06 2005 UTC vs.
Revision 1.99 by root, Mon Feb 7 08:16:31 2005 UTC

316 /* Set the gamma for the window */ 316 /* Set the gamma for the window */
317 if (gamma != 0.0) 317 if (gamma != 0.0)
318 SDL_SetGamma (gamma, gamma, gamma); 318 SDL_SetGamma (gamma, gamma, gamma);
319 319
320 testmat = new test_material; 320 testmat = new test_material;
321 testmat2 = new test_material2;
321 322
322 entity_moveable *planet = new entity_moveable (new geometry_sphere (testmat, 10)); 323 entity_moveable *planet = new entity_moveable (new geometry_sphere (testmat, 10));
323 planet->move (vec3 (0, 0, -20)); 324 planet->move (vec3 (0, 0, -20));
324 planet->show (); 325 planet->show ();
325 326
371 randlvl2->show (); 372 randlvl2->show ();
372 373
373 entity *randlvl3 = r.draw (100, 30, 3); 374 entity *randlvl3 = r.draw (100, 30, 3);
374 randlvl3->move (vec3 (-1000, 0, 0)); 375 randlvl3->move (vec3 (-1000, 0, 0));
375 randlvl3->show (); 376 randlvl3->show ();
377
378
379 entity *randlvl4 = r.draw (100, 1000000, 100000);
380 randlvl4->move (vec3 (0, -1001000, 0));
381 randlvl4->show ();
376 } 382 }
377 383
378 //draw_floor (10, -500, -10, -1000); 384 //draw_floor (10, -500, -10, -1000);
379 draw_level (); 385 draw_level ();
380 386
400 glDisable (GL_ALPHA_TEST); 406 glDisable (GL_ALPHA_TEST);
401 407
402 /* Loop until done. */ 408 /* Loop until done. */
403 frames = 0; 409 frames = 0;
404 410
405 linear_light mylight, mylight2; 411 linear_light mylight2;//mylight, mylight2;
406 412
407 mylight.radius = 100000; 413 // mylight.radius = 100000;
408 mylight.c = colour (1., 1, 1, 1.); 414 // mylight.c = colour (1., 1, 1, 1.);
409 mylight.intensity = 1.F; 415 // mylight.intensity = 1.F;
410 416
411 mylight2.radius = 100000; 417 mylight2.radius = 100000;
412 mylight2.c = colour (1., 0, 0, 1.); 418 mylight2.c = colour (1., 1., 1., 1.);
413 mylight2.intensity = 1.F; 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;
414 422
415 pass_data pass_light (&mylight); 423 //pass_data pass_light (&mylight);
416 pass_data pass_light2 (&mylight2); 424 pass_data pass_light2 (&mylight2);
417 425
418 while (!done) 426 while (!done)
419 { 427 {
420 char *sdl_error; 428 char *sdl_error;
430 camera.u = cross (camera.d, right); 438 camera.u = cross (camera.d, right);
431 439
432 camera.p = camera.p - camera.d * (camera_velocity_factor * timer.diff) * camera_velocity.z; 440 camera.p = camera.p - camera.d * (camera_velocity_factor * timer.diff) * camera_velocity.z;
433 camera.p = camera.p - camera.u * (camera_velocity_factor * timer.diff) * camera_velocity.y; 441 camera.p = camera.p - camera.u * (camera_velocity_factor * timer.diff) * camera_velocity.y;
434 442
435 mylight.orig = camera.orig; 443 //mylight.orig = camera.orig;
436 mylight.p = camera.p; 444 //mylight.p = camera.p;
437 445
438 mylight2.orig = camera.orig; 446 mylight2.orig = camera.orig;
439 mylight2.p = camera.p + vec3 (sin (timer.now * 2) * 100, 1, cos (timer.now * 2) * 100); 447 mylight2.p = vec3 (sin (timer.now / 2) * 100000, 1, cos (timer.now / 2) * 100000);
440 448
441 //mylight.intensity = max (sinf (timer.now) + 1.2F, 0.2F); 449 //mylight.intensity = max (sinf (timer.now) + 1.2F, 0.2F);
442 450
443 camera.begin (); 451 camera.begin ();
444 camera.render (pass_depth); 452 camera.render (pass_depth);
445 camera.render (pass_postdepth); 453 camera.render (pass_postdepth);
446 camera.render (pass_light); 454 camera.render (pass_light2);
447 //camera.render (view::LIGHTED, pass_light2); 455 //camera.render (view::LIGHTED, pass_light2);
448 camera.end (); 456 camera.end ();
449 457
450 perfom_moves (); 458 perfom_moves ();
451 459

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines