Changeset 7690 in orxonox.OLD for branches/water/src
- Timestamp:
- May 18, 2006, 3:31:04 PM (19 years ago)
- Location:
- branches/water/src
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/water/src/story_entities/game_world.cc
r7686 r7690 33 33 #include "terrain.h" 34 34 #include "playable.h" 35 #include " mapped_water.h"35 #include "environments/mapped_water.h" 36 36 37 37 #include "light.h" … … 445 445 // clear buffer 446 446 glClear( GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT); 447 // draw world448 // this->draw();449 447 450 448 // render the reflection texture … … 479 477 MappedWater* mw; 480 478 481 if( reflectedWaters = ClassList::getList(CL_MAPPED_WATER) != NULL)479 if( (reflectedWaters = ClassList::getList(CL_MAPPED_WATER)) != NULL) 482 480 { 483 481 std::list<BaseObject*>::const_iterator it; … … 536 534 537 535 /** 538 * @brief runs through all entities calling their draw() methods539 */540 void GameWorld::draw ()541 {542 543 }544 545 /**546 536 * shows the loading screen 547 537 */ -
branches/water/src/story_entities/game_world.h
r7686 r7690 74 74 virtual void renderPassRefraction(); 75 75 virtual void renderPassAll(); 76 virtual void draw(); 76 77 77 78 78 virtual void display(); -
branches/water/src/world_entities/WorldEntities.am
r7672 r7690 1 1 ## THE SUBCLASSES. THESE MUST BE DYNAMICALLY LINKED OR COMPILED IN DIRECTLY 2 2 WorldEntities_SOURCES_ = \ 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 world_entities/environments/mapped_water.cc \47 48 49 50 51 3 world_entities/npcs/npc_test1.cc \ 4 world_entities/npcs/npc_test.cc \ 5 world_entities/npcs/ground_turret.cc \ 6 \ 7 world_entities/environment.cc \ 8 world_entities/skysphere.cc \ 9 world_entities/skybox.cc \ 10 world_entities/terrain.cc \ 11 world_entities/satellite.cc \ 12 world_entities/movie_entity.cc \ 13 world_entities/recorder.cc \ 14 world_entities/character_attributes.cc \ 15 world_entities/test_entity.cc \ 16 world_entities/planet.cc \ 17 \ 18 world_entities/weapons/test_gun.cc \ 19 world_entities/weapons/turret.cc \ 20 world_entities/weapons/aiming_turret.cc \ 21 world_entities/weapons/targeting_turret.cc \ 22 world_entities/weapons/cannon.cc \ 23 world_entities/weapons/hyperblaster.cc \ 24 world_entities/weapons/aim.cc \ 25 \ 26 world_entities/projectiles/bomb.cc \ 27 world_entities/projectiles/laser.cc \ 28 world_entities/projectiles/test_bullet.cc \ 29 world_entities/projectiles/rocket.cc \ 30 world_entities/projectiles/guided_missile.cc \ 31 world_entities/projectiles/hyperblast.cc \ 32 \ 33 world_entities/power_ups/turret_power_up.cc \ 34 world_entities/power_ups/laser_power_up.cc \ 35 \ 36 world_entities/space_ships/space_ship.cc \ 37 world_entities/space_ships/helicopter.cc \ 38 world_entities/space_ships/hover.cc \ 39 world_entities/space_ships/turbine_hover.cc \ 40 world_entities/creatures/md2_creature.cc \ 41 \ 42 \ 43 world_entities/environments/water.cc \ 44 world_entities/environments/model_entity.cc \ 45 world_entities/environments/building.cc \ 46 world_entities/environments/mapped_water.cc \ 47 \ 48 world_entities/elements/image_entity.cc \ 49 world_entities/elements/text_element.cc \ 50 \ 51 world_entities/effects/lightning_bolt.cc 52 52 53 53 54 54 WorldEntities_HEADERS_ = \ 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 environments/mapped_water.h \97 98 99 100 101 55 npcs/npc_test.h \ 56 npcs/npc_test1.h \ 57 npcs/ground_turret.h \ 58 environment.h \ 59 skysphere.h \ 60 skybox.h \ 61 terrain.h \ 62 satellite.h \ 63 movie_entity.h \ 64 recorder.h \ 65 character_attributes.h \ 66 test_entity.h \ 67 planet.h \ 68 \ 69 weapons/test_gun.h \ 70 weapons/cannon.h \ 71 weapons/hyperblaster.h \ 72 weapons/turret.h \ 73 weapons/aiming_turret.h \ 74 weapons/targeting_turret.h \ 75 weapons/aim.h \ 76 \ 77 projectiles/bomb.h \ 78 projectiles/laser.h \ 79 projectiles/test_bullet.h \ 80 projectiles/rocket.h \ 81 projectiles/guided_missile.h \ 82 projectiles/hyperblast.h \ 83 \ 84 power_ups/turret_power_up.h \ 85 power_ups/laser_power_up.h \ 86 \ 87 space_ships/space_ship.h \ 88 space_ships/helicopter.h \ 89 space_ships/hover.h \ 90 space_ships/turbine_hover.h \ 91 creatures/md2_creature.h \ 92 \ 93 environments/water.h \ 94 environments/model_entity.h \ 95 environments/building.h \ 96 environments/mapped_water.h \ 97 \ 98 elements/image_entity.h \ 99 elements/text_element.h \ 100 \ 101 effects/lightning_bolt.h
Note: See TracChangeset
for help on using the changeset viewer.