[Orxonox-commit 4943] r9612 - in code/branches/core6/src/orxonox: collisionshapes worldentities

[landauf at orxonox.net]

Author: landauf
Date: 2013-04-01 14:41:07 +0200 (Mon, 01 Apr 2013)
New Revision: 9612

Modified:
   code/branches/core6/src/orxonox/collisionshapes/WorldEntityCollisionShape.cc
   code/branches/core6/src/orxonox/collisionshapes/WorldEntityCollisionShape.h
   code/branches/core6/src/orxonox/worldentities/WorldEntity.cc
Log:
set the owner of a WorldEntityCollisionShape independent of the creator

Modified: code/branches/core6/src/orxonox/collisionshapes/WorldEntityCollisionShape.cc
===================================================================
--- code/branches/core6/src/orxonox/collisionshapes/WorldEntityCollisionShape.cc	2013-04-01 12:34:27 UTC (rev 9611)
+++ code/branches/core6/src/orxonox/collisionshapes/WorldEntityCollisionShape.cc	2013-04-01 12:41:07 UTC (rev 9612)
@@ -36,11 +36,11 @@
 
 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);
     }

Modified: code/branches/core6/src/orxonox/collisionshapes/WorldEntityCollisionShape.h
===================================================================
--- code/branches/core6/src/orxonox/collisionshapes/WorldEntityCollisionShape.h	2013-04-01 12:34:27 UTC (rev 9611)
+++ code/branches/core6/src/orxonox/collisionshapes/WorldEntityCollisionShape.h	2013-04-01 12:41:07 UTC (rev 9612)
@@ -37,10 +37,12 @@
     class _OrxonoxExport WorldEntityCollisionShape : public CompoundCollisionShape
     {
         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_; }
 
         protected:

Modified: code/branches/core6/src/orxonox/worldentities/WorldEntity.cc
===================================================================
--- code/branches/core6/src/orxonox/worldentities/WorldEntity.cc	2013-04-01 12:34:27 UTC (rev 9611)
+++ code/branches/core6/src/orxonox/worldentities/WorldEntity.cc	2013-04-01 12:41:07 UTC (rev 9612)
@@ -92,6 +92,7 @@
         this->bPhysicsActiveSynchronised_    = false;
         this->bPhysicsActiveBeforeAttaching_ = false;
         this->collisionShape_ = new WorldEntityCollisionShape(this);
+        this->collisionShape_->setWorldEntityOwner(this);
         this->collisionType_             = None;
         this->collisionTypeSynchronised_ = None;
         this->mass_           = 1.0f;