Changeset 10669

Timestamp:

Oct 19, 2015, 4:00:00 PM (9 years ago)

Author:

vaydin

Message:

created new explosion class

Location:

code/branches/explosionChunksHS15

Files:

• data/levels/emptyLevel.oxw (modified) (2 diffs)
• data/levels/templates/spaceshipAssff.oxt (modified) (1 diff)
• data/levels/templates/spaceshipEscort.oxt (modified) (1 diff)
• src/orxonox/worldentities/BigExplosion.cc (modified) (1 diff)
• src/orxonox/worldentities/CMakeLists.txt (modified) (1 diff)
• src/orxonox/worldentities/VaydinExplosion.cc (added)
• src/orxonox/worldentities/VaydinExplosion.h (added)
• src/orxonox/worldentities/pawns/Pawn.cc (modified) (5 diffs)

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

@@ -13 +13 @@
 
 <?lua
-  include("templates/spaceshipAssff2.oxt")
-  include("templates/spaceshipPirate.oxt")
+  include("templates/spaceshipAssff.oxt")
   include("templates/spaceshipEscort.oxt")
-  include("templates/spaceshipRing.oxt")
-  include("templates/spaceshipSwallow.oxt")
 ?>
 
@@ -33 +30 @@
     <Light type=directional position="0,0,0" direction="0.253, 0.593, -0.765" diffuse="1.0, 0.9, 0.9, 1.0" specular="1.0, 0.9, 0.9, 1.0"/>
     <SpawnPoint team=0 position="-200,0,0" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipescort />
+
+    <SpaceShip
+        team                = "1"
+        position            = "1000,0,0"
+   explosionchunks        = 60
+        >
+        <templates>
+                      <Template link=spaceshipassff />
+                    </templates>
+    </SpaceShip>
+    <SpaceShip
+        team                = "1"
+        position            = "1000,200,0"
+        >
+        <templates>
+                      <Template link=spaceshipassff />
+                    </templates>
+    </SpaceShip>
+    <SpaceShip
+        team                = "1"
+        position            = "1000,400,0"
+        >
+        <templates>
+                      <Template link=spaceshipassff />
+                    </templates>
+    </SpaceShip>
     
   </Scene>

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

@@ -5 +5 @@
    spawnparticlesource    = "Orxonox/fairytwirl"
    spawnparticleduration  = 3
-   explosionchunks        = 6
 
    health            = 100

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

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

code/branches/explosionChunksHS15/src/orxonox/worldentities/BigExplosion.cc

@@ -80 +80 @@
     void BigExplosion::init()
     {
+
+        orxout() << "BigExplosion" << endl;
+
         this->debrisEntity1_ = new MovableEntity(this->getContext());
         this->debrisEntity2_ = new MovableEntity(this->getContext());

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

@@ -12 +12 @@
   SpawnPoint.cc
   TeamSpawnPoint.cc
+  VaydinExplosion.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 "weaponsystem/WeaponSystem.h"
 #include "weaponsystem/WeaponSlot.h"
@@ -142 +143 @@
         XMLPortObject(Pawn, WeaponSet, "weaponsets", addWeaponSet, getWeaponSet, xmlelement, mode);
         XMLPortObject(Pawn, WeaponPack, "weapons", addWeaponPackXML, getWeaponPack, xmlelement, mode);
+
+        //XMLPortObject(Pawn, VaydinExplosion, "vaydinexplosion", addVaydinExplosion, getVaydinExplosion, xmlelement, mode);
 
         XMLPortParam(Pawn, "reloadrate", setReloadRate, getReloadRate, xmlelement, mode).defaultValues(0);
@@ -165 +168 @@
     void Pawn::tick(float dt)
     {
+        //BigExplosion* chunk = new BigExplosion(this->getContext());
         SUPER(Pawn, tick, dt);
 
@@ -375 +379 @@
     void Pawn::goWithStyle()
     {
+        orxout() << "gowithstyle" << endl;
+
+
         this->bAlive_ = false;
         this->setDestroyWhenPlayerLeft(false);
@@ -387 +394 @@
     void Pawn::deatheffect()
     {
+        orxout() << "deatheffect" << endl;
         // play death effect
         /*{