Changeset 2422 for code/branches

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

Files:

• network/Synchronisable.cc (modified) (2 diffs)
• orxonox/OrxonoxPrereqs.h (modified) (2 diffs)
• orxonox/objects/worldentities/ExplosionChunk.cc (modified) (7 diffs)
• orxonox/objects/worldentities/ExplosionChunk.h (modified) (1 diff)
• orxonox/objects/worldentities/MovableEntity.cc (modified) (2 diffs)
• orxonox/objects/worldentities/MovableEntity.h (modified) (2 diffs)
• orxonox/objects/worldentities/pawns/Pawn.cc (modified) (8 diffs)
• orxonox/objects/worldentities/pawns/Spectator.cc (modified) (1 diff)
• orxonox/tools/Shader.cc (modified) (1 diff)

code/branches/objecthierarchy2/src/network/Synchronisable.cc

@@ -85 +85 @@
     for(it = ObjectList<Synchronisable>::begin(); it!=ObjectList<Synchronisable>::end(); ++it){
       if( it->getObjectID()==this->objectID )
-        assert(*it==this || (it->objectID==OBJECTID_UNKNOWN && it->objectMode_==0x0));
+        if(!(*it==this || (it->objectID==OBJECTID_UNKNOWN && it->objectMode_==0x0)))
+        {
+            COUT(1) << "Assertion failed: *it==this || (it->objectID==OBJECTID_UNKNOWN && it->objectMode_==0x0)" << std::endl;
+            COUT(1) << "Possible reason for this error: Client created a synchronized object without the Server's approval." << std::endl;
+            abort();
+        }
     }
 #endif
@@ -177 +182 @@
 
     Identifier* id = ClassByID(header->classID);
+    if (!id)
+    {
+        COUT(1) << "Assertion failed: id" << std::endl;
+        COUT(1) << "Possible reason for this error: Client received a synchronizable object whose class has no factory." << std::endl;
+        abort();
+    }
     assert(id);
     BaseObject* creator = 0;

code/branches/objecthierarchy2/src/orxonox/OrxonoxPrereqs.h

@@ -114 +114 @@
     class Billboard;
     class BlinkingBillboard;
+    class ExplosionChunk;
     class FadingBillboard;
     class GlobalShader;
@@ -158 +159 @@
     class HumanPlayer;
     class Bot;
+    class GametypeInfo;
 
     class Gametype;

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

@@ -30 +30 @@
 #include "ExplosionChunk.h"
 
+#include "core/Core.h"
 #include "core/CoreIncludes.h"
 #include "core/Executor.h"
@@ -47 +48 @@
             ThrowException(AbortLoading, "Can't create ExplosionChunk, no scene or no scene manager given.");
 
+        this->bStop_ = false;
         this->LOD_ = LODParticle::normal;
 
@@ -63 +65 @@
         }
 
-        Vector3 velocity(rnd(-1, 1), rnd(-1, 1), rnd(-1, 1));
-        velocity.normalise();
-        velocity *= rnd(40, 60);
-        this->setVelocity(velocity);
+        if (Core::isMaster())
+        {
+            Vector3 velocity(rnd(-1, 1), rnd(-1, 1), rnd(-1, 1));
+            velocity.normalise();
+            velocity *= rnd(60, 80);
+            this->setVelocity(velocity);
 
-        this->destroyTimer_.setTimer(rnd(1, 2), false, this, createExecutor(createFunctor(&ExplosionChunk::stop)));
+            this->destroyTimer_.setTimer(rnd(1, 2), false, this, createExecutor(createFunctor(&ExplosionChunk::stop)));
+        }
 
         this->registerVariables();
@@ -86 +91 @@
     void ExplosionChunk::registerVariables()
     {
-        REGISTERDATA(this->LOD_, direction::toclient, new NetworkCallback<ExplosionChunk>(this, &ExplosionChunk::LODchanged));
+        REGISTERDATA(this->LOD_,   direction::toclient, new NetworkCallback<ExplosionChunk>(this, &ExplosionChunk::LODchanged));
+        REGISTERDATA(this->bStop_, direction::toclient, new NetworkCallback<ExplosionChunk>(this, &ExplosionChunk::checkStop));
     }
 
@@ -97 +103 @@
     }
 
+    void ExplosionChunk::checkStop()
+    {
+        if (this->bStop_)
+            this->stop();
+    }
+
     void ExplosionChunk::stop()
     {
@@ -104 +116 @@
             this->smoke_->setEnabled(false);
 
-        this->destroyTimer_.setTimer(1.0f, false, this, createExecutor(createFunctor(&ExplosionChunk::destroy)));
+        if (Core::isMaster())
+        {
+            this->bStop_ = true;
+            this->destroyTimer_.setTimer(1.0f, false, this, createExecutor(createFunctor(&ExplosionChunk::destroy)));
+        }
     }
 
@@ -116 +132 @@
         static const unsigned int CHANGES_PER_SECOND = 5;
 
-        if (rnd() < dt*CHANGES_PER_SECOND)
+        if (Core::isMaster() && rnd() < dt*CHANGES_PER_SECOND)
         {
             float length = this->getVelocity().length();

code/branches/objecthierarchy2/src/orxonox/objects/worldentities/ExplosionChunk.h

@@ -53 +53 @@
         private:
             void LODchanged();
+            void checkStop();
             void stop();
             void destroy();
 
+            bool                  bStop_;
             ParticleInterface*    fire_;
             ParticleInterface*    smoke_;

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

@@ -33 +33 @@
 #include "core/XMLPort.h"
 #include "core/Executor.h"
-#include "tools/Timer.h"
 
 namespace orxonox
@@ -112 +111 @@
     void MovableEntity::clientConnected(unsigned int clientID)
     {
-        new Timer<MovableEntity>(rnd() * MAX_RESYNCHRONIZE_TIME, false, this, createExecutor(createFunctor(&MovableEntity::resynchronize)), true);
+        this->resynchronizeTimer_.setTimer(rnd() * MAX_RESYNCHRONIZE_TIME, false, this, createExecutor(createFunctor(&MovableEntity::resynchronize)));
     }
 

code/branches/objecthierarchy2/src/orxonox/objects/worldentities/MovableEntity.h

@@ -35 +35 @@
 #include "objects/Tickable.h"
 #include "network/ClientConnectionListener.h"
+#include "tools/Timer.h"
 
 namespace orxonox
@@ -119 +120 @@
             Vector3 overwrite_position_;
             Quaternion overwrite_orientation_;
+
+            Timer<MovableEntity> resynchronizeTimer_;
     };
 }

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());

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

@@ -52 +52 @@
     Shader::MaterialMap Shader::parameters_s;
 
-    Shader::Shader(Ogre::SceneManager* scenemanager)
+    Shader::Shader(Ogre::SceneManager* scenemanager) : compositorInstance_(0)
     {
         RegisterObject(Shader);