Changeset 2469 for code/branches/presentation/src/orxonox/objects/collisionshapes/CollisionShape.cc

Timestamp:

Dec 15, 2008, 7:57:48 PM (17 years ago)

Author:

rgrieder

Message:

Resolved the issue with the collision shape synchronisation.

File:

• code/branches/presentation/src/orxonox/objects/collisionshapes/CollisionShape.cc (modified) (3 diffs)

code/branches/presentation/src/orxonox/objects/collisionshapes/CollisionShape.cc

@@ -38 +38 @@
 
 #include "CompoundCollisionShape.h"
+#include "objects/worldentities/WorldEntity.h"
 
 namespace orxonox
@@ -55 +56 @@
         this->orientation_ = Quaternion::IDENTITY;
         this->scale_ = Vector3::UNIT_SCALE;
+
+        this->registerVariables();
     }
 
@@ -81 +84 @@
     void CollisionShape::parentChanged()
     {
-        CompoundCollisionShape* parent = dynamic_cast<CompoundCollisionShape*>(Synchronisable::getSynchronisable(this->parentID_));
-        if (parent)
-            parent->addChildShape(this);
+        Synchronisable* synchronisable = Synchronisable::getSynchronisable(this->parentID_);
+        CompoundCollisionShape* CCSparent = dynamic_cast<CompoundCollisionShape*>(synchronisable);
+        if (CCSparent)
+            CCSparent->addChildShape(this);
+        else
+        {
+            WorldEntity* WEparent = dynamic_cast<WorldEntity*>(synchronisable);
+            if (WEparent)
+                WEparent->attachCollisionShape(this);
+        }
     }