Changeset 5831 for code/branches/core5/src/orxonox/worldentities

Timestamp:

Sep 28, 2009, 10:48:47 PM (15 years ago)

Author:

landauf

Message:

Realized Timer doesn't have to be a template, hence merged TimerBase, Timer and StaticTimer.
Removed the object pointer from Timer for memberfunctions, use createFunctor(f, object) instead.

Location:

code/branches/core5/src/orxonox/worldentities

Files:

• BigExplosion.cc (modified) (2 diffs)
• BigExplosion.h (modified) (1 diff)
• ExplosionChunk.cc (modified) (2 diffs)
• ExplosionChunk.h (modified) (1 diff)
• MovableEntity.cc (modified) (2 diffs)
• MovableEntity.h (modified) (1 diff)

code/branches/core5/src/orxonox/worldentities/BigExplosion.cc

@@ -90 +90 @@
             this->setVelocity(velocity);
 
-            this->destroyTimer_.setTimer(rnd(2, 4), false, this, createExecutor(createFunctor(&BigExplosion::stop)));
+            this->destroyTimer_.setTimer(rnd(2, 4), false, createExecutor(createFunctor(&BigExplosion::stop, this)));
         }
         this->registerVariables();
@@ -329 +329 @@
         {
             this->bStop_ = true;
-            this->destroyTimer_.setTimer(1.0f, false, this, createExecutor(createFunctor(&BigExplosion::destroy)));
+            this->destroyTimer_.setTimer(1.0f, false, createExecutor(createFunctor(&BigExplosion::destroy, this)));
         }
     }

code/branches/core5/src/orxonox/worldentities/BigExplosion.h

@@ -98 +98 @@
 
             LODParticle::Value    LOD_;
-            Timer<BigExplosion>   destroyTimer_;
+            Timer                 destroyTimer_;
     };
 }

code/branches/core5/src/orxonox/worldentities/ExplosionChunk.cc

@@ -79 +79 @@
             this->setVelocity(velocity);
 
-            this->destroyTimer_.setTimer(rnd(1, 2), false, this, createExecutor(createFunctor(&ExplosionChunk::stop)));
+            this->destroyTimer_.setTimer(rnd(1, 2), false, createExecutor(createFunctor(&ExplosionChunk::stop, this)));
         }
 
@@ -132 +132 @@
         {
             this->bStop_ = true;
-            this->destroyTimer_.setTimer(1.0f, false, this, createExecutor(createFunctor(&ExplosionChunk::destroy)));
+            this->destroyTimer_.setTimer(1.0f, false, createExecutor(createFunctor(&ExplosionChunk::destroy, this)));
         }
     }

code/branches/core5/src/orxonox/worldentities/ExplosionChunk.h

@@ -60 +60 @@
             ParticleInterface*    smoke_;
             LODParticle::Value    LOD_;
-            Timer<ExplosionChunk> destroyTimer_;
+            Timer                 destroyTimer_;
     };
 }

code/branches/core5/src/orxonox/worldentities/MovableEntity.cc

@@ -98 +98 @@
     void MovableEntity::clientConnected(unsigned int clientID)
     {
-        this->resynchronizeTimer_.setTimer(rnd() * MAX_RESYNCHRONIZE_TIME, false, this, createExecutor(createFunctor(&MovableEntity::resynchronize)));
+        this->resynchronizeTimer_.setTimer(rnd() * MAX_RESYNCHRONIZE_TIME, false, createExecutor(createFunctor(&MovableEntity::resynchronize, this)));
     }
 
@@ -110 +110 @@
         {
             // 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);
+            continuousResynchroTimer_ = new Timer(CONTINUOUS_SYNCHRONIZATION_TIME + rnd(-1, 1),
+                true, createExecutor(createFunctor(&MovableEntity::resynchronize, this)), false);
         }
 

code/branches/core5/src/orxonox/worldentities/MovableEntity.h

@@ -96 +96 @@
             Quaternion overwrite_orientation_;
 
-            Timer<MovableEntity> resynchronizeTimer_;
-            Timer<MovableEntity>* continuousResynchroTimer_;
+            Timer resynchronizeTimer_;
+            Timer* continuousResynchroTimer_;
 
             Pawn* owner_;