Changeset 9869 in orxonox.OLD for trunk/src/world_entities/world_entity.h

Timestamp:

Oct 3, 2006, 12:19:30 AM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the new_class_id branche back to the trunk.
merged with command:
svn merge ​https://svn.orxonox.net/orxonox/branches/new_class_id trunk -r9683:HEAD
no conflicts… puh..

File:

• trunk/src/world_entities/world_entity.h (modified) (6 diffs)

trunk/src/world_entities/world_entity.h

@@ -37 +37 @@
 
 
+
 //! Basis-class all interactive stuff in the world is derived from
 class WorldEntity : public PNode
 {
+  ObjectListDeclaration(WorldEntity);
 public:
   WorldEntity();
@@ -49 +51 @@
   void loadModel2(const std::string& fileN, float scal = 1.0f){this->loadModel(fileN,scal,0,4);}
   void setModel(Model* model, unsigned int modelNumber = 0);
-  Model* getModel(unsigned int modelNumber = 0) const { return (this->models.size() > modelNumber)? this->models[modelNumber] : NULL; };
+Model* getModel(unsigned int modelNumber = 0) const { return (this->models.size() > modelNumber)? this->models[modelNumber] : NULL; };
 
   inline void loadMD2Texture(const std::string& fileName) { this->md2TextureFileName = fileName; }
@@ -73 +75 @@
 
 
-/** @returns a reference to the obb tree of this worldentity */
+  /** @returns a reference to the obb tree of this worldentity */
   inline BVTree* getOBBTree() const { return this->obbTree; };
   inline void setOBBTree(OBBTree* tree) { /*if( this->obbTree != NULL) delete this->obbTree;*/ this->obbTree = (BVTree*)tree; }
@@ -81 +83 @@
   /* --- Collision Reaction Block --- */
   void subscribeReaction(CREngine::CRType type);
-  void subscribeReaction(CREngine::CRType type, long target1);
-  void subscribeReaction(CREngine::CRType type, long target1, long target2);
-  void subscribeReaction(CREngine::CRType type, long target1, long target2, long target3);
-  void subscribeReaction(CREngine::CRType type, long target1, long target2, long target3, long target4);
+  void subscribeReaction(CREngine::CRType type, const ClassID& target1);
+  void subscribeReaction(CREngine::CRType type, const ClassID& target1, const ClassID& target2);
+  void subscribeReaction(CREngine::CRType type, const ClassID& target1, const ClassID& target2, const ClassID& target3);
+  void subscribeReaction(CREngine::CRType type, const ClassID& target1, const ClassID& target2, const ClassID& target3, const ClassID& target4);
 
   void unsubscribeReaction(CREngine::CRType type);
@@ -126 +128 @@
 
   void hide() { if( this->objectListNumber != OM_DEAD) this->lastObjectListNumber = this->objectListNumber; this->toList(OM_DEAD); }
-  void unhide() { if( this->objectListNumber != this->lastObjectListNumber) this->toList(this->lastObjectListNumber); }
+void unhide() { if( this->objectListNumber != this->lastObjectListNumber) this->toList(this->lastObjectListNumber); }
 
 
   /* --- Character Attribute Block --- */
   /** @returns the scaling of the model */
-  float getScaling(){return this->scaling;}
+float getScaling(){return this->scaling;}
   /** @returns the damage dealt by this world entity */
   float getDamage() const { return this->damage; }
@@ -216 +218 @@
   bool                    bOnGround;                       //!< true if this entity is standing on the ground
 
-  protected:
+protected:
   Vector                  velocity;                        //!< speed of the entity