Changeset 10053 for code/branches/modularships/src

Timestamp:

May 13, 2014, 11:45:47 AM (11 years ago)

Author:

noep

Message:

Fixed yet another segfault (which we hadn't seen yet).
Cleared emptyLevel, created two testlevels (testing with boxes)

Location:

code/branches/modularships/src

Files:

• external/bullet/BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.cpp (modified) (2 diffs)
• orxonox/Scene.cc (modified) (2 diffs)
• orxonox/items/PartDestructionEvent.cc (modified) (6 diffs)
• orxonox/items/PartDestructionEvent.h (modified) (4 diffs)
• orxonox/items/ShipPart.cc (modified) (6 diffs)
• orxonox/items/ShipPart.h (modified) (2 diffs)
• orxonox/worldentities/WorldEntity.cc (modified) (2 diffs)
• orxonox/worldentities/pawns/ModularSpaceShip.cc (modified) (6 diffs)

code/branches/modularships/src/external/bullet/BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.cpp

@@ -21 +21 @@
 #include "LinearMath/btAabbUtil2.h"
 #include "btManifoldResult.h"
+#include <iostream>
 
 btCompoundCollisionAlgorithm::btCompoundCollisionAlgorithm( const btCollisionAlgorithmConstructionInfo& ci,btCollisionObject* body0,btCollisionObject* body1,bool isSwapped)
@@ -115 +116 @@
         void    ProcessChildShape(btCollisionShape* childShape,int index)
         {
-                btAssert(index>=0);
+                // std::cout << "PCS: " << childShape << std::endl; // FIXME: (noep) remove DEBUG
+            btAssert(index>=0);
                 btCompoundShape* compoundShape = static_cast<btCompoundShape*>(m_compoundColObj->getCollisionShape());
                 btAssert(index<compoundShape->getNumChildShapes());

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());
@@ -362 +360 @@
             modified |= object1->collidesAgainst(object0, cs0, cp);
 
-        orxout() << "collisionCb() completed." << endl;
-
         return modified;
     }

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

@@ -49 +49 @@
     {
         RegisterObject(PartDestructionEvent);
-        this->isValid_ = false;
+        this->setValid(true);
     }
 
@@ -76 +76 @@
     void PartDestructionEvent::execute()
     {
-        if(!this->isValid_)
+        // Do not execute if this event is invalid
+        if(!isValid())
         {
-            //orxout(internal_warning) <<
+            orxout(internal_warning) << "Attempted to execute an invalid PartDestructionEvent!" << endl;
             return;
         }
 
+        if (this->targetType_ == "ship")
+        {
+            switch (this->targetParam_) {
+            case shieldhealth:
+                this->parent_->getParent()->setShieldHealth(operate(this->parent_->getParent()->getShieldHealth()));
+                break;
+            default:
+                break;
+            }
+            this->setValid(false);
+            return;
+        }
+    }
 
+    void PartDestructionEvent::setParent(ShipPart* part)
+    {
+        this->parent_ = part;
     }
 
@@ -95 +112 @@
 
         // Error, if invalid target-type was entered.
-        orxout(internal_warning) << type << " is not a valid target-type for a PartDestructionEvent. Valid types are: ship engine weapon" << endl;
-        this->isValid_ = false;
+        orxout(internal_warning) << "\"" << type << "\" is not a valid target-type for a PartDestructionEvent. Valid types are: ship engine weapon" << endl;
+        this->setValid(false);
         return;
     }
@@ -117 +134 @@
         {
             orxout(internal_warning) << "No valid target-type defined. Cannot set target-param for this PartDestructionEvent." << endl;
-            this->isValid_ = false;
+            this->setValid(false);
             return;
         }
@@ -131 +148 @@
             if (param == "shieldhealth")
             {
-                this->targetParam_ = param;
+                this->targetParam_ = shieldhealth;
                 return;
             }
 
-            orxout(internal_warning) << param << " is not a valid target-param for a PartDestructionEvent with target-type \"ship\". Valid types are: shieldhealth maxshieldhealth shieldabsorption shieldrechargerate" << endl;
+            orxout(internal_warning) << "\"" << param << "\" is not a valid target-param for a PartDestructionEvent with target-type \"ship\". Valid types are: shieldhealth maxshieldhealth shieldabsorption shieldrechargerate" << endl;
             return;
         }
+
+        orxout(internal_warning) << "No valid target-param defined. The chosen param is either invalid or not available for this target-type." << endl;
+        this->setValid(false);
     }
 
@@ -143 +163 @@
     {
         // * + - destroy
-        this->operation_ = operation;
+        if ((operation == "*") || (operation == "+") || (operation == "-") || (operation == "destroy"))
+        {
+            this->operation_ = operation;
+            return;
+        }
+        this->operation_ = "NULL";
+        orxout(internal_warning) << "\"" << operation << "\" is not a valid operation for a PartDestructionEvent. Valid operations are: * + - destroy" << endl;
+    }
+
+    float PartDestructionEvent::operate(float input)
+    {
+        if (this->operation_ == "*")
+            return input * this->value_;
+        if (this->operation_ == "+")
+            return input + this->value_;
+        if (this->operation_ == "-")
+            return input - this->value_;
+        if (this->operation_ == "destroy")
+        {
+            return 0;
+        }
+        return 0;
     }
 

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

@@ -44 +44 @@
         public:
 
+            enum TargetParam
+            {
+                shieldhealth,
+                maxshieldhealth,
+                shieldabsorption,
+                shieldrechargerate,
+                null
+            };
+
             PartDestructionEvent(Context* context);
             virtual ~PartDestructionEvent();
@@ -50 +59 @@
 
             void execute();
+
+            inline void setValid(bool valid)
+                { this->valid_ = valid; }
+            inline bool isValid()
+                { return this->valid_; }
+
+            void setParent(ShipPart* parent);
+            inline ShipPart* getParent()
+                { return this->parent_; }
 
             void setTargetType(std::string type);
@@ -67 +85 @@
                 { return this->operation_; }
 
+            float operate(float input);
+
             void setEventValue(float value);
             inline float getEventValue()
@@ -75 +95 @@
         private:
 
-            bool isValid_;
+            ShipPart* parent_;
+            bool valid_;
 
             std::string targetType_;
             std::string targetName_;
-            std::string targetParam_;
+            TargetParam targetParam_;
             std::string operation_;
 

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

@@ -51 +51 @@
     {
         RegisterObject(ShipPart);
+        this->setAlive(true);
     }
 
@@ -91 +92 @@
     void ShipPart::death()
     {
+        if (!(this->isAlive()))
+            return;
+
+        this->setAlive(false);
+
+        // Execute all destruction events
+        for (unsigned int i = 0; i < this->eventList_.size(); i++)
+        {
+            orxout() << "executing" << endl;
+            this->getDestructionEvent(i)->execute();
+        }
+
+        // Remove this ShipPart from the parent.
         this->parent_->removeShipPart(this);
         orxout() << this->getName() << " has died." << endl;
@@ -105 +119 @@
         OrxAssert(entity != NULL, "The Entity cannot be NULL.");
         this->entityList_.push_back(entity);
-        //part->addToSpaceShip(this); //FIXME: (noep) add
     }
 
@@ -153 +166 @@
         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);
+    void ShipPart::addDestructionEvent(PartDestructionEvent* event)
+    {
+        OrxAssert(event != NULL, "The PartDestructionEvent cannot be NULL.");
+        event->setParent(this);
+        this->eventList_.push_back(event);
     }
 
@@ -168 +181 @@
     PartDestructionEvent* ShipPart::getDestructionEvent(unsigned int index)
     {
-        if(this->eventList_.size() >= index)
+        if(this->eventList_.size() <= index)
             return NULL;
         else
@@ -200 +213 @@
     {
         orxout() << "ShipPart " <<this->getName() << " is handling a hit!" << endl;
+
         if (parent_->getGametype() && parent_->getGametype()->allowPawnDamage(parent_, originator))
         {

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

@@ -73 +73 @@
                 { return this->parent_; }
 
+            inline void setAlive(bool var)
+                { this->alive_ = var; }
+            inline bool isAlive()
+                { return this->alive_; }
+
             virtual void setHealth(float health);
             inline void addHealth(float health)
@@ -108 +113 @@
             std::vector<PartDestructionEvent*> eventList_;  // The list of all PartDestructionEvent assigned to this ShipPart.
 
+            bool alive_;
+
 
     }; // tolua_export

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

@@ -119 +119 @@
     WorldEntity::~WorldEntity()
     {
-        orxout() << "destroying " << this->getIdentifier()->getName() << endl;
         if (this->isInitialized())
         {
@@ -581 +580 @@
     {
         // Note: The collision shapes may not be detached with this function!
-        orxout() << "WE: detachCS()" << endl;
         this->collisionShape_->detach(shape);
         // Note: this->collisionShape_ already notifies us of any changes.

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

@@ -133 +133 @@
         this->entityPtrList_.push_back(one);
 
-        this->createCSPtrList(this->getWorldEntityCollisionShape());
+        //this->createCSPtrList(this->getWorldEntityCollisionShape());
 
         orxout() << "New entity-part assignment created!" << endl;
@@ -139 +139 @@
 
     // 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)
+    void ModularSpaceShip::createCSPtrList(CompoundCollisionShape* cs) // FIXME: (noep) remove debug
     {
         for (int i=0; i < cs->getNumChildShapes(); i++)
@@ -208 +208 @@
         //orxout() << "ShipPart of Entity " << cs->getUserPointer() << ": " << this->getPartOfEntity((StaticEntity*)(cs->getUserPointer())) << endl;
 
-        orxout() << "CP before handleHit" << endl;
-
         if (this->getPartOfEntity((StaticEntity*)(cs->getUserPointer())) != NULL)
             this->getPartOfEntity((StaticEntity*)(cs->getUserPointer()))->handleHit(damage, healthdamage, shielddamage, originator);
@@ -255 +253 @@
         this->partList_.push_back(part);
         part->setParent(this);
-        //part->addToSpaceShip(this); //FIXME: (noep) add
         this->updatePartAssignment();
     }
@@ -267 +264 @@
     ShipPart* ModularSpaceShip::getShipPart(unsigned int index)
     {
-        if(this->partList_.size() >= index)
+        if(this->partList_.size() <= index)
             return NULL;
         else
@@ -339 +336 @@
         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);
+        //this->printBtChildShapes((btCompoundShape*)(this->getWorldEntityCollisionShape()->getCollisionShape()), 2, 0);
 
         // mass