Changeset 2414 for code/branches

Timestamp:

Dec 12, 2008, 4:39:13 AM (16 years ago)

Author:

landauf

Message:

added spawn- and destroy-effects to Pawn

Location:

code/branches/objecthierarchy2/src/orxonox

Files:

• objects/GlobalShader.cc (modified) (1 diff)
• objects/worldentities/Backlight.cc (modified) (1 diff)
• objects/worldentities/CMakeLists.txt (modified) (1 diff)
• objects/worldentities/ExplosionChunk.cc (added)
• objects/worldentities/ExplosionChunk.h (added)
• objects/worldentities/ParticleEmitter.cc (modified) (1 diff)
• objects/worldentities/pawns/Pawn.cc (modified) (6 diffs)
• objects/worldentities/pawns/Pawn.h (modified) (2 diffs)
• tools/ParticleInterface.cc (modified) (1 diff)

code/branches/objecthierarchy2/src/orxonox/objects/GlobalShader.cc

@@ -44 +44 @@
 
         if (!this->getScene())
-            ThrowException(AbortLoading, "Can't create Camera, no scene given.");
+            ThrowException(AbortLoading, "Can't create GlobalShader, no scene given.");
         if (!this->getScene()->getSceneManager())
-            ThrowException(AbortLoading, "Can't create Camera, no scene manager given.");
+            ThrowException(AbortLoading, "Can't create GlobalShader, no scene manager given.");
 
         this->shader_.setSceneManager(this->getScene()->getSceneManager());

code/branches/objecthierarchy2/src/orxonox/objects/worldentities/Backlight.cc

@@ -61 +61 @@
         {
             if (!this->getScene())
-                ThrowException(AbortLoading, "Can't create Camera, no scene given.");
+                ThrowException(AbortLoading, "Can't create Backlight, no scene given.");
             if (!this->getScene()->getSceneManager())
-                ThrowException(AbortLoading, "Can't create Camera, no scene manager given.");
+                ThrowException(AbortLoading, "Can't create Backlight, no scene manager given.");
             if (!this->getScene()->getRootSceneNode())
-                ThrowException(AbortLoading, "Can't create Camera, no root scene node given.");
+                ThrowException(AbortLoading, "Can't create Backlight, no root scene node given.");
 
             this->ribbonTrail_ = this->getScene()->getSceneManager()->createRibbonTrail(this->getNode()->getName());

code/branches/objecthierarchy2/src/orxonox/objects/worldentities/CMakeLists.txt

@@ -8 +8 @@
   Billboard.cc
   BlinkingBillboard.cc
+  ExplosionChunk.cc
   FadingBillboard.cc
   Light.cc

code/branches/objecthierarchy2/src/orxonox/objects/worldentities/ParticleEmitter.cc

@@ -51 +51 @@
 
         if (!this->getScene() || !this->getScene()->getSceneManager())
-            ThrowException(AbortLoading, "Can't create Camera, no scene or no scene manager given.");
+            ThrowException(AbortLoading, "Can't create ParticleEmitter, no scene or no scene manager given.");
 
         this->particles_ = 0;

code/branches/objecthierarchy2/src/orxonox/objects/worldentities/pawns/Pawn.cc

@@ -37 +37 @@
 #include "objects/gametypes/Gametype.h"
 #include "objects/weaponSystem/WeaponSystem.h"
+#include "objects/worldentities/ParticleSpawner.h"
+#include "objects/worldentities/ExplosionChunk.h"
 
 namespace orxonox
@@ -56 +58 @@
         this->lastHitOriginator_ = 0;
         this->weaponSystem_ = 0;
+
+        this->spawnparticleduration_ = 3.0f;
 
         /*
@@ -87 +91 @@
         XMLPortParam(Pawn, "maxhealth", setMaxHealth, getMaxHealth, xmlelement, mode).defaultValues(200);
         XMLPortParam(Pawn, "initialhealth", setInitialHealth, getInitialHealth, xmlelement, mode).defaultValues(100);
+        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);
     }
 
@@ -133 +140 @@
     }
 
-    void Pawn::spawn()
+    void Pawn::spawneffect()
     {
         // play spawn effect
+        if (this->spawnparticlesource_ != "")
+        {
+            ParticleSpawner* effect = new ParticleSpawner(this);
+            effect->setPosition(this->getPosition());
+            effect->setOrientation(this->getOrientation());
+            effect->setDestroyAfterLife(true);
+            effect->setSource(this->spawnparticlesource_);
+            effect->setLifetime(this->spawnparticleduration_);
+        }
     }
 
@@ -151 +167 @@
             this->getPlayer()->stopControl(this);
 
+        this->deatheffect();
+    }
+
+    void Pawn::deatheffect()
+    {
         // play death effect
+        {
+            ParticleSpawner* effect = new ParticleSpawner(this);
+            effect->setPosition(this->getPosition());
+            effect->setOrientation(this->getOrientation());
+            effect->setDestroyAfterLife(true);
+            effect->setSource("Orxonox/explosion2");
+            effect->setLifetime(4.0f);
+        }
+        {
+            ParticleSpawner* effect = new ParticleSpawner(this);
+            effect->setPosition(this->getPosition());
+            effect->setOrientation(this->getOrientation());
+            effect->setDestroyAfterLife(true);
+            effect->setSource("Orxonox/smoke6");
+            effect->setLifetime(4.0f);
+        }
+        {
+            ParticleSpawner* effect = new ParticleSpawner(this);
+            effect->setPosition(this->getPosition());
+            effect->setOrientation(this->getOrientation());
+            effect->setDestroyAfterLife(true);
+            effect->setSource("Orxonox/sparks");
+            effect->setLifetime(4.0f);
+        }
+        for (unsigned int i = 0; i < this->numexplosionchunks_; ++i)
+        {
+            ExplosionChunk* chunk = new ExplosionChunk(this);
+            chunk->setPosition(this->getPosition());
+
+        }
     }
 
@@ -163 +214 @@
     {
         this->setHealth(this->initialHealth_);
-        this->spawn();
+        this->spawneffect();
     }
 

code/branches/objecthierarchy2/src/orxonox/objects/worldentities/pawns/Pawn.h

@@ -82 +82 @@
                 { return (WorldEntity*)this; }
 
+            inline void setSpawnParticleSource(const std::string& source)
+                { this->spawnparticlesource_ = source; }
+            inline const std::string& getSpawnParticleSource() const
+                { return this->spawnparticlesource_; }
+
+            inline void setSpawnParticleDuration(float duration)
+                { this->spawnparticleduration_ = duration; }
+            inline float getSpawnParticleDuration() const
+                { return this->spawnparticleduration_; }
+
+            inline void setExplosionChunks(unsigned int chunks)
+                { this->numexplosionchunks_ = chunks; }
+            inline unsigned int getExplosionChunks() const
+                { return this->numexplosionchunks_; }
+
         protected:
-            virtual void spawn();
             virtual void death();
+            virtual void deatheffect();
+            virtual void spawneffect();
 
             bool bAlive_;
@@ -95 +111 @@
 
             WeaponSystem* weaponSystem_;
+
+            std::string spawnparticlesource_;
+            float spawnparticleduration_;
+            unsigned int numexplosionchunks_;
     };
 

code/branches/objecthierarchy2/src/orxonox/tools/ParticleInterface.cc

@@ -63 +63 @@
         this->bVisible_ = true;
         this->bAllowedByLOD_ = true;
+        this->speedFactor_ = 1.0f;
 
         if (Core::showsGraphics())