Changeset 7041 in orxonox.OLD for trunk/src

Timestamp:

Feb 6, 2006, 1:29:20 AM (19 years ago)

Author:

bensch

Message:

trunk: added new worldEntity Building

Location:

trunk/src

Files:

• defs/class_id.h (modified) (1 diff)
• world_entities/Makefile.am (modified) (2 diffs)
• world_entities/environments/building.cc (copied) (copied from trunk/src/world_entities/environments/model_entity.cc) (3 diffs)
• world_entities/environments/building.h (copied) (copied from trunk/src/world_entities/environments/model_entity.h) (2 diffs)

trunk/src/defs/class_id.h

@@ -172 +172 @@
   CL_WATER                      =    0x00000308,
   CL_PLANET                     =    0x00000309,
+  CL_BUILDING                   =    0x00000310,
 
   // Playables
-  CL_SPACE_SHIP                 =    0x0000030a,
-  CL_HELICOPTER                 =    0x0000030b,
-  CL_SPAWNING_POINT             =    0x0000030c,
-  CL_MD2_CREATURE               =    0x0000030d,
-  CL_HOVER                      =    0x0000030e,
-  CL_TURBINE_HOVER              =    0x0000030f,
+  CL_SPACE_SHIP                 =    0x0000035a,
+  CL_HELICOPTER                 =    0x0000035b,
+  CL_SPAWNING_POINT             =    0x0000035c,
+  CL_MD2_CREATURE               =    0x0000035d,
+  CL_HOVER                      =    0x0000035e,
+  CL_TURBINE_HOVER              =    0x0000035f,
 
   // Powerups
-  CL_TURRET_POWER_UP            =    0x00000311,
-  CL_LASER_POWER_UP             =    0x00000312,
-  CL_WEAPON_POWER_UP            =    0x00000313,
-  CL_PARAM_POWER_UP             =    0x00000314,
+  CL_TURRET_POWER_UP            =    0x00000381,
+  CL_LASER_POWER_UP             =    0x00000382,
+  CL_WEAPON_POWER_UP            =    0x00000383,
+  CL_PARAM_POWER_UP             =    0x00000384,
 
   // Weapons
-  CL_TEST_GUN                   =    0x00000330,
-  CL_TURRET                     =    0x00000331,
-  CL_AIMING_TURRET              =    0x00000332,
-  CL_CANNON                     =    0x00000333,
-  CL_TARGETING_TURRET           =    0x00000334,
-  CL_HYPERBLASTER               =    0x00000335,
+  CL_TEST_GUN                   =    0x000003a0,
+  CL_TURRET                     =    0x000003a1,
+  CL_AIMING_TURRET              =    0x000003a2,
+  CL_CANNON                     =    0x000003a3,
+  CL_TARGETING_TURRET           =    0x000003a4,
+  CL_HYPERBLASTER               =    0x000003a5,
 
   // Projectiles
-  CL_TEST_BULLET                =    0x00000340,
-  CL_ROCKET                     =    0x00000341,
-  CL_LASER                      =    0x00000342,
-  CL_BOMB                       =    0x00000343,
-  CL_GROUND_TURRET              =    0x00000344,
-  CL_GUIDED_MISSILE             =    0x00000345,
-  CL_HYPERBLAST                 =    0x00000346,
+  CL_TEST_BULLET                =    0x000003e0,
+  CL_ROCKET                     =    0x000003e1,
+  CL_LASER                      =    0x000003e2,
+  CL_BOMB                       =    0x000003e3,
+  CL_GROUND_TURRET              =    0x000003e4,
+  CL_GUIDED_MISSILE             =    0x000003e5,
+  CL_HYPERBLAST                 =    0x000003e6,
 
   // NPC's

trunk/src/world_entities/Makefile.am

@@ -62 +62 @@
                   world_entities/environments/water.cc \
                   world_entities/environments/model_entity.cc \
+                  world_entities/environments/building.cc \
                   \
                   world_entities/elements/image_entity.cc \
@@ -124 +125 @@
                  world_entities/environments/water.h \
                  world_entities/environments/model_entity.h \
+                 world_entities/environments/building.h \
                  \
                  world_entities/elements/image_entity.h \

trunk/src/world_entities/environments/building.cc

@@ -16 +16 @@
 #define DEBUG_SPECIAL_MODULE DEBUG_MODULE_WORLD_ENTITY
 
-#include "model_entity.h"
+#include "building.h"
 
 #include "load_param.h"
@@ -24 +24 @@
 
 
-CREATE_FACTORY(ModelEntity, CL_MODEL_ENTITY);
+CREATE_FACTORY(Building, CL_BUILDING);
 
 /**
  *  initializes a skybox from a XmlElement
 */
-ModelEntity::ModelEntity(const TiXmlElement* root)
+Building::Building(const TiXmlElement* root)
 {
-  this->setClassID(CL_MODEL_ENTITY, "ModelEntity");
+  this->setClassID(CL_BUILDING, "Building");
   this->toList(OM_ENVIRON_NOTICK);
 
@@ -42 +42 @@
  *  default destructor
 */
-ModelEntity::~ModelEntity()
+Building::~Building()
 {
 }

trunk/src/world_entities/environments/building.h

@@ -1 +1 @@
 /*!
- * @file model_entity.h
- *  Definition of the ModelEntity, that handles the Display of an atmosphere for orxonox.
+ * @file building.h
+ *  Definition of the Building, that handles the Display of an atmosphere for orxonox.
  */
 
-#ifndef _MODEL_ENTITY_H
-#define _MODEL_ENTITY_H
+#ifndef _BUILDING_H
+#define _BUILDING_H
 
 /* INCLUDES */
@@ -12 +12 @@
 /* FORWARD DECLARATION */
 
-//! A Class to handle a ModelEntity
-class ModelEntity : public WorldEntity
+//! A Class to handle a Building
+class Building : public WorldEntity
 {
  public:
-  ModelEntity(const TiXmlElement* root);
+  Building(const TiXmlElement* root);
 
-  virtual ~ModelEntity();
+  virtual ~Building();
 
 };
 
-#endif  /* _MODEL_ENTITY_H */
+#endif  /* _BUILDING_H */