… | |
… | |
302 | |
302 | |
303 | /* Set the gamma for the window */ |
303 | /* Set the gamma for the window */ |
304 | if (gamma != 0.0) |
304 | if (gamma != 0.0) |
305 | SDL_SetGamma (gamma, gamma, gamma); |
305 | SDL_SetGamma (gamma, gamma, gamma); |
306 | |
306 | |
307 | |
|
|
308 | |
|
|
309 | testmat = new test_material; |
307 | testmat = new test_material; |
310 | |
308 | |
311 | entity *planet = new entity (new geometry_sphere (testmat, 10)); |
309 | entity *planet = new entity (new geometry_sphere (testmat, 10)); |
312 | planet->move (vec3 (0, 0, -20)); |
310 | planet->move (vec3 (0, 0, -20)); |
313 | planet->show (); |
311 | planet->show (); |
314 | |
312 | |
315 | //doom3parse ("test.proc"); |
313 | doom3parse ("test.proc"); |
316 | |
314 | |
317 | for (int i = 0; i < 20; i++) |
315 | for (int i = 0; i < 20; i++) |
318 | { |
316 | { |
319 | // load a entity |
317 | // load a entity |
320 | txtprt_parser p; |
318 | txtprt_parser p; |
… | |
… | |
331 | entity *e = new entity (g); |
329 | entity *e = new entity (g); |
332 | e->move (vec3 (i*5, -3, -i*10)); |
330 | e->move (vec3 (i*5, -3, -i*10)); |
333 | e->show (); |
331 | e->show (); |
334 | } |
332 | } |
335 | |
333 | |
336 | { |
334 | { |
337 | fisch (vec3 (0, 0, -2e9), 1e9, 8); |
335 | fisch (vec3 (0, 0, -2e9), 1e9, 8); |
338 | //entity *planet = new entity (new geometry_sphere (1e9)); |
336 | //entity *planet = new entity (new geometry_sphere (1e9)); |
339 | //planet->move (vec3 (0, 0, -1.5e9)); |
337 | //planet->move (vec3 (0, 0, -1.5e9)); |
340 | //planet->show (); |
338 | //planet->show (); |
341 | } |
339 | } |
342 | |
340 | |
343 | { |
341 | { |
344 | entity *planet = new entity (new geometry_sphere (testmat, 4e15)); |
342 | entity *planet = new entity (new geometry_sphere (testmat, 4e15)); |
345 | planet->move (vec3 (0, 0, 1e17)); |
343 | planet->move (vec3 (0, 0, 1e17)); |
346 | planet->show (); |
344 | planet->show (); |
347 | } |
345 | } |
348 | |
346 | |
349 | //draw_floor (10, -500, -10, -1000); |
347 | //draw_floor (10, -500, -10, -1000); |
350 | draw_level (); |
348 | draw_level (); |
351 | |
|
|
352 | |
349 | |
353 | #if 0 |
350 | #if 0 |
354 | { |
351 | { |
355 | geometry_heightfield *hf = new geometry_heightfield (100000., 100000.); |
352 | geometry_heightfield *hf = new geometry_heightfield (100000., 100000.); |
356 | entity *e = new entity (hf); |
353 | entity *e = new entity (hf); |
… | |
… | |
386 | while (!done) |
383 | while (!done) |
387 | { |
384 | { |
388 | char *sdl_error; |
385 | char *sdl_error; |
389 | SDL_Event event; |
386 | SDL_Event event; |
390 | |
387 | |
391 | camera_angle += 180 * camera_velocity_angle * timer.diff; |
388 | camera_angle += 90 * camera_velocity_angle * timer.diff; |
392 | camera_angle2 += 180 * camera_velocity_angle2 * timer.diff; |
389 | camera_angle2 += 90 * camera_velocity_angle2 * timer.diff; |
393 | |
390 | |
394 | vec3 geradeaus = matrix::rotation (-camera_angle, vec3 (0, 1, 0)) * vec3 (0, 0, -1); |
391 | vec3 geradeaus = matrix::rotation (-camera_angle, vec3 (0, 1, 0)) * vec3 (0, 0, -1); |
395 | vec3 right = matrix::rotation (90., vec3 (0, 1, 0)) * geradeaus; |
392 | vec3 right = matrix::rotation (90., vec3 (0, 1, 0)) * geradeaus; |
396 | |
393 | |
397 | camera.d = matrix::rotation (camera_angle2, right) * geradeaus; |
394 | camera.d = matrix::rotation (camera_angle2, right) * geradeaus; |