Changeset 9890 in orxonox.OLD for branches/coll_rect/src

Timestamp:

Oct 13, 2006, 9:48:13 PM (18 years ago)

Author:

patrick

Message:

intruducing new container collision_tube. which serves as a central collision registration tube.

Location:

branches/coll_rect/src

Files:

• lib/collision_reaction/Makefile.am (modified) (2 diffs)
• lib/collision_reaction/collision_handle.cc (modified) (1 diff)
• lib/collision_reaction/collision_handle.h (modified) (1 diff)
• lib/collision_reaction/collision_tube.cc (added)
• lib/collision_reaction/collision_tube.h (added)
• lib/collision_reaction/cr_engine.cc (modified) (1 diff)
• world_entities/world_entity.h (modified) (8 diffs)

branches/coll_rect/src/lib/collision_reaction/Makefile.am

@@ -5 +5 @@
 
 libORXcr_a_SOURCES = cr_engine.cc \
+                     collision_tube.cc \
                      collision.cc \
                      collision_event.cc \
@@ -16 +17 @@
 
 noinst_HEADERS =     cr_engine.h \
+                     collision_tube.h \
                      collision.h \
                      collision_event.h \

branches/coll_rect/src/lib/collision_reaction/collision_handle.cc

@@ -199 +199 @@
   void CollisionHandle::handleCollisions()
   {
-    // if continuous poll poll the reaction
+    // if continuous poll the reaction
     if( this->bContinuousPoll && !this->bCollided)
     {

branches/coll_rect/src/lib/collision_reaction/collision_handle.h

@@ -28 +28 @@
   {
     ObjectListDeclaration(CollisionHandle);
+
   public:
     CollisionHandle(WorldEntity* owner, CREngine::CRType type);

branches/coll_rect/src/lib/collision_reaction/cr_engine.cc

@@ -31 +31 @@
 
   ObjectListDefinition(CREngine);
+
+
   /**
    * standard constructor

branches/coll_rect/src/world_entities/world_entity.h

@@ -25 +25 @@
 namespace OrxSound { class SoundBuffer; class SoundSource; }
 namespace OrxGui { class GLGuiWidget; class GLGuiBar; class GLGuiEnergyWidget; };
+namespace CoRe { class CollisionHandle; class Collision; }
 
 class BVTree;
@@ -30 +31 @@
 class AABBTreeNode;
 class Model;
-class CollisionHandle;
-class Collision;
-
-
-//class CharacterAttributes;
-
 
 
@@ -42 +37 @@
 {
   ObjectListDeclaration(WorldEntity);
+
 public:
   WorldEntity();
@@ -51 +47 @@
   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; }
@@ -127 +123 @@
 
   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; }
@@ -169 +165 @@
   void setHealthMax(float healthMax);
   void createHealthWidget();
-
-  //  CharacterAttributes*    charAttr;         //!< the character attributes of a world_entity
+    //  CharacterAttributes*    charAttr;         //!< the character attributes of a world_entity
+
+
 private:
   void updateHealthWidget();
+
 
 private:
@@ -194 +192 @@
   OM_LIST                 lastObjectListNumber;            //!< the last ObjectList from the ObjectManager this Entity was is in
 
-
-
+  /* collision reaction stuff */
+  CoRe::CollisionHandle*  collisionHandles[CoRe::CREngine::CR_NUMBER];  //!< the list of the collision reactions
+  bool                    bReactive;                              //!< true if there is at least one collision reaction subscibed
+
+
+  PhysicsInterface        physicsInterface;                //!< the physics object of the WorldEntity
+  bool                    bOnGround;                       //!< true if this entity is standing on the ground
+
+  /* network help structures */
   float                   scaling;                         //!< model's scaling factor
   int                     scaling_handle;                  //!< handle for syncing var
@@ -211 +216 @@
   int                     healthMax_handle;
 
-  CoRe::CollisionHandle*  collisionHandles[CoRe::CREngine::CR_NUMBER];  //!< the list of the collision reactions
-  bool                    bReactive;                              //!< true if there is at least one collision reaction subscibed
-
-
-  PhysicsInterface        physicsInterface;                //!< the physics object of the WorldEntity
-  bool                    bOnGround;                       //!< true if this entity is standing on the ground
+
 
 protected: