Changeset 10073 for code/branches/presentationFS14/src/orxonox/worldentities/WorldEntity.h

Timestamp:

May 22, 2014, 2:49:16 PM (10 years ago)

Author:

smerkli

Message:

Merged modularships branch

Location:

code/branches/presentationFS14

Files:

• . (modified) (1 prop)
• src/orxonox/worldentities/WorldEntity.h (modified) (4 diffs)

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

@@ -72 +72 @@
     {
         friend class Scene;
+        friend class ModularSpaceShip;
 
         public:
@@ -206 +207 @@
 
             void notifyChildPropsChanged();
+
+            inline int getNumAttachedObj()
+                { return this->children_.size(); }
 
         protected:
@@ -374 +378 @@
                 Condition is that enableCollisionCallback() was called.
             */
-            virtual inline bool collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint)
+            virtual inline bool collidesAgainst(WorldEntity* otherObject, const btCollisionShape* ownCollisionShape, btManifoldPoint& contactPoint)
                 { return false; } /* With false, Bullet assumes no modification to the collision objects. */
 
@@ -405 +409 @@
             */
             virtual bool isCollisionTypeLegal(CollisionType type) const = 0;
+
+            inline virtual WorldEntityCollisionShape* getWorldEntityCollisionShape()
+                { return this->collisionShape_; }
 
             btRigidBody*  physicalBody_; //!< Bullet rigid body. Everything physical is applied to this instance.