Changeset 9995 for code/branches/modularships/src/orxonox/worldentities/WorldEntity.h

Timestamp:

Mar 9, 2014, 9:01:44 PM (10 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/WorldEntity.h (modified) (1 diff)

code/branches/modularships/src/orxonox/worldentities/WorldEntity.h

@@ -375 +375 @@
             */
             virtual inline bool collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint)
+                { return false; } /* With false, Bullet assumes no modification to the collision objects. */
+
+            virtual inline bool customCollidesAgainst(WorldEntity* otherObject, const btCollisionShape* ownCollisionShape, btManifoldPoint& contactPoint)
                 { return false; } /* With false, Bullet assumes no modification to the collision objects. */