Changeset 8288 in orxonox.OLD

Timestamp:

Jun 8, 2006, 6:30:52 PM (18 years ago)

Author:

patrick

Message:

bsp: the collision reaction is on its way… a long one…

Location:

branches/bsp_model/src

Files:

• lib/collision_reaction/collision_handle.cc (modified) (2 diffs)
• lib/collision_reaction/cr_object_damage.cc (modified) (3 diffs)
• lib/collision_reaction/cr_physics_ground_walk.cc (modified) (3 diffs)
• lib/graphics/importer/bsp_manager.cc (modified) (1 diff)
• world_entities/space_ships/turbine_hover.h (modified) (1 diff)
• world_entities/world_entity.h (modified) (2 diffs)

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

@@ -204 +204 @@
   }
 
+  // if continuous poll poll the reaction
+  if( this->bContinuousPoll && this->bCollided)
+    this->collisionReaction->update(this->owner);
+
   // now set state to dispatched
   this->bDispatched = true;
   this->bCollided = false;
 
-  // if continuous poll poll the reaction
-   if( this->bContinuousPoll)
-     this->collisionReaction->update(this->owner);
   this->flushCollisions();
 }
@@ -232 +233 @@
   }
 
-
   return false;
 }

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

@@ -54 +54 @@
   float damage = 0.0f;
 
-  PRINTF(0)("Dealing damage - Handling collision: %s vs %s\n",
+  PRINTF(4)("Dealing damage - Handling collision: %s vs %s\n",
             collision->getEntityA()->getClassName(),
             collision->getEntityB()->getClassName());
@@ -63 +63 @@
     collision->getEntityA()->decreaseHealth(damage);
   }
-  PRINTF(0)("Dealing damage - %f damage to %s \n", damage, collision->getEntityA()->getClassName());
+  PRINTF(4)("Dealing damage - %f damage to %s \n", damage, collision->getEntityA()->getClassName());
 
   if( collision->isEntityBCollide()) {
@@ -69 +69 @@
     collision->getEntityB()->decreaseHealth(damage);
   }
-  PRINTF(0)("Dealing damage - %f damage to %s \n", damage, collision->getEntityB()->getClassName());
+  PRINTF(4)("Dealing damage - %f damage to %s \n", damage, collision->getEntityB()->getClassName());
 
   collision->flushCollisionEvents();

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

@@ -23 +23 @@
 #include "world_entity.h"
 #include "cr_physics_ground_walk.h"
+
+#include <vector>
 
 using namespace std;
@@ -51 +53 @@
 void CRPhysicsGroundWalk::reactToCollision(Collision* collision)
 {
-//   Vector normal = collision
-  PRINTF(0)("Ground\n");
+  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)*/);
+
+
+
 }
 
@@ -64 +76 @@
   this->lastPosition = owner->getAbsCoor();
   this->lastDirection = owner->getAbsDir();
-
-
 }
 

branches/bsp_model/src/lib/graphics/importer/bsp_manager.cc

@@ -918 +918 @@
     */
 
-    float height = 10;
+    float height = 40;
 
 

branches/bsp_model/src/world_entities/space_ships/turbine_hover.h

@@ -59 +59 @@
     float                 rotation;
 
-    Vector                velocity;           //!< the velocity of the TurbineHover.
+   // Vector                velocity;           //!< the velocity of the TurbineHover.
     Quaternion            direction;          //!< the direction of the TurbineHover.
     float                 travelSpeed;        //!< the current speed of the Hove (to make soft movement)

branches/bsp_model/src/world_entities/world_entity.h

@@ -137 +137 @@
   inline float getMass() const { return this->physicsInterface.getMass(); }
   inline float getTotalMass() const { return this->physicsInterface.getTotalMass(); }
+  inline void setVelocity(const Vector& vel) { this->velocity = vel; }
 
 
@@ -186 +187 @@
   PhysicsInterface        physicsInterface;                //!< the physics object of the WorldEntity
 
+
+  protected:
+  Vector                  velocity;                        //!< speed of the entity
+
 };