Changeset 2421 for code/branches

Timestamp:

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

Author:

rgrieder

Message:

Added resynchronisation timer in MovableEntity to ensure the right position on the client if we only synchronise the velocity.

Location:

code/branches/physics/src/orxonox/objects/worldentities

Files:

• MovableEntity.cc (modified) (4 diffs)
• MovableEntity.h (modified) (1 diff)

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

@@ -38 +38 @@
 {
     static const float MAX_RESYNCHRONIZE_TIME = 3.0f;
+    static const float CONTINUOUS_SYNCHRONIZATION_TIME = 10.0f;
 
     CreateFactory(MovableEntity);
@@ -48 +49 @@
         this->overwrite_orientation_ = Quaternion::IDENTITY;
 
+        // 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->registerVariables();
     }
@@ -53 +58 @@
     MovableEntity::~MovableEntity()
     {
+        if (this->isInitialized())
+            delete this->continuousResynchroTimer_;
     }
 
@@ -90 +97 @@
     void MovableEntity::clientConnected(unsigned int clientID)
     {
-        resynchronize();
-        new Timer<MovableEntity>(rnd() * MAX_RESYNCHRONIZE_TIME, true, this, createExecutor(createFunctor(&MovableEntity::resynchronize)), false);
+        new Timer<MovableEntity>(rnd() * MAX_RESYNCHRONIZE_TIME, false, this, createExecutor(createFunctor(&MovableEntity::resynchronize)), true);
     }
 

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

@@ -65 +65 @@
             Vector3 overwrite_position_;
             Quaternion overwrite_orientation_;
+            Timer<MovableEntity>* continuousResynchroTimer_;
     };
 }