Changeset 10029 for code/branches

Timestamp:

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

Author:

noep

Message:

Fixed a bug where part-entity-assignments were not created.

Location:

code/branches/modularships

Files:

• data/levels/emptyLevel.oxw (modified) (1 diff)
• data/levels/templates/HeavyCruiser.oxt (modified) (2 diffs)
• src/orxonox/worldentities/WorldEntity.h (modified) (1 diff)
• src/orxonox/worldentities/pawns/ModularSpaceShip.cc (modified) (5 diffs)

code/branches/modularships/data/levels/emptyLevel.oxw

@@ -98 +98 @@
     </ModularSpaceShip>
     
-    <ModularSpaceShip position="0,-1000,-200" health="1000" maxhealth="2000" initialhealth="1000">
+    <ModularSpaceShip position="0,-1000,-200" health="2000" maxhealth="4000" initialhealth="2000">
       <templates>
         <Template link=HeavyCruiser />

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

@@ -11 +11 @@
    explosionchunks        = 6
 
-   health            = 1000
-   maxhealth         = 2000
-   initialhealth     = 1000
+   health            = 2000
+   maxhealth         = 4000
+   initialhealth     = 2000
 
    shieldhealth        = 100
@@ -51 +51 @@
     
     <parts>
-        <ShipPart name="frontL" health="100" damageabsorption="0.5" />
-        <ShipPart name="frontR" health="100" damageabsorption="0.5" />
-        <ShipPart name="partL" health="100" damageabsorption="0.5" />
-        <ShipPart name="partR" health="100" damageabsorption="0.5" />
-        <ShipPart name="sidearmL" health="201" damageabsorption="0.2" />
-        <ShipPart name="sidearmLfront" health="100" damageabsorption="0.5" />
-        <ShipPart name="sidearmR" health="200" damageabsorption="0.2" />
-        <ShipPart name="sidearmRfront" health="100" damageabsorption="0.5" />
+        <ShipPart name="frontL" initialhealth="10" damageabsorption="0.5" />
+        <ShipPart name="frontR" initialhealth="10" damageabsorption="0.5" />
+        <ShipPart name="partL" initialhealth="10" damageabsorption="0.5" />
+        <ShipPart name="partR" initialhealth="10" damageabsorption="0.5" />
+        <ShipPart name="sidearmL" initialhealth="20" damageabsorption="0.2" />
+        <ShipPart name="sidearmLfront" initialhealth="10" damageabsorption="0.5" />
+        <ShipPart name="sidearmR" initialhealth="20" damageabsorption="0.2" />
+        <ShipPart name="sidearmRfront" initialhealth="10" damageabsorption="0.5" />
     </parts>
     

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

@@ -206 +206 @@
 
             void notifyChildPropsChanged();
+
+            inline int getNumAttachedObj()
+                { return this->children_.size(); }
 
         protected:

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

@@ -78 +78 @@
     {
         // iterate through all attached objects
-        for (unsigned int i=0; i < 100; i++)
+        for (unsigned int i=0; i < this->getNumAttachedObj(); i++)
         {
             if (this->getAttachedObject(i) == NULL)
+            {
                 break;
+            }
             // iterate through all attached parts
             for(unsigned int j = 0; j < this->partList_.size(); j++)
@@ -149 +151 @@
     void ModularSpaceShip::damage(float damage, float healthdamage, float shielddamage, Pawn* originator, const btCollisionShape* cs)
     {
-        orxout() << "Mdamage(): Collision detected on " << this->getRadarName() << ", btCS*: " << cs << endl;
+        /*orxout() << "Mdamage(): Collision detected on " << this->getRadarName() << ", btCS*: " << cs << endl;
         orxout() << "UserPtr of said collisionShape: " << cs->getUserPointer() << endl;
 
@@ -177 +179 @@
         //orxout() << "ShipPart of Entity " << cs->getUserPointer() << ": " << this->getPartOfEntity((StaticEntity*)(cs->getUserPointer())) << endl;
 
-        orxout() << "CP_start" << 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);
-
-        orxout() << "CP_end" << endl;
 
         /*
@@ -267 +265 @@
         {
             if(this->partList_[i] == part)
+            {
                 this->partList_.erase(it);
+                break;
+            }
             it++;
         }
@@ -275 +276 @@
             if (itt->second == part)
             {
-                this->detach(itt->first);
+                //this->detach(itt->first);
+                //itt->first->destroy();
+                itt->first->setActive(false);
+                itt->first->setVisible(false);
+                itt->first->setCollisionResponse(false);
                 this->partMap_.erase(itt);
             }