Changeset 10752

Timestamp:

Nov 2, 2015, 3:23:03 PM (9 years ago)

Author:

vaydin

Message:

Deleted previously created VaydinExplosion class, created ExplosionPart class

Location:

code/branches/explosionChunksHS15

Files:

• data/levels/emptyLevel.oxw (modified) (3 diffs)
• data/levels/templates/spaceshipEscort.oxt (modified) (1 diff)
• src/orxonox/worldentities/CMakeLists.txt (modified) (1 diff)
• src/orxonox/worldentities/ExplosionPart.cc (added)
• src/orxonox/worldentities/ExplosionPart.h (added)
• src/orxonox/worldentities/pawns/Pawn.cc (modified) (5 diffs)
• src/orxonox/worldentities/pawns/Pawn.h (modified) (3 diffs)
• src/orxonox/worldentities/pawns/SpaceShip.cc (modified) (1 diff)

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

@@ -38 +38 @@
         <templates>
                       <Template link=spaceshipassff />
-                    </templates>
+        </templates>
+          
+                    
     </SpaceShip>
     <SpaceShip
@@ -47 +49 @@
                       <Template link=spaceshipassff />
                     </templates>
+                    <explosion>
+
+          <ExplosionPart mesh="ship.mesh" effect="Orxonox/smoke7" />
+          <ExplosionPart mesh="ship.mesh" effect="Orxonox/smoke7" />
+
+        </explosion>
+                    
     </SpaceShip>
     <SpaceShip
@@ -55 +64 @@
                       <Template link=spaceshipassff />
                     </templates>
+                    <explosion>
+
+          <ExplosionPart mesh="ship.mesh" effect="Orxonox/smoke7" />
+          <ExplosionPart mesh="ship.mesh" effect="Orxonox/smoke7" />
+
+        </explosion>
+                    
     </SpaceShip>
     

code/branches/explosionChunksHS15/data/levels/templates/spaceshipEscort.oxt

@@ -5 +5 @@
    spawnparticlesource    = "Orxonox/fairytwirl"
    spawnparticleduration  = 3
-   explosionchunks        = 40
+   explosionchunks        = 10
 
    health            = 80

code/branches/explosionChunksHS15/src/orxonox/worldentities/CMakeLists.txt

@@ -12 +12 @@
   SpawnPoint.cc
   TeamSpawnPoint.cc
-  VaydinExplosion.cc
+  ExplosionPart.cc
 )
 

code/branches/explosionChunksHS15/src/orxonox/worldentities/pawns/Pawn.cc

@@ -42 +42 @@
 #include "worldentities/ExplosionChunk.h"
 #include "worldentities/BigExplosion.h"
-//#include "worldentities/VaydinExplosion.h"
+#include "worldentities/ExplosionPart.h"
 #include "weaponsystem/WeaponSystem.h"
 #include "weaponsystem/WeaponSlot.h"
@@ -86 +86 @@
         this->aimPosition_ = Vector3::ZERO;
 
+        //this->explosionPartList_ = NULL;
+
         if (GameMode::isMaster())
         {
@@ -144 +146 @@
         XMLPortObject(Pawn, WeaponPack, "weapons", addWeaponPackXML, getWeaponPack, xmlelement, mode);
 
-        //XMLPortObject(Pawn, VaydinExplosion, "vaydinexplosion", addVaydinExplosion, getVaydinExplosion, xmlelement, mode);
+        XMLPortObject(Pawn, ExplosionPart, "explosion", addExplosionPart, getExplosionPart, xmlelement, mode);
 
         XMLPortParam(Pawn, "reloadrate", setReloadRate, getReloadRate, xmlelement, mode).defaultValues(0);
@@ -385 +387 @@
         this->setDestroyWhenPlayerLeft(false);
 
-        BigExplosion* chunk = new BigExplosion(this->getContext());
+        /*ExplosionPart* chunk = new ExplosionPart(this->getContext());
         chunk->setPosition(this->getPosition());
         chunk->setVelocity(this->getVelocity());
+        chunk->Explode();*/
+
+        while(!explosionPartList_.empty())
+        {
+            explosionPartList_.back()->setPosition(this->getPosition());
+            explosionPartList_.back()->setVelocity(this->getVelocity());
+            explosionPartList_.back()->Explode();
+            explosionPartList_.pop_back();
+        }
 
         this->explosionSound_->setPosition(this->getPosition());
@@ -497 +508 @@
             this->spawneffect();
     }
+
+
+    void Pawn::addExplosionPart(ExplosionPart* ePart)
+    {this->explosionPartList_.push_back(ePart);}
+
+
+    ExplosionPart * Pawn::getExplosionPart()
+    {return this->explosionPartList_.back();}
+
+
 
     /* WeaponSystem:

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

@@ -33 +33 @@
 
 #include <string>
+#include <vector>
 #include "interfaces/PickupCarrier.h"
 #include "interfaces/RadarViewable.h"
 #include "worldentities/ControllableEntity.h"
+#include "worldentities/ExplosionPart.h"
 
 
@@ -147 +149 @@
             virtual void postSpawn();
 
+            void addExplosionPart(ExplosionPart* ePart);
+            ExplosionPart * getExplosionPart();
+
             void addWeaponSlot(WeaponSlot * wSlot);
             WeaponSlot * getWeaponSlot(unsigned int index) const;
@@ -241 +246 @@
             unsigned int numexplosionchunks_;
 
+            std::vector<ExplosionPart*> explosionPartList_;
+
         private:
             void registerVariables();

code/branches/explosionChunksHS15/src/orxonox/worldentities/pawns/SpaceShip.cc

@@ -115 +115 @@
 
         XMLPortObject(SpaceShip, Engine, "engines", addEngine, getEngine, xmlelement, mode);
+
+        
     }