Changeset 8049 in orxonox.OLD

Timestamp:

May 31, 2006, 11:12:06 PM (18 years ago)

Author:

patrick

Message:

cr: physics interface used as real interface.

Location:

branches/cr/src

Files:

• lib/collision_reaction/cr_object_damage.cc (modified) (2 diffs)
• world_entities/world_entity.h (modified) (1 diff)

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

@@ -17 +17 @@
 
 #include "collision.h"
-
-#include "cr_object_damage.h"
+#include "collision_event.h"
 
 #include "physics_interface.h"
+
+#include "world_entity.h"
+#include "cr_object_damage.h"
 
 using namespace std;
@@ -54 +56 @@
   float velocity;
 
+  PhysicsInterface* pi;
+
   const std::vector<CollisionEvent*>* collisionEvents = &(collision->getCollisionEvents());
   std::vector<CollisionEvent*>::const_iterator it = collisionEvents->begin();
   for(; it != collisionEvents->end(); it++)
   {
+    pi = &(*it)->getEntityA()->getPhysicsInterface();
     // go through the collisions and try to estimate the damage
-    mass = (*it)->getEntityA()->getPhysicsInterface()->getMass();
+    mass = pi->getMass();
   }
 

branches/cr/src/world_entities/world_entity.h

@@ -117 +117 @@
   //FIXME: the PhysicsInterface and the whole PEngine should probably be reviewed. Here its just used to store the vars
   /* --- Physics Interface --- */
-  inline PhysicsInterface getPhysicsEngine() const { return this->physicsInterface; }
+  inline PhysicsInterface getPhysicsInterface() const { return this->physicsInterface; }
+  inline float getMass() const { return this->physicsInterface.getMass(); }
+  inline float getTotalMass() const { return this->physicsInterface.getTotalMass(); }