Changeset 2470 for code/branches/presentation

Timestamp:

Dec 15, 2008, 9:40:09 PM (16 years ago)

Author:

rgrieder

Message:

Fixed bug that caused MovableEntities to jump around on the client.

File:

• code/branches/presentation/src/orxonox/objects/worldentities/MovableEntity.cc (modified) (4 diffs)

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

@@ -34 +34 @@
 #include "core/XMLPort.h"
 #include "core/Executor.h"
+#include "core/Core.h"
 #include "tools/Timer.h"
 
@@ -49 +50 @@
         this->overwrite_position_    = Vector3::ZERO;
         this->overwrite_orientation_ = Quaternion::IDENTITY;
-        
-        this->setPriority( priority::low );
 
-        // Resynchronise every few seconds because we only work with velocities (no positions)
-        continuousResynchroTimer_ = new Timer<MovableEntity>(CONTINUOUS_SYNCHRONIZATION_TIME + rnd(-1, 1),
-                true, this, createExecutor(createFunctor(&MovableEntity::resynchronize)), false);
+        this->continuousResynchroTimer_ = 0;
+
+        this->setPriority(priority::low);
 
         this->registerVariables();
@@ -62 +61 @@
     {
         if (this->isInitialized())
-            delete this->continuousResynchroTimer_;
+            if (this->continuousResynchroTimer_)
+                delete this->continuousResynchroTimer_;
     }
 
@@ -90 +90 @@
     void MovableEntity::resynchronize()
     {
+        if (Core::isMaster() && !this->continuousResynchroTimer_)
+        {
+            // Resynchronise every few seconds because we only work with velocities (no positions)
+            continuousResynchroTimer_ = new Timer<MovableEntity>(CONTINUOUS_SYNCHRONIZATION_TIME + rnd(-1, 1),
+                true, this, createExecutor(createFunctor(&MovableEntity::resynchronize)), false);
+        }
+
         this->overwrite_position_ = this->getPosition();
         this->overwrite_orientation_ = this->getOrientation();