Changeset 10052 for code/branches

Timestamp:

May 8, 2014, 4:20:26 PM (11 years ago)

Author:

noep

Message:

Added PartDestructionEvent, possibly fixed one out of two runtimeerrors

Location:

code/branches/modularships

Files:

• data/levels/templates/HeavyCruiser.oxt (modified) (1 diff)
• src/orxonox/OrxonoxPrereqs.h (modified) (1 diff)
• src/orxonox/items/CMakeLists.txt (modified) (1 diff)
• src/orxonox/items/PartDestructionEvent.cc (added)
• src/orxonox/items/PartDestructionEvent.h (added)
• src/orxonox/items/ShipPart.cc (modified) (3 diffs)
• src/orxonox/items/ShipPart.h (modified) (3 diffs)
• src/orxonox/worldentities/WorldEntity.cc (modified) (1 diff)
• src/orxonox/worldentities/pawns/ModularSpaceShip.cc (modified) (2 diffs)

code/branches/modularships/data/levels/templates/HeavyCruiser.oxt

@@ -51 +51 @@
     
     <parts>
-        <ShipPart name="frontL" initialhealth="10" damageabsorption="0.5" />
+        <ShipPart name="frontL" initialhealth="10" damageabsorption="0.5">
+            <destructionevents>
+                <PartDestructionEvent targetType="ship" targetParam="shieldhealth" operation="*" value="0.5"/>
+            </destructionevents>
+        </ShipPart>
         <ShipPart name="frontR" initialhealth="10" damageabsorption="0.5" />
         <ShipPart name="partL" initialhealth="10" damageabsorption="0.5" />

code/branches/modularships/src/orxonox/OrxonoxPrereqs.h

@@ -143 +143 @@
     // items
     class ShipPart;
+    class PartDestructionEvent;
     class Engine;
     class Item;

code/branches/modularships/src/orxonox/items/CMakeLists.txt

@@ -4 +4 @@
   MultiStateEngine.cc
   ShipPart.cc
+  PartDestructionEvent.cc
 )

code/branches/modularships/src/orxonox/items/ShipPart.cc

@@ -40 +40 @@
 #include "gametypes/Gametype.h"
 #include "worldentities/StaticEntity.h"
+#include "items/PartDestructionEvent.h"
 
 
@@ -66 +67 @@
 
         XMLPortParam(ShipPart, "damageabsorption", setDamageAbsorption, getDamageAbsorption, xmlelement, mode).defaultValues(0.5);
+
+        XMLPortObject(ShipPart, PartDestructionEvent, "destructionevents", addDestructionEvent, getDestructionEvent, xmlelement, mode);
 
         /*
@@ -142 +145 @@
             orxout() << "  " << this->entityList_[j]->getName() << endl;
         }
+    }
+
+    /**
+    @brief
+        Add a PartDestructionEvent to the ShipPart.
+    @param engine
+        A pointer to the PartDestructionEvent to be added.
+    */
+    void ShipPart::addDestructionEvent(PartDestructionEvent* part)
+    {
+        OrxAssert(part != NULL, "The PartDestructionEvent cannot be NULL.");
+        this->eventList_.push_back(part);
+        //part->setParent(this);
+    }
+
+    /**
+    @brief
+        Get the i-th PartDestructionEvent of the ShipPart.
+    @return
+        Returns a pointer to the i-the PartDestructionEvent. NULL if there is no PartDestructionEvent with that index.
+    */
+    PartDestructionEvent* ShipPart::getDestructionEvent(unsigned int index)
+    {
+        if(this->eventList_.size() >= index)
+            return NULL;
+        else
+            return this->eventList_[index];
     }
 

code/branches/modularships/src/orxonox/items/ShipPart.h

@@ -32 +32 @@
 #include "OrxonoxPrereqs.h"
 #include "Item.h"
+#include "items/PartDestructionEvent.h"
 
 #include <string>
@@ -58 +59 @@
             StaticEntity* getEntity(unsigned int index);
             bool hasEntity(StaticEntity* entity) const;
+
+            void addDestructionEvent(PartDestructionEvent* event);
+            PartDestructionEvent* getDestructionEvent(unsigned int index);
 
             void printEntities(); // FIXME: (noep) remove debug
@@ -102 +106 @@
         private:
             std::vector<StaticEntity*> entityList_; // list of all entities which belong to this part
+            std::vector<PartDestructionEvent*> eventList_;  // The list of all PartDestructionEvent assigned to this ShipPart.
+
 
     }; // tolua_export

code/branches/modularships/src/orxonox/worldentities/WorldEntity.cc

@@ -119 +119 @@
     WorldEntity::~WorldEntity()
     {
+        orxout() << "destroying " << this->getIdentifier()->getName() << endl;
         if (this->isInitialized())
         {

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

@@ -303 +303 @@
         }
         // Remove the part-entity assignment and detach the Entity of this ShipPart
-        for (std::map<StaticEntity*, ShipPart*>::iterator itt = this->partMap_.begin(); itt != this->partMap_.end(); ++itt)
+        for (std::map<StaticEntity*, ShipPart*>::iterator itt = this->partMap_.begin(); itt != this->partMap_.end(); )
         {
             if (itt->second == part)
@@ -314 +314 @@
                 //itt->first->setCollisionType(None);
                 //itt->first->deactivatePhysics();
-                this->partMap_.erase(itt);
+                this->partMap_.erase(itt++);
+            } else {
+                ++itt;
             }
         }