Changeset 7193 in orxonox.OLD for trunk/src/world_entities

Timestamp:

Mar 7, 2006, 5:05:50 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: new style for resources (prework/movement)

Location:

trunk/src/world_entities

Files:

• creatures/md2_creature.cc (modified) (2 diffs)
• effects/lightning_bolt.cc (modified) (1 diff)
• elements/image_entity.cc (modified) (1 diff)
• elements/text_element.cc (modified) (1 diff)
• environment.cc (modified) (1 diff)
• environments/building.cc (modified) (1 diff)
• environments/model_entity.cc (modified) (1 diff)
• environments/water.cc (modified) (1 diff)
• movie_entity.cc (modified) (1 diff)
• npcs/ground_turret.cc (modified) (1 diff)
• planet.cc (modified) (1 diff)
• playable.cc (modified) (1 diff)
• power_ups/laser_power_up.cc (modified) (1 diff)
• power_ups/param_power_up.cc (modified) (1 diff)
• power_ups/power_up.cc (modified) (1 diff)
• power_ups/turret_power_up.cc (modified) (1 diff)
• power_ups/weapon_power_up.cc (modified) (2 diffs)
• projectiles/bomb.cc (modified) (1 diff)
• projectiles/guided_missile.cc (modified) (1 diff)
• projectiles/hyperblast.cc (modified) (1 diff)
• projectiles/laser.cc (modified) (1 diff)
• projectiles/projectile.cc (modified) (1 diff)
• projectiles/projectile.h (modified) (1 diff)
• projectiles/rocket.cc (modified) (1 diff)
• projectiles/test_bullet.cc (modified) (2 diffs)
• recorder.cc (modified) (1 diff)
• satellite.h (modified) (1 diff)
• skybox.cc (modified) (2 diffs)
• space_ships/helicopter.cc (modified) (1 diff)
• space_ships/hover.cc (modified) (1 diff)
• space_ships/space_ship.cc (modified) (3 diffs)
• space_ships/turbine_hover.cc (modified) (1 diff)
• spawning_point.cc (modified) (1 diff)
• terrain.cc (modified) (2 diffs)
• test_entity.cc (modified) (1 diff)
• weapons/aim.cc (modified) (1 diff)
• weapons/aiming_turret.cc (modified) (1 diff)
• weapons/cannon.cc (modified) (1 diff)
• weapons/crosshair.cc (modified) (1 diff)
• weapons/hyperblaster.cc (modified) (1 diff)
• weapons/targeting_turret.cc (modified) (1 diff)
• weapons/test_gun.cc (modified) (1 diff)
• weapons/turret.cc (modified) (1 diff)
• weapons/weapon.cc (modified) (1 diff)
• weapons/weapon_manager.cc (modified) (1 diff)
• world_entity.cc (modified) (4 diffs)

trunk/src/world_entities/creatures/md2_creature.cc

@@ -22 +22 @@
 #include "objModel.h"
 #include "md2Model.h"
-#include "resource_manager.h"
+#include "util/loading/resource_manager.h"
 #include "state.h"
 
@@ -30 +30 @@
 #include "weapons/cannon.h"
 
-#include "factory.h"
+#include "util/loading/factory.h"
 #include "key_mapper.h"
 #include "event_handler.h"

trunk/src/world_entities/effects/lightning_bolt.cc

@@ -17 +17 @@
 #include "lightning_bolt.h"
 
-#include "factory.h"
+#include "util/loading/factory.h"
 #include "material.h"
 
-#include "resource_manager.h"
+#include "util/loading/resource_manager.h"
 
 

trunk/src/world_entities/elements/image_entity.cc

@@ -18 +18 @@
 #include "image_entity.h"
 
-#include "load_param.h"
-#include "factory.h"
+#include "util/loading/load_param.h"
+#include "util/loading/factory.h"
 
 #include "graphics_engine.h"

trunk/src/world_entities/elements/text_element.cc

@@ -18 +18 @@
 #include "text_element.h"
 
-#include "load_param.h"
-#include "factory.h"
+#include "util/loading/load_param.h"
+#include "util/loading/factory.h"
 
 #include "graphics_engine.h"

trunk/src/world_entities/environment.cc

@@ -20 +20 @@
 #include "environment.h"
 
-#include "resource_manager.h"
+#include "util/loading/resource_manager.h"
 
 #include "vector.h"
 #include "objModel.h"
 #include "obb_tree.h"
-#include "factory.h"
+#include "util/loading/factory.h"
 
 using namespace std;

trunk/src/world_entities/environments/building.cc

@@ -18 +18 @@
 #include "building.h"
 
-#include "load_param.h"
-#include "factory.h"
+#include "util/loading/load_param.h"
+#include "util/loading/factory.h"
 
 using namespace std;

trunk/src/world_entities/environments/model_entity.cc

@@ -18 +18 @@
 #include "model_entity.h"
 
-#include "load_param.h"
-#include "factory.h"
+#include "util/loading/load_param.h"
+#include "util/loading/factory.h"
 
 using namespace std;

trunk/src/world_entities/environments/water.cc

@@ -17 +17 @@
 
 #include "water.h"
-#include "factory.h"
-#include "load_param.h"
+#include "util/loading/factory.h"
+#include "util/loading/load_param.h"
 
 #include "grid.h"
 #include "material.h"
 
-#include "resource_manager.h"
+#include "util/loading/resource_manager.h"
 #include "shader.h"
 

trunk/src/world_entities/movie_entity.cc

@@ -17 +17 @@
 
 #include "media_container.h"
-#include "load_param.h"
-#include "factory.h"
+#include "util/loading/load_param.h"
+#include "util/loading/factory.h"
 
 using namespace std;

trunk/src/world_entities/npcs/ground_turret.cc

@@ -23 +23 @@
 
 
-#include "factory.h"
+#include "util/loading/factory.h"
 #include "network_game_manager.h"
-#include "load_param.h"
+#include "util/loading/load_param.h"
 
 #include "effects/explosion.h"

trunk/src/world_entities/planet.cc

@@ -18 +18 @@
 #include "planet.h"
 
-#include "load_param.h"
-#include "factory.h"
+#include "util/loading/load_param.h"
+#include "util/loading/factory.h"
 #include "static_model.h"
 

trunk/src/world_entities/playable.cc

@@ -21 +21 @@
 #include "player.h"
 #include "state.h"
-#include "load_param.h"
+#include "util/loading/load_param.h"
 
 #include "world_entities/projectiles/projectile.h"

trunk/src/world_entities/power_ups/laser_power_up.cc

@@ -17 +17 @@
 
 #include "laser_power_up.h"
-#include "factory.h"
+#include "util/loading/factory.h"
 #include "state.h"
 #include "network_game_manager.h"

trunk/src/world_entities/power_ups/param_power_up.cc

@@ -17 +17 @@
 
 #include "param_power_up.h"
-#include "factory.h"
+#include "util/loading/factory.h"
 #include "state.h"
 
 #include "primitive_model.h"
 
-#include "factory.h"
-#include "load_param.h"
+#include "util/loading/factory.h"
+#include "util/loading/load_param.h"
 #include "network_game_manager.h"
 

trunk/src/world_entities/power_ups/power_up.cc

@@ -21 +21 @@
 #include "primitive_model.h"
 
-#include "resource_manager.h"
-#include "load_param.h"
+#include "util/loading/resource_manager.h"
+#include "util/loading/load_param.h"
 
 using namespace std;

trunk/src/world_entities/power_ups/turret_power_up.cc

@@ -17 +17 @@
 
 #include "turret_power_up.h"
-#include "factory.h"
+#include "util/loading/factory.h"
 #include "network_game_manager.h"
 #include "state.h"

trunk/src/world_entities/power_ups/weapon_power_up.cc

@@ -17 +17 @@
 
 #include "weapon_power_up.h"
-#include "factory.h"
+#include "util/loading/factory.h"
 #include "state.h"
 #include "network_game_manager.h"
@@ -23 +23 @@
 #include "primitive_model.h"
 
-#include "factory.h"
-#include "load_param.h"
+#include "util/loading/factory.h"
+#include "util/loading/load_param.h"
 
 using namespace std;

trunk/src/world_entities/projectiles/bomb.cc

@@ -19 +19 @@
 #include "model.h"
 #include "primitive_model.h"
-
-#include "fast_factory.h"
-
-
-#include "object_manager.h"
 
 #include "dot_emitter.h"

trunk/src/world_entities/projectiles/guided_missile.cc

@@ -17 +17 @@
 
 #include "guided_missile.h"
-
-#include "fast_factory.h"
 
 #include "state.h"

trunk/src/world_entities/projectiles/hyperblast.cc

@@ -17 +17 @@
 
 #include "hyperblast.h"
-
-#include "fast_factory.h"
 
 #include "state.h"

trunk/src/world_entities/projectiles/laser.cc

@@ -17 +17 @@
 
 #include "laser.h"
-#include <assert.h>
-
-
-#include "fast_factory.h"
+#include <cassert>
 
 #include "state.h"

trunk/src/world_entities/projectiles/projectile.cc

@@ -22 +22 @@
 #include "world_entities/weapons/weapon.h"
 #include "model.h"
-#include "resource_manager.h"
+#include "util/loading/resource_manager.h"
 
 using namespace std;

trunk/src/world_entities/projectiles/projectile.h

@@ -11 +11 @@
 
 #include "world_entity.h"
+#include "fast_factory.h"
 
 #include "sound_source.h"

trunk/src/world_entities/projectiles/rocket.cc

@@ -17 +17 @@
 
 #include "rocket.h"
-
-#include "fast_factory.h"
 
 #include "state.h"

trunk/src/world_entities/projectiles/test_bullet.cc

@@ -18 +18 @@
 #include "test_bullet.h"
 
-#include "fast_factory.h"
-
 #include "state.h"
 #include "class_list.h"
@@ -25 +23 @@
 #include "dot_emitter.h"
 #include "sprite_particles.h"
-
 
 using namespace std;

trunk/src/world_entities/recorder.cc

@@ -16 +16 @@
 #include "recorder.h"
 
-#include "load_param.h"
-#include "factory.h"
-#include "resource_manager.h"
+#include "util/loading/load_param.h"
+#include "util/loading/factory.h"
+#include "util/loading/resource_manager.h"
 #include "state.h"
 

trunk/src/world_entities/satellite.h

@@ -9 +9 @@
 #include "world_entity.h"
 #include "comincl.h"
-#include "resource_manager.h"
+#include "util/loading/resource_manager.h"
 
 

trunk/src/world_entities/skybox.cc

@@ -18 +18 @@
 #include "skybox.h"
 
-#include "load_param.h"
-#include "factory.h"
+#include "util/loading/load_param.h"
+#include "util/loading/factory.h"
 #include "static_model.h"
 
@@ -27 +27 @@
 #include "network_game_manager.h"
 #include "converter.h"
-#include "resource_manager.h"
+#include "util/loading/resource_manager.h"
 
 

trunk/src/world_entities/space_ships/helicopter.cc

@@ -24 +24 @@
 #include "weapons/cannon.h"
 
-#include "factory.h"
+#include "util/loading/factory.h"
 #include "key_mapper.h"
 #include "event_handler.h"

trunk/src/world_entities/space_ships/hover.cc

@@ -24 +24 @@
 #include "weapons/cannon.h"
 
-#include "factory.h"
+#include "util/loading/factory.h"
 #include "key_mapper.h"
 #include "event_handler.h"

trunk/src/world_entities/space_ships/space_ship.cc

@@ -20 +20 @@
 #include "space_ship.h"
 
-#include "resource_manager.h"
+#include "util/loading/resource_manager.h"
 
 #include "weapons/test_gun.h"
@@ -29 +29 @@
 #include "sprite_particles.h"
 
-#include "factory.h"
+#include "util/loading/factory.h"
 #include "key_mapper.h"
 #include "event_handler.h"
@@ -45 +45 @@
 #include "player.h"
 
-#include "load_param.h"
+#include "util/loading/load_param.h"
 
 

trunk/src/world_entities/space_ships/turbine_hover.cc

@@ -24 +24 @@
 #include "weapons/cannon.h"
 
-#include "factory.h"
+#include "util/loading/factory.h"
 #include "key_mapper.h"
 #include "event_handler.h"

trunk/src/world_entities/spawning_point.cc

@@ -17 +17 @@
 #include "spawning_point.h"
 
-#include "load_param.h"
-#include "factory.h"
+#include "util/loading/load_param.h"
+#include "util/loading/factory.h"
 
 #include "compiler.h"

trunk/src/world_entities/terrain.cc

@@ -18 +18 @@
 #include "terrain.h"
 
-#include "load_param.h"
-#include "factory.h"
+#include "util/loading/load_param.h"
+#include "util/loading/factory.h"
 #include "spatial_separation.h"
 
-#include "resource_manager.h"
+#include "util/loading/resource_manager.h"
 #include "model.h"
 #include "network_game_manager.h"
@@ -186 +186 @@
   {
     PRINTF(4)("fetching %s\n", vegetationFile);
-    this->vegetation = (Model*)ResourceManager::getInstance()->load(vegetationFile, OBJ, RP_CAMPAIGN);
+    this->vegetation = dynamic_cast<Model*>(ResourceManager::getInstance()->load(vegetationFile, OBJ, RP_CAMPAIGN));
   }
   else

trunk/src/world_entities/test_entity.cc

@@ -19 +19 @@
 
 #include "executor/executor.h"
-#include "factory.h"
-#include "load_param.h"
+#include "util/loading/factory.h"
+#include "util/loading/load_param.h"
 
 #include "test_entity.h"

trunk/src/world_entities/weapons/aim.cc

@@ -18 +18 @@
 #include "aim.h"
 
-#include "load_param.h"
+#include "util/loading/load_param.h"
 #include "graphics_engine.h"
 #include "state.h"

trunk/src/world_entities/weapons/aiming_turret.cc

@@ -25 +25 @@
 #include "animation3d.h"
 
-#include "factory.h"
+#include "util/loading/factory.h"
 
 CREATE_FACTORY(AimingTurret, CL_AIMING_TURRET);

trunk/src/world_entities/weapons/cannon.cc

@@ -27 +27 @@
 #include "world_entities/projectiles/projectile.h"
 #include "weapon_manager.h"
-#include "factory.h"
+#include "util/loading/factory.h"
 
 #include "vector.h"

trunk/src/world_entities/weapons/crosshair.cc

@@ -19 +19 @@
 #include "event_handler.h"
 
-#include "load_param.h"
+#include "util/loading/load_param.h"
 #include "graphics_engine.h"
 #include "glincl.h"

trunk/src/world_entities/weapons/hyperblaster.cc

@@ -27 +27 @@
 #include "world_entities/projectiles/projectile.h"
 #include "weapon_manager.h"
-#include "factory.h"
+#include "util/loading/factory.h"
 
 #include "animation3d.h"

trunk/src/world_entities/weapons/targeting_turret.cc

@@ -25 +25 @@
 #include "animation3d.h"
 
-#include "factory.h"
+#include "util/loading/factory.h"
 
 CREATE_FACTORY(TargetingTurret, CL_TARGETING_TURRET);

trunk/src/world_entities/weapons/test_gun.cc

@@ -27 +27 @@
 #include "static_model.h"
 #include "weapon_manager.h"
-#include "factory.h"
+#include "util/loading/factory.h"
 
 #include "animation3d.h"

trunk/src/world_entities/weapons/turret.cc

@@ -25 +25 @@
 #include "animation3d.h"
 
-#include "factory.h"
+#include "util/loading/factory.h"
 
 CREATE_FACTORY(Turret, CL_TURRET);

trunk/src/world_entities/weapons/weapon.cc

@@ -24 +24 @@
 #include "world_entities/projectiles/projectile.h"
 
-#include "resource_manager.h"
+#include "util/loading/resource_manager.h"
 #include "class_list.h"
-#include "load_param.h"
+#include "util/loading/load_param.h"
 #include "state.h"
 #include "animation3d.h"

trunk/src/world_entities/weapons/weapon_manager.cc

@@ -25 +25 @@
 #include "playable.h"
 
-#include "load_param.h"
-#include "factory.h"
+#include "util/loading/load_param.h"
+#include "util/loading/factory.h"
 
 #include "t_animation.h"

trunk/src/world_entities/world_entity.cc

@@ -22 +22 @@
 #include "model.h"
 #include "md2Model.h"
-#include "resource_manager.h"
-#include "load_param.h"
+#include "util/loading/resource_manager.h"
+#include "util/loading/load_param.h"
 #include "vector.h"
 #include "obb_tree.h"
@@ -86 +86 @@
   if (this->healthWidget != NULL)
     delete this->healthWidget;
-
 }
 
@@ -147 +146 @@
     if (this->scaling <= 0.0)
     {
+      PRINTF(1)("YOU GAVE ME A CRAPY SCALE resetting to 1.0\n");
       this->scaling = 1.0;
-      PRINTF(1)("YOU GAVE ME A CRAPY SCALE resetting to 1\n");
     }
     if(strstr(fileName, ".obj"))
     {
       PRINTF(4)("fetching OBJ file: %s\n", fileName);
-      if (this->scaling == 1.0)
-        this->setModel((Model*)ResourceManager::getInstance()->load(fileName, OBJ, RP_CAMPAIGN), modelNumber);
-      else
-        this->setModel((Model*)ResourceManager::getInstance()->load(fileName, OBJ, RP_CAMPAIGN, this->scaling), modelNumber);
+      BaseObject* loadedModel = ResourceManager::getInstance()->load(fileName, OBJ, RP_CAMPAIGN, this->scaling);
+      if (loadedModel != NULL)
+        this->setModel(dynamic_cast<Model*>(loadedModel), modelNumber);
 
       if( modelNumber == 0)
@@ -190 +188 @@
   if (this->models[modelNumber] != NULL)
   {
-    Resource* resource = ResourceManager::getInstance()->locateResourceByPointer(this->models[modelNumber]);
+    Resource* resource = ResourceManager::getInstance()->locateResourceByPointer(dynamic_cast<BaseObject*>(this->models[modelNumber]));
     if (resource != NULL)
       ResourceManager::getInstance()->unload(resource, RP_LEVEL);