Changeset 10810 for code/branches/explosionChunksHS15

Timestamp:

Nov 16, 2015, 3:51:56 PM (9 years ago)

Author:

vaydin

Message:

added offset option for explosion

Location:

code/branches/explosionChunksHS15

Files:

• data/levels/emptyLevel.oxw (modified) (3 diffs)
• data/levels/templates/spaceshipAssff.oxt (modified) (1 diff)
• src/orxonox/worldentities/ExplosionPart.cc (modified) (5 diffs)
• src/orxonox/worldentities/ExplosionPart.h (modified) (2 diffs)
• src/orxonox/worldentities/pawns/Pawn.cc (modified) (1 diff)

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

@@ -37 +37 @@
         <templates>
           <Template link=spaceshipassff />
-        </templates>
-
-        <explosion >
-          <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_flash2" effect2="orxonox/explosion_flame2" />
-          <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_shockwave2" effect2="orxonox/explosion_sparks2" />
-          <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_streak2" effect2="orxonox/explosion_afterglow" />
-        </explosion>
-          
-                    
+        </templates>         
     </SpaceShip>
     <SpaceShip
@@ -54 +46 @@
           <Template link=spaceshipassff />
         </templates>
-
-        <explosion >
-          <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_flash2" effect2="orxonox/explosion_flame2" />
-          <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_shockwave2" effect2="orxonox/explosion_sparks2" />
-          <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_streak2" effect2="orxonox/explosion_afterglow" />
-
-          <ExplosionPart minspeed=0 maxspeed=0 effect1="Orxonox/explosion2b" effect2="Orxonox/smoke6" />
-          <ExplosionPart mesh="CockpitDebris.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
-          <ExplosionPart mesh="BodyDebris1.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
-          <ExplosionPart mesh="WingDebris1.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
-          <ExplosionPart mesh="WingDebris2.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
-        </explosion>
                     
     </SpaceShip>
@@ -73 +53 @@
         >
         <templates>
-          <Template link=spaceshipassff />
+          <Template link=spaceshipescort />
         </templates>
-
-        <explosion>
-          <ExplosionPart mesh="WingDebris1.mesh" />
-          <ExplosionPart mesh="WingDebris2.mesh" />
-          
-        </explosion>
 
         

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

@@ -57 +57 @@
     </collisionShapes>
     <explosion >
-      <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_flash2" effect2="orxonox/explosion_flame2" />
-      <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_shockwave2" effect2="orxonox/explosion_sparks2" />
-      <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_streak2" effect2="orxonox/explosion_afterglow" />
+      <ExplosionPart offset="100,100,100" minspeed=0 maxspeed=0 effect1="orxonox/explosion_flash2" effect2="orxonox/explosion_flame2" />
+      <ExplosionPart offset="100,100,100" minspeed=0 maxspeed=0 effect1="orxonox/explosion_shockwave2" effect2="orxonox/explosion_sparks2" />
+      <ExplosionPart offset="100,100,100" minspeed=0 maxspeed=0 effect1="orxonox/explosion_streak2" effect2="orxonox/explosion_afterglow" />
 
-      <ExplosionPart minspeed=0 maxspeed=0 effect1="Orxonox/explosion2b" effect2="Orxonox/smoke6" />
-      <ExplosionPart mesh="CockpitDebris.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
-      <ExplosionPart mesh="BodyDebris1.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
-      <ExplosionPart mesh="WingDebris1.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
-      <ExplosionPart mesh="WingDebris2.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
+      <ExplosionPart offset="100,100,100" minspeed=0 maxspeed=0 effect1="Orxonox/explosion2b" effect2="Orxonox/smoke6" />
+      <ExplosionPart offset="100,100,100" mesh="CockpitDebris.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
+      <ExplosionPart offset="100,100,100" mesh="BodyDebris1.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
+      <ExplosionPart offset="100,100,100" mesh="WingDebris1.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
+      <ExplosionPart offset="100,100,100" mesh="WingDebris2.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
     </explosion>
 <?lua

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

@@ -49 +49 @@
                 this->effect2Particle_= NULL;
                 this->explosionEntity_ = new MovableEntity(this->getContext());
+                this->posOffset_ = Vector3::ZERO;
 
 
@@ -82 +83 @@
                 XMLPortParam(ExplosionPart, "effect1", setEffect1, getEffect1, xmlelement, mode).defaultValues("");
                 XMLPortParam(ExplosionPart, "effect2", setEffect2, getEffect2, xmlelement, mode).defaultValues("");
+                XMLPortParam(ExplosionPart, "offset", setOffset, getOffset, xmlelement, mode).defaultValues(Vector3::ZERO);
 
 
@@ -90 +92 @@
         {
                 orxout() << "Explode" << endl;
+
 
 
@@ -174 +177 @@
         }
 
+        void ExplosionPart::setOffset(Vector3 newVector)
+        {
+                this->posOffset_ = newVector;
+                this->setPosition(this->getPosition() + this->posOffset_);
+        }
+
         std::string& ExplosionPart::getMesh()
         { return this->mesh_; }
@@ -193 +202 @@
         }
 
+        Vector3 ExplosionPart::getOffset()
+        {
+                return this->posOffset_;
+        }
+
 
 

code/branches/explosionChunksHS15/src/orxonox/worldentities/ExplosionPart.h

@@ -65 +65 @@
             void setMaxSpeed(float speed);
             float getMaxSpeed();
+            void setOffset(Vector3 newVector);
+            Vector3 getOffset();
          
 
@@ -83 +85 @@
                 std::string effect1_;
             std::string effect2_;
+            Vector3 posOffset_;
 
             MovableEntity* explosionEntity_;

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

@@ -140 +140 @@
         XMLPortParam(Pawn, "spawnparticlesource", setSpawnParticleSource, getSpawnParticleSource, xmlelement, mode);
         XMLPortParam(Pawn, "spawnparticleduration", setSpawnParticleDuration, getSpawnParticleDuration, xmlelement, mode).defaultValues(3.0f);
-        XMLPortParam(Pawn, "explosionchunks", setExplosionChunks, getExplosionChunks, xmlelement, mode).defaultValues(7);
+        XMLPortParam(Pawn, "explosionchunks", setExplosionChunks, getExplosionChunks, xmlelement, mode).defaultValues(0);
 
         XMLPortObject(Pawn, WeaponSlot, "weaponslots", addWeaponSlot, getWeaponSlot, xmlelement, mode);