Changeset 9612

Timestamp:

Apr 1, 2013, 2:41:07 PM (12 years ago)

Author:

landauf

Message:

set the owner of a WorldEntityCollisionShape independent of the creator

Location:

code/branches/core6/src/orxonox

Files:

• collisionshapes/WorldEntityCollisionShape.cc (modified) (1 diff)
• collisionshapes/WorldEntityCollisionShape.h (modified) (1 diff)
• worldentities/WorldEntity.cc (modified) (1 diff)

code/branches/core6/src/orxonox/collisionshapes/WorldEntityCollisionShape.cc

@@ -37 +37 @@
 namespace orxonox
 {
-    WorldEntityCollisionShape::WorldEntityCollisionShape(WorldEntity* creator) : CompoundCollisionShape(creator)
+    WorldEntityCollisionShape::WorldEntityCollisionShape(BaseObject* creator) : CompoundCollisionShape(creator)
     {
         RegisterObject(WorldEntityCollisionShape);
 
-        this->worldEntityOwner_ = creator;
+        this->worldEntityOwner_ = NULL;
         // suppress synchronisation
         this->setSyncMode(ObjectDirection::None);

code/branches/core6/src/orxonox/collisionshapes/WorldEntityCollisionShape.h

@@ -38 +38 @@
     {
         public:
-            WorldEntityCollisionShape(WorldEntity* creator);
+            WorldEntityCollisionShape(BaseObject* creator);
             virtual ~WorldEntityCollisionShape();
 
-            inline WorldEntity* getWorldEntityOwner()
+            inline void setWorldEntityOwner(WorldEntity* worldEntityOwner)
+                { this->worldEntityOwner_ = worldEntityOwner; }
+            inline WorldEntity* getWorldEntityOwner() const
                 { return this->worldEntityOwner_; }
 

code/branches/core6/src/orxonox/worldentities/WorldEntity.cc

@@ -93 +93 @@
         this->bPhysicsActiveBeforeAttaching_ = false;
         this->collisionShape_ = new WorldEntityCollisionShape(this);
+        this->collisionShape_->setWorldEntityOwner(this);
         this->collisionType_             = None;
         this->collisionTypeSynchronised_ = None;