Changeset 8256 in orxonox.OLD for branches/bsp_model/src/lib

Timestamp:

Jun 8, 2006, 3:47:40 PM (18 years ago)

Author:

patrick

Message:

bsp: some cr default values rearangements

Location:

branches/bsp_model/src/lib

Files:

• collision_reaction/collision.h (modified) (1 diff)
• collision_reaction/collision_handle.cc (modified) (5 diffs)
• collision_reaction/collision_reaction.h (modified) (2 diffs)
• collision_reaction/cr_engine.cc (modified) (1 diff)
• collision_reaction/cr_physics_ground_walk.cc (modified) (2 diffs)
• collision_reaction/cr_physics_ground_walk.h (modified) (1 diff)
• coord/p_node.h (modified) (3 diffs)

branches/bsp_model/src/lib/collision_reaction/collision.h

@@ -27 +27 @@
 
     /** collides two WorldEntities @param entityA world entity A, @param entityB world entity B, @param bvA volume A @param bvB volumeB */
-    inline void collide(WorldEntity* entityA, WorldEntity* entityB) { this->entityA = entityA; this->entityB = entityB; }
+    inline void collide(WorldEntity* entityA, WorldEntity* entityB) { this->entityA = entityA; this->entityB = entityB; this->bDispatched = false; }
 
 

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

@@ -41 +41 @@
 
   this->bCollided = false;
-  this->bDispatched = false;
+  this->bDispatched = true;
 
   this->collisionReaction = NULL;
-  this->bContinuousPoll = true;
+  this->bContinuousPoll = false;
   this->bStopOnFirstCollision = false;
 
@@ -56 +56 @@
     case CREngine::CR_PHYSICS_GROUND_WALK:
       this->collisionReaction = new CRPhysicsGroundWalk();
+      this->bContinuousPoll = true;
       break;
     case CREngine::CR_OBJECT_DAMAGE:
@@ -191 +192 @@
 void CollisionHandle::handleCollisions()
 {
+//   if( this->type == CREngine::CR_)
+
   // collision reaction calculations (for every collision there will be a reaction)
   vector<Collision*>::iterator it = this->collisionList.begin();
@@ -205 +208 @@
   this->bCollided = false;
 
+  // if continuous poll poll the reaction
+   if( this->bContinuousPoll)
+     this->collisionReaction->update(this->owner);
   this->flushCollisions();
 }
@@ -215 +221 @@
 bool CollisionHandle::filterCollisionEvent(CollisionEvent* collisionEvent)
 {
+  if( this->type == CREngine::CR_PHYSICS_GROUND_WALK)
+  {
+
+    vector<long>::iterator it = this->targetList.begin();
+    for(; it < this->targetList.end(); it++)
+    {
+      PRINTF(0)("filtering: %i vs EntityA %i, EntityB %i \n", *it, collisionEvent->getEntityA()->getClassID(), collisionEvent->getEntityB()->getClassID());
+
+    }
+  }
+
   vector<long>::iterator it = this->targetList.begin();
   for(; it < this->targetList.end(); it++)

branches/bsp_model/src/lib/collision_reaction/collision_reaction.h

@@ -12 +12 @@
 
 class Collision;
+class WorldEntity;
+
 
 //! A class representing a simple collision
@@ -23 +25 @@
     virtual void reactToCollision(Collision* collision) = 0;
 
+    virtual void update(WorldEntity* owner) {}
+
+    /** use this to do some collision offline calculations, only called for bContinuousPoll == true */
     inline bool isContinuousPoll() const { return this->bContinuousPoll; }
 

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

@@ -143 +143 @@
   for( it = this->collisionHandles.begin(); it != this->collisionHandles.end(); it++)
   {
-    if( (*it)->isCollided() || (*it)->isContinuousPoll())  //does it have any collisions to report at all
+    if( !(*it)->isDispatched() || (*it)->isContinuousPoll())  //does it have any collisions to report at all
     {
-      PRINTF(0)("CREngine: handle %i\n", (*it)->getType());
       (*it)->handleCollisions();
     }

branches/bsp_model/src/lib/collision_reaction/cr_physics_ground_walk.cc

@@ -34 +34 @@
 {
   this->setClassID(CL_CR_PHYSICS_GROUND_WALK, "CRPhysicsGroundWalk");
-
 }
 
@@ -54 +53 @@
 //   Vector normal = collision
   PRINTF(0)("Ground\n");
+}
+
+
+
+/**
+ * use this to do some collision offline calculations, only called for bContinuousPoll == true
+ */
+void CRPhysicsGroundWalk::update(WorldEntity* owner)
+{
+  this->lastPosition = owner->getAbsCoor();
+  this->lastDirection = owner->getAbsDir();
+
 
 }
 
+

branches/bsp_model/src/lib/collision_reaction/cr_physics_ground_walk.h

@@ -21 +21 @@
     virtual void reactToCollision(Collision* collision);
 
+    virtual void update(WorldEntity* entity);
+
   private:
     Vector       lastPosition;                //!< vector with the last valid position
-    Quaternion   lastDireciton;               //!< quat with the last valid direction
+    Quaternion   lastDirection;               //!< quat with the last valid direction
 };
 

branches/bsp_model/src/lib/coord/p_node.h

@@ -103 +103 @@
   /** @returns the absolute position */
   inline const Vector& getAbsCoor () const { return this->absCoordinate; };
+  /** @returns the absolute position */
+  inline const Vector& getLastAbsCoor () const { return this->lastAbsCoordinate; };
   void shiftCoor (const Vector& shift);
   void shiftCoor (float x, float y, float z) { this->shiftCoor(Vector(x, y, z)); };
@@ -238 +240 @@
     float roty;
     float rotz;
-    
+
   private:
     int relCoordinate_handle;
@@ -244 +246 @@
     Vector relCoordinate_write;
     Quaternion relDirection_write;
-    
+
   public:
     virtual void varChangeHandler( std::list<int> & id );