[Orxonox-commit 6152] r10810 - in code/branches/explosionChunksHS15: data/levels data/levels/templates src/orxonox/worldentities src/orxonox/worldentities/pawns
vaydin at orxonox.net
vaydin at orxonox.net
Mon Nov 16 15:51:56 CET 2015
Author: vaydin
Date: 2015-11-16 15:51:56 +0100 (Mon, 16 Nov 2015)
New Revision: 10810
Modified:
code/branches/explosionChunksHS15/data/levels/emptyLevel.oxw
code/branches/explosionChunksHS15/data/levels/templates/spaceshipAssff.oxt
code/branches/explosionChunksHS15/src/orxonox/worldentities/ExplosionPart.cc
code/branches/explosionChunksHS15/src/orxonox/worldentities/ExplosionPart.h
code/branches/explosionChunksHS15/src/orxonox/worldentities/pawns/Pawn.cc
Log:
added offset option for explosion
Modified: code/branches/explosionChunksHS15/data/levels/emptyLevel.oxw
===================================================================
--- code/branches/explosionChunksHS15/data/levels/emptyLevel.oxw 2015-11-16 14:36:39 UTC (rev 10809)
+++ code/branches/explosionChunksHS15/data/levels/emptyLevel.oxw 2015-11-16 14:51:56 UTC (rev 10810)
@@ -36,15 +36,7 @@
>
<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
team = "1"
@@ -53,18 +45,6 @@
<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" />
-
- <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>
<SpaceShip
@@ -72,15 +52,9 @@
position = "1000,400,0"
>
<templates>
- <Template link=spaceshipassff />
+ <Template link=spaceshipescort />
</templates>
- <explosion>
- <ExplosionPart mesh="WingDebris1.mesh" />
- <ExplosionPart mesh="WingDebris2.mesh" />
-
- </explosion>
-
</SpaceShip>
Modified: code/branches/explosionChunksHS15/data/levels/templates/spaceshipAssff.oxt
===================================================================
--- code/branches/explosionChunksHS15/data/levels/templates/spaceshipAssff.oxt 2015-11-16 14:36:39 UTC (rev 10809)
+++ code/branches/explosionChunksHS15/data/levels/templates/spaceshipAssff.oxt 2015-11-16 14:51:56 UTC (rev 10810)
@@ -56,15 +56,15 @@
<BoxCollisionShape position="0,0.1,-19" halfExtents="1.4, 1, 2" />
</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
include("../includes/weaponSettingsAssff.oxi")
Modified: code/branches/explosionChunksHS15/src/orxonox/worldentities/ExplosionPart.cc
===================================================================
--- code/branches/explosionChunksHS15/src/orxonox/worldentities/ExplosionPart.cc 2015-11-16 14:36:39 UTC (rev 10809)
+++ code/branches/explosionChunksHS15/src/orxonox/worldentities/ExplosionPart.cc 2015-11-16 14:51:56 UTC (rev 10810)
@@ -48,6 +48,7 @@
this->effect1Particle_= NULL;
this->effect2Particle_= NULL;
this->explosionEntity_ = new MovableEntity(this->getContext());
+ this->posOffset_ = Vector3::ZERO;
@@ -81,6 +82,7 @@
XMLPortParam(ExplosionPart, "maxspeed", setMaxSpeed, getMaxSpeed, xmlelement, mode).defaultValues(100);
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);
}
@@ -91,6 +93,7 @@
orxout() << "Explode" << endl;
+
this->model_->setVisible(true);
//this->explosionEntity_->setSyncMode(0);
@@ -173,6 +176,12 @@
this->maxSpeed_ = speed;
}
+ void ExplosionPart::setOffset(Vector3 newVector)
+ {
+ this->posOffset_ = newVector;
+ this->setPosition(this->getPosition() + this->posOffset_);
+ }
+
std::string& ExplosionPart::getMesh()
{ return this->mesh_; }
@@ -192,6 +201,11 @@
return this->maxSpeed_;
}
+ Vector3 ExplosionPart::getOffset()
+ {
+ return this->posOffset_;
+ }
+
}
\ No newline at end of file
Modified: code/branches/explosionChunksHS15/src/orxonox/worldentities/ExplosionPart.h
===================================================================
--- code/branches/explosionChunksHS15/src/orxonox/worldentities/ExplosionPart.h 2015-11-16 14:36:39 UTC (rev 10809)
+++ code/branches/explosionChunksHS15/src/orxonox/worldentities/ExplosionPart.h 2015-11-16 14:51:56 UTC (rev 10810)
@@ -64,6 +64,8 @@
float getMinSpeed();
void setMaxSpeed(float speed);
float getMaxSpeed();
+ void setOffset(Vector3 newVector);
+ Vector3 getOffset();
private:
@@ -82,6 +84,7 @@
std::string mesh_;
std::string effect1_;
std::string effect2_;
+ Vector3 posOffset_;
MovableEntity* explosionEntity_;
Modified: code/branches/explosionChunksHS15/src/orxonox/worldentities/pawns/Pawn.cc
===================================================================
--- code/branches/explosionChunksHS15/src/orxonox/worldentities/pawns/Pawn.cc 2015-11-16 14:36:39 UTC (rev 10809)
+++ code/branches/explosionChunksHS15/src/orxonox/worldentities/pawns/Pawn.cc 2015-11-16 14:51:56 UTC (rev 10810)
@@ -139,7 +139,7 @@
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);
XMLPortObject(Pawn, WeaponSet, "weaponsets", addWeaponSet, getWeaponSet, xmlelement, mode);
More information about the Orxonox-commit
mailing list