Changeset 8217 in orxonox.OLD for branches/bsp_model/src/world_entities

Timestamp:

Jun 7, 2006, 9:57:13 PM (18 years ago)

Author:

patrick

Message:

bsp: major restructure: going over bsp_entity for collision detection. adjusting interfaces

Location:

branches/bsp_model/src/world_entities

Files:

• bsp_entity.h (modified) (3 diffs)
• playable.cc (modified) (2 diffs)

branches/bsp_model/src/world_entities/bsp_entity.h

@@ -18 +18 @@
 class BSPEntity : public WorldEntity
 {
- 
+
  public:
   BSPEntity(const TiXmlElement* root = NULL);
@@ -24 +24 @@
 
   virtual void loadParams(const TiXmlElement* root);
-  
+
   void setName(const std::string& name);
 
@@ -33 +33 @@
   virtual void collidesWith (WorldEntity* entity, const Vector& location);
 
+  /** @returns the BspManager of this entity */
+  inline BspManager* getBspManager() { return this->bspManager; }
+
  private:
    BspManager* bspManager;

branches/bsp_model/src/world_entities/playable.cc

@@ -66 +66 @@
   this->bDead = false;
 
+  this->subscribeReaction(CREngine::CR_PHYSICS_GROUND_WALK, CL_BSP_MODEL);
+
   registerVar( new SynchronizeableInt( &score, &score, "score" ) );
   registerVar( new SynchronizeableBool( &bFire, &bFire, "bFire", PERMISSION_OWNER));
@@ -79 +81 @@
   // this->setPlayer(NULL);
   // IN ITS DESTRUCTOR.
-  
+
   assert(this->currentPlayer == NULL);
 }