Changeset 10019 for code/branches/modularships/src/orxonox/worldentities/pawns/ModularSpaceShip.h

Timestamp:

Apr 3, 2014, 3:45:50 PM (10 years ago)

Author:

noep

Message:

Continued working on ShipPart and ModularSpaceShip implementation

File:

• code/branches/modularships/src/orxonox/worldentities/pawns/ModularSpaceShip.h (modified) (3 diffs)

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

@@ -40 +40 @@
 
 #include "SpaceShip.h"
-#include "ShipPart.h"
+#include "items/ShipPart.h"
+#include <map>
 
 namespace orxonox
@@ -94 +95 @@
             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
 
+            void attach(WorldEntity* object);
+
+            void addPartEntityAssignment(StaticEntity* entity, ShipPart* part);
+            ShipPart* getPartOfEntity(StaticEntity* entity) const;
+
             virtual void damage(float damage, float healthdamage = 0.0f, float shielddamage = 0.0f, Pawn* originator = NULL, const btCollisionShape* cs = NULL);
 
@@ -108 +114 @@
             void registerVariables();
             std::vector<ShipPart*> partList_;  // The list of all Parts mounted on this ModularSpaceShip.
+            std::map<StaticEntity*, ShipPart*> partMap_;
         
     };