Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Apr 2, 2014, 8:38:07 PM (11 years ago)
Author:
noep
Message:

Cleaned up the process passing the collisionshape which was hit to the Pawn. Started implementation of ModularSpaceShip and ShipPart.

File:
1 edited

Legend:

Unmodified
Added
Removed

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

    r9997 r10011  
    374374                Condition is that enableCollisionCallback() was called.
    375375            */
    376             virtual inline bool collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint)
    377                 { return false; } /* With false, Bullet assumes no modification to the collision objects. */
    378 
    379             virtual inline bool customCollidesAgainst(WorldEntity* otherObject, const btCollisionShape* ownCollisionShape, btManifoldPoint& contactPoint)
     376            virtual inline bool collidesAgainst(WorldEntity* otherObject, const btCollisionShape* ownCollisionShape, btManifoldPoint& contactPoint)
    380377                { return false; } /* With false, Bullet assumes no modification to the collision objects. */
    381378
Note: See TracChangeset for help on using the changeset viewer.