Changeset 2407 for code/branches/physics/src/orxonox/objects/collisionshapes

Timestamp:

Dec 11, 2008, 1:54:35 PM (16 years ago)

Author:

rgrieder

Message:

• Removed debug output
• Fixed a bug with parentID_ in CollisionShape
• Reactivated overwrite mechanism in ControllableEntity
• Build fix in WE for last commit.

Location:

code/branches/physics/src/orxonox/objects/collisionshapes

Files:

• CompoundCollisionShape.cc (modified) (2 diffs)
• CompoundCollisionShape.h (modified) (1 diff)

code/branches/physics/src/orxonox/objects/collisionshapes/CompoundCollisionShape.cc

@@ -72 +72 @@
     }
 
-    void CompoundCollisionShape::addChildShape(CollisionShape* shape)
+    void CompoundCollisionShape::addChildShape(CollisionShape* shape, bool bWorldEntityRoot)
     {
         if (!shape)
@@ -97 +97 @@
 
         // network synchro
-        shape->setParent(this, this->getObjectID());
+        if (!bWorldEntityRoot)
+            shape->setParent(this, this->getObjectID());
     }
 

code/branches/physics/src/orxonox/objects/collisionshapes/CompoundCollisionShape.h

@@ -45 +45 @@
             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
 
-            void addChildShape(CollisionShape* shape);
+            void addChildShape(CollisionShape* shape, bool bWorldEntityRoot = false);
             CollisionShape* getChildShape(unsigned int index) const;