Changeset 9995 for code/branches/modularships/src/orxonox/worldentities/MovableEntity.cc

Timestamp:

Mar 9, 2014, 9:01:44 PM (11 years ago)

Author:

noep

Message:

Modified collision-detecting-process, such that collisions can be traced back to single child-CollisionShapes of Compound-CollisionShapes

File:

• code/branches/modularships/src/orxonox/worldentities/MovableEntity.cc (modified) (1 diff)

code/branches/modularships/src/orxonox/worldentities/MovableEntity.cc

@@ -87 +87 @@
     }
 
+    bool MovableEntity::customCollidesAgainst(WorldEntity* otherObject, const btCollisionShape* ownCollisionShape, btManifoldPoint& contactPoint)
+    {
+        if (GameMode::isMaster() && enableCollisionDamage_)
+        {
+            Pawn* victim = orxonox_cast<Pawn*>(otherObject);
+            if (victim)
+            {
+                float damage = this->collisionDamage_ * (victim->getVelocity() - this->getVelocity()).length();
+                victim->customHit(0, contactPoint, ownCollisionShape, damage);
+            }
+        }
+
+        return false;
+    }
+
 
     void MovableEntity::registerVariables()