Changeset 10036 for code/branches

Timestamp:

Apr 17, 2014, 3:41:17 PM (11 years ago)

Author:

noep

Message:

Tried to prevent the StaticEntities & Collisionshapes from getting deleted by creating vectors of SmartPointers to them. didn't work.

Location:

code/branches/modularships/src/orxonox

Files:

• Scene.cc (modified) (2 diffs)
• collisionshapes/CompoundCollisionShape.cc (modified) (1 diff)
• worldentities/pawns/ModularSpaceShip.cc (modified) (2 diffs)
• worldentities/pawns/ModularSpaceShip.h (modified) (2 diffs)

code/branches/modularships/src/orxonox/Scene.cc

@@ -345 +345 @@
                                              int index0, const btCollisionObject* colObj1, int partId1, int index1)
     {
+        orxout() << "collisionCb()" << endl;
+
         // get the WorldEntity pointers
         SmartPtr<WorldEntity> object0 = static_cast<WorldEntity*>(colObj0->getUserPointer());
@@ -360 +362 @@
             modified |= object1->collidesAgainst(object0, cs0, cp);
 
+        orxout() << "collisionCb() completed." << endl;
+
         return modified;
     }

code/branches/modularships/src/orxonox/collisionshapes/CompoundCollisionShape.cc

@@ -138 +138 @@
         if (this->attachedShapes_.find(shape) != this->attachedShapes_.end())
         {
-            orxout() << "Still going..." << endl;
             this->attachedShapes_.erase(shape);
             if (shape->getCollisionShape())
                 this->compoundShape_->removeChildShape(shape->getCollisionShape()); // TODO: Apparently this is broken?
             shape->notifyDetached();
-            orxout() << "Still going...." << endl;
 
             this->updatePublicShape();
-            orxout() << "Still going....." << endl;
         }
         else

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

@@ -42 +42 @@
 #include "collisionshapes/WorldEntityCollisionShape.h"
 #include <BulletCollision/CollisionShapes/btCollisionShape.h>
+#include <BulletCollision/CollisionShapes/btCompoundShape.h>
 
 
@@ -126 +127 @@
 
         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)
+    {
+        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)));
+
+        }
     }
 

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

@@ -122 +122 @@
             virtual void updatePartAssignment();
 
+            void createCSPtrList(CompoundCollisionShape* cs);
+
         protected:
 
@@ -128 +130 @@
             void registerVariables();
             std::vector<ShipPart*> partList_;  // The list of all Parts mounted on this ModularSpaceShip.
+            std::vector<SmartPtr<StaticEntity>*> entityPtrList_;
+            std::vector<SmartPtr<CollisionShape>*> csPtrList_;
             std::map<StaticEntity*, ShipPart*> partMap_;