Changeset 10212

Timestamp:

Jan 31, 2015, 4:14:57 PM (9 years ago)

Author:

landauf

Message:

removed detach() from ModularSpaceShip which was just copy-pasted from its base class WorldEntity.
removed another unused function from WorldEntity.

Location:

code/branches/presentationFS14/src/orxonox/worldentities

Files:

• WorldEntity.h (modified) (2 diffs)
• pawns/ModularSpaceShip.cc (modified) (3 diffs)
• pawns/ModularSpaceShip.h (modified) (1 diff)

code/branches/presentationFS14/src/orxonox/worldentities/WorldEntity.h

@@ -72 +72 @@
     {
         friend class Scene;
-        friend class ModularSpaceShip;
 
         public:
@@ -207 +206 @@
 
             void notifyChildPropsChanged();
-
-            inline int getNumAttachedObj()
-                { return this->children_.size(); }
 
         protected:

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

@@ -42 +42 @@
 #include "items/Engine.h"
 #include "worldentities/StaticEntity.h"
-#include "collisionshapes/WorldEntityCollisionShape.h"
 #include <BulletCollision/CollisionShapes/btCollisionShape.h>
 #include <BulletCollision/CollisionShapes/btCompoundShape.h>
@@ -92 +91 @@
     {
         // iterate through all attached objects
-        for (unsigned int i=0; i < (unsigned int)(this->getNumAttachedObj()); i++)
+        for (unsigned int i=0; i < this->getAttachedObjects().size(); i++)
         {
             if (this->getAttachedObject(i) == NULL)
@@ -313 +312 @@
         }
     }
-
-    /**
-    @brief
-        Detaches a child WorldEntity from this instance.
-    */
-    void ModularSpaceShip::detach(WorldEntity* object)
-    {
-        std::set<WorldEntity*>::iterator it = this->children_.find(object);
-        if (it == this->children_.end())
-        {
-            orxout(internal_warning) << "Cannot detach an object that is not a child." << endl;
-            return;
-        }
-
-        // collision shapes
-
-        //this->printBtChildShapes((btCompoundShape*)(this->getWorldEntityCollisionShape()->getCollisionShape()), 2, 0);
-        this->detachCollisionShape(object->collisionShape_);  // after succeeding, causes a crash in the collision handling
-        //this->printBtChildShapes((btCompoundShape*)(this->getWorldEntityCollisionShape()->getCollisionShape()), 2, 0);
-
-        // mass
-        if (object->getMass() > 0.0f)
-        {
-            this->childrenMass_ -= object->getMass();
-            recalculateMassProps();
-        }
-
-        this->detachNode(object->node_);
-        this->children_.erase(it);        // this causes a crash when unloading the level. Or not?
-
-        object->notifyDetached();
-    }
 }

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

@@ -127 +127 @@
                 { return this->rotationThrust_; }
 
-            void detach(WorldEntity* object);
-
             virtual void updatePartAssignment();