Changeset 2422 for code/branches/objecthierarchy2/src/orxonox/objects/worldentities/pawns

Timestamp:

Dec 13, 2008, 2:55:13 PM (16 years ago)

Author:

landauf

Message:

• deatheffect (explosion) of Pawns works on client and server (creator of the effects can't be the Pawn itself because it will be destroyed on the client before synchronizing the effects)
• fixed a small initialization error in Shader
• fixed a bug in the resynchronization of already deleted MovableEntities
• ExplosionChunk only recalculates it's velocity on the Master

Location:

code/branches/objecthierarchy2/src/orxonox/objects/worldentities/pawns

Files:

• Pawn.cc (modified) (8 diffs)
• Spectator.cc (modified) (1 diff)

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

@@ -30 +30 @@
 #include "Pawn.h"
 
+#include "core/Core.h"
 #include "core/CoreIncludes.h"
 #include "core/XMLPort.h"
@@ -145 +146 @@
         if (this->spawnparticlesource_ != "")
         {
-            ParticleSpawner* effect = new ParticleSpawner(this);
+            ParticleSpawner* effect = new ParticleSpawner(this->getCreator());
             effect->setPosition(this->getPosition());
             effect->setOrientation(this->getOrientation());
@@ -167 +168 @@
             this->getPlayer()->stopControl(this);
 
-        this->deatheffect();
+        if (Core::isMaster())
+            this->deatheffect();
     }
 
@@ -174 +176 @@
         // play death effect
         {
-            ParticleSpawner* effect = new ParticleSpawner(this);
+            ParticleSpawner* effect = new ParticleSpawner(this->getCreator());
             effect->setPosition(this->getPosition());
             effect->setOrientation(this->getOrientation());
@@ -182 +184 @@
         }
         {
-            ParticleSpawner* effect = new ParticleSpawner(this);
+            ParticleSpawner* effect = new ParticleSpawner(this->getCreator());
             effect->setPosition(this->getPosition());
             effect->setOrientation(this->getOrientation());
@@ -190 +192 @@
         }
         {
-            ParticleSpawner* effect = new ParticleSpawner(this);
+            ParticleSpawner* effect = new ParticleSpawner(this->getCreator());
             effect->setPosition(this->getPosition());
             effect->setOrientation(this->getOrientation());
@@ -199 +201 @@
         for (unsigned int i = 0; i < this->numexplosionchunks_; ++i)
         {
-            ExplosionChunk* chunk = new ExplosionChunk(this);
+            ExplosionChunk* chunk = new ExplosionChunk(this->getCreator());
             chunk->setPosition(this->getPosition());
 
@@ -214 +216 @@
     {
         this->setHealth(this->initialHealth_);
-        this->spawneffect();
+        if (Core::isMaster())
+            this->spawneffect();
     }
 

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

@@ -62 +62 @@
 
         this->greetingFlare_ = new BillboardSet();
-        this->greetingFlare_->setBillboardSet(this->getScene()->getSceneManager(), "Examples/Flare", ColourValue(1.0, 1.0, 0.8), Vector3(0, 20, 0), 1);
+        this->greetingFlare_->setBillboardSet(this->getScene()->getSceneManager(), "Examples/Flare", ColourValue(1.0, 1.0, 0.8), Vector3(0, 0, 0), 1);
         if (this->greetingFlare_->getBillboardSet())
             this->getNode()->attachObject(this->greetingFlare_->getBillboardSet());