Changeset 2407 for code/branches/physics/src/orxonox/objects/worldentities/WorldEntity.cc

Timestamp:

Dec 11, 2008, 1:54:35 PM (15 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.

File:

• code/branches/physics/src/orxonox/objects/worldentities/WorldEntity.cc (modified) (3 diffs)

code/branches/physics/src/orxonox/objects/worldentities/WorldEntity.cc

@@ -44 +44 @@
 
 #include "objects/Scene.h"
-#include "objects/worldentities/collisionshapes/CollisionShape.h"
-#include "objects/worldentities/collisionshapes/CompoundCollisionShape.h"
+#include "objects/collisionshapes/CollisionShape.h"
+#include "objects/collisionshapes/CompoundCollisionShape.h"
 
 namespace orxonox
@@ -191 +191 @@
                 // static to static/kinematic/dynamic --> merge shapes
                 this->childMass_ += object->getMass();
-                this->attachCollisionShape(object->getCollisionShape());
+                this->attachCollisionShape(object->getCollisionShape(), true);
                 // Remove the btRigidBody from the child object.
                 // That also implies that cannot add a physics WE to the child afterwards.
@@ -237 +237 @@
     }
 
-    void WorldEntity::attachCollisionShape(CollisionShape* shape)
-    {
-        this->collisionShape_->addChildShape(shape);
+    void WorldEntity::attachCollisionShape(CollisionShape* shape, bool bWorldEntityRoot)
+    {
+        this->collisionShape_->addChildShape(shape, bWorldEntityRoot);
 
         if (this->physicalBody_)