Changeset 10019

Timestamp:

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

Author:

noep

Message:

Continued working on ShipPart and ModularSpaceShip implementation

Location:

code/branches/modularships

Files:

• data/levels/templates/HeavyCruiser.oxt (modified) (1 diff)
• src/orxonox/CMakeLists.txt (modified) (1 diff)
• src/orxonox/ShipPart.cc (deleted)
• src/orxonox/ShipPart.h (deleted)
• src/orxonox/items/CMakeLists.txt (modified) (1 diff)
• src/orxonox/items/ShipPart.cc (added)
• src/orxonox/items/ShipPart.h (added)
• src/orxonox/worldentities/pawns/ModularSpaceShip.cc (modified) (5 diffs)
• src/orxonox/worldentities/pawns/ModularSpaceShip.h (modified) (3 diffs)
• src/orxonox/worldentities/pawns/Pawn.h (modified) (1 diff)

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

@@ -51 +51 @@
     
     <parts>
-        <ShipPart name="part0" />
-        <ShipPart name="part1" />
+        <ShipPart name="frontL" />
+        <ShipPart name="frontR" />
     </parts>
     

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

@@ -32 +32 @@
   PlayerManager.cc
   Radar.cc
-  ShipPart.cc
 #  Test.cc
 

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

@@ -3 +3 @@
   Engine.cc
   MultiStateEngine.cc
+  ShipPart.cc
 )

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

@@ -38 +38 @@
 #include "gametypes/Gametype.h"
 
-#include "ShipPart.h"
+#include "items/ShipPart.h"
+#include "worldentities/StaticEntity.h"
+#include <BulletCollision/CollisionShapes/btCollisionShape.h>
 
 
@@ -75 +77 @@
     void ModularSpaceShip::updatePartAssignment()
     {
-
+        // iterate through all attached objects
+        for (unsigned int i=0; i < 100; i++)
+        {
+            if (this->getAttachedObject(i) == NULL)
+                break;
+            // iterate through all attached parts
+            for(unsigned int j = 0; j < this->partList_.size(); j++)
+            {
+                // if the name of the part matches the name of the object, add the object to that parts entitylist (unless it was already done).
+                if((this->partList_[j]->getName() == this->getAttachedObject(i)->getName()) && !this->partList_[j]->hasEntity(orxonox_cast<StaticEntity*>(this->getAttachedObject(i))))
+                {
+                    this->partList_[j]->addEntity(orxonox_cast<StaticEntity*>(this->getAttachedObject(i)));
+                    orxout() << "A matching part-entity-pair with name " << this->partList_[j]->getName() << " was found!" << endl;
+                    this->partList_[j]->printEntities(); // FIXME: (noep) remove debug
+                }
+            }
+        }
+    }
+
+    void ModularSpaceShip::attach(WorldEntity* object)
+    {
+        SpaceShip::attach(object);
+        this->updatePartAssignment();
+    }
+
+    void ModularSpaceShip::addPartEntityAssignment(StaticEntity* entity, ShipPart* part)
+    {
+        if (!entity || !part)
+            return;
+
+        if (this->partMap_.find(entity) != this->partMap_.end())
+                {
+                    orxout(internal_warning) << "Assigning an Entity to multiple parts is not yet supported." << endl;
+                    return;
+                }
+
+        this->partMap_[entity] = part;
+        orxout() << "New entity-part assignment created!" << endl;
+    }
+
+    /**
+    @brief
+        Get the ShipPart an attached entity belongs to.
+    @param entity
+        The entity to be searched.
+    @return
+        Returns a pointer to the ShipPart the entity belongs to.
+    */
+    ShipPart* ModularSpaceShip::getPartOfEntity(StaticEntity* entity) const
+    {
+        for (std::map<StaticEntity*, ShipPart*>::const_iterator it = this->partMap_.begin(); it != this->partMap_.end(); ++it)
+        {
+            if (it->first == entity)
+                return it->second;
+        }
+        return NULL;
     }
 
@@ -84 +141 @@
     {
         orxout() << "Mdamage(): Collision detected on " << this->getRadarName() << ", btCS*: " << cs << endl;
-        orxout() << "Attached parts:" << endl;
+        orxout() << "UserPtr of said collisionShape: " << cs->getUserPointer() << endl;
+
+        // List all attached Objects
+        orxout() << "  " << this->getName() << " has the following Objects attached:" << endl;
+        for (int i=0; i<10; i++)
+        {
+            if (this->getAttachedObject(i)==NULL)
+                break;
+            orxout() << " " << i << ": " << this->getAttachedObject(i) << " (" << this->getAttachedObject(i)->getName() << ")";
+            orxout() << endl;
+        }
+
+        orxout() << "  Attached ShipParts:" << endl;
         for(unsigned int i=0; i < this->partList_.size(); i++)
         {
@@ -90 +159 @@
         }
 
-        int collisionShapeIndex = this->isMyCollisionShape(cs);
-        orxout() << collisionShapeIndex << endl;
-
+        //int collisionShapeIndex = this->isMyCollisionShape(cs);
+        //orxout() << collisionShapeIndex << endl;
+
+        orxout() << "ShipPart of Entity " << cs->getUserPointer() << ": " << this->getPartOfEntity((StaticEntity*)(cs->getUserPointer())) << endl;
+
+        if (this->getPartOfEntity((StaticEntity*)(cs->getUserPointer())) != NULL)
+            this->getPartOfEntity((StaticEntity*)(cs->getUserPointer()))->handleHit(damage, healthdamage, shielddamage, originator);
+        //else
+        //    SpaceShip::damage(damage, healthdamage, shielddamage, originator, cs);
+
+        /*
         // Applies multiplier given by the DamageBoost Pickup.
         if (originator)
@@ -118 +195 @@
 
             this->lastHitOriginator_ = originator;
-        }
+        }*/
     }
 

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_;
         
     };

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

@@ -230 +230 @@
 
             virtual int isMyCollisionShape(const btCollisionShape* cs);
-            void printBtChildShapes(btCompoundShape* cs, int indent, int subshape);
-            void printSpaces(int num);
+            void printBtChildShapes(btCompoundShape* cs, int indent, int subshape); // FIXME: (noep) remove debug
+            void printSpaces(int num);   // FIXME: (noep) remove debug
             int entityOfCollisionShape(const btCollisionShape* cs);