Changeset 8047 in orxonox.OLD

Timestamp:

May 31, 2006, 10:36:17 PM (18 years ago)

Author:

patrick

Message:

cr: flush to switch platforms

Location:

branches/cr/src

Files:

• lib/collision_reaction/cr_object_damage.cc (modified) (3 diffs)
• world_entities/world_entity.h (modified) (3 diffs)

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

@@ -20 +20 @@
 #include "cr_object_damage.h"
 
+#include "physics_interface.h"
 
 using namespace std;
@@ -50 +51 @@
 {
 
+  float mass;
+  float velocity;
+
   const std::vector<CollisionEvent*>* collisionEvents = &(collision->getCollisionEvents());
   std::vector<CollisionEvent*>::const_iterator it = collisionEvents->begin();
@@ -55 +59 @@
   {
     // go through the collisions and try to estimate the damage
-
+    mass = (*it)->getEntityA()->getPhysicsInterface()->getMass();
   }
 

branches/cr/src/world_entities/world_entity.h

@@ -16 +16 @@
 #include <vector>
 
+#include "physics_interface.h"
 
 
@@ -113 +114 @@
   bool hasHealthWidget() const { return this->healthWidget; };
 
+
+  //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; }
+
+
   /* --- Misc Stuff Block --- */
   void debugWE() { this->debugEntity(); }
@@ -150 +157 @@
   bool                    bReactive;                              //!< true if there is at least one collision reaction subscibed
 
+  PhysicsInterface        physicsInterface;  //!< the physics object of the WorldEntity
 
 };