Changeset 8323 in orxonox.OLD

Timestamp:

Jun 12, 2006, 12:10:51 AM (18 years ago)

Author:

patrick

Message:

bsp_model: new collision reaction for the ground. not yet working completle

Location:

branches/bsp_model/src/lib

Files:

• collision_reaction/collision_event.h (modified) (1 diff)
• collision_reaction/collision_handle.cc (modified) (2 diffs)
• collision_reaction/cr_physics_ground_walk.cc (modified) (2 diffs)
• math/vector.h (modified) (1 diff)

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

@@ -41 +41 @@
   inline Vector getGroundNormal() { return this->groundNormal; }
 
+  /** @return position of the position, only accurate if this is a collision with the ground!!! */
+  inline Vector getCollisionPosition() { return this->position; }
 
  private:

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

@@ -192 +192 @@
 void CollisionHandle::handleCollisions()
 {
-//   if( this->type == CREngine::CR_)
+  // if continuous poll poll the reaction
+  if( this->bContinuousPoll && !this->bCollided)
+  {
+    this->collisionReaction->update(this->owner);
+    return;
+  }
 
   // collision reaction calculations (for every collision there will be a reaction)
@@ -204 +209 @@
   }
 
-  // if continuous poll poll the reaction
-  if( this->bContinuousPoll && this->bCollided)
-    this->collisionReaction->update(this->owner);
-
   // now set state to dispatched
   this->bDispatched = true;

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

@@ -53 +53 @@
 void CRPhysicsGroundWalk::reactToCollision(Collision* collision)
 {
-  CollisionEvent* ce = collision->getCollisionEvents().front();
-  Vector normal = ce->getGroundNormal();
-  normal.normalize();
-
-  // put it back
-  PRINTF(0)("putting it back\n");
-  collision->getEntityB()->setVelocity(Vector());
-//  collision->getEntityB()->setAbsCoorSoft(this->lastPosition, 0.1);
-//   collision->getEntityB()->setAbsCoor(this->lastPosition/* + normal * (-5.0f)*/);
+//   CollisionEvent* ce = collision->getCollisionEvents().front();
+//   Vector normal = ce->getGroundNormal();
+//   normal.normalize();
+//
+//   Vector position = ce->getCollisionPosition();
 
 
+  if( this->lastPosition != collision->getEntityB()->getAbsCoor())
+  {
+  // put it back
+    PRINTF(0)("putting it back to: \n");
+    this->lastPosition.debug();
 
+    collision->getEntityB()->setVelocity(Vector());
+//  collision->getEntityB()->setAbsCoorSoft(this->lastPosition, 0.1);
+    collision->getEntityB()->setAbsCoor(this->lastPosition);
+  }
 }
 
@@ -76 +81 @@
   this->lastPosition = owner->getAbsCoor();
   this->lastDirection = owner->getAbsDir();
+  PRINTF(0)("no collision: saving location: \n");
+  this->lastPosition.debug();
 }
 

branches/bsp_model/src/lib/math/vector.h

@@ -46 +46 @@
   /** @param v: the Vecor to compare with this one @returns true, if the Vecors are the same, false otherwise */
   inline bool operator== (const Vector& v) const { return (this->x==v.x&&this->y==v.y&&this->z==v.z)?true:false; };
+  /** @param v: the Vecor to compare with this one @returns true, if the Vecors are different, false otherwise */
+  inline bool operator!= (const Vector& v) const { return (this->x!=v.x&&this->y!=v.y&&this->z!=v.z)?true:false; };
   /** @param index The index of the "array" @returns the x/y/z coordinate */
   inline float operator[] (float index) const {if( index == 0) return this->x; if( index == 1) return this->y; if( index == 2) return this->z; }