Changeset 10054 for code/branches/modularships/src

Timestamp:

May 13, 2014, 12:38:37 PM (11 years ago)

Author:

noep

Message:

Fixed CollisionShapes of ShipParts reappearing at their spawnposition after destruction.

Location:

code/branches/modularships/src/orxonox/worldentities/pawns

Files:

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

code/branches/modularships/src/orxonox/worldentities/pawns/ModularSpaceShip.cc

@@ -128 +128 @@
         this->partMap_[entity] = part;
 
-        //This adds a list of SmartPointers for all StaticEntities which have a ShipPart, preventing them from getting deleted. Hopefully.
-        SmartPtr<StaticEntity> newSmartPtr = entity;
-        SmartPtr<StaticEntity>* one = &newSmartPtr;
-        this->entityPtrList_.push_back(one);
-
-        //this->createCSPtrList(this->getWorldEntityCollisionShape());
-
         orxout() << "New entity-part assignment created!" << endl;
     }
 
-    // This should add smartPointers to all (Orxonox)Collisionshapes of this SpaceShip, preventing them fromg etting deleted. Might not work due to weird acting getAttachedShape
-    void ModularSpaceShip::createCSPtrList(CompoundCollisionShape* cs) // FIXME: (noep) remove debug
-    {
-        for (int i=0; i < cs->getNumChildShapes(); i++)
-        {
-
-            if (!orxonox_cast<CompoundCollisionShape*>(cs->getAttachedShape(i)))
-            {
-                SmartPtr<CollisionShape> newSmartPtr = cs->getAttachedShape(i);
-                SmartPtr<CollisionShape>* one = &newSmartPtr;
-                this->csPtrList_.push_back(one);
-            }
-
-            if (orxonox_cast<CompoundCollisionShape*>(cs->getAttachedShape(i)))
-                createCSPtrList((CompoundCollisionShape*)(cs->getAttachedShape(i)));
-
-        }
-    }
 
     /**
@@ -305 +280 @@
             {
                 this->detach(itt->first);
-                //itt->first->destroy();
+                itt->first->destroy();
                 //itt->first->setActive(false);
                 //itt->first->setVisible(false);

code/branches/modularships/src/orxonox/worldentities/pawns/ModularSpaceShip.h

@@ -122 +122 @@
             virtual void updatePartAssignment();
 
-            void createCSPtrList(CompoundCollisionShape* cs);
-
         protected: