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

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/controllers

Files:

• AIController.cc (modified) (1 diff)
• AIController.h (modified) (1 diff)
• WaypointPatrolController.cc (modified) (1 diff)
• WaypointPatrolController.h (modified) (1 diff)

code/branches/core5/src/orxonox/controllers/AIController.cc

@@ -44 +44 @@
         RegisterObject(AIController);
 
-        this->actionTimer_.setTimer(ACTION_INTERVAL, true, this, createExecutor(createFunctor(&AIController::action)));
+        this->actionTimer_.setTimer(ACTION_INTERVAL, true, createExecutor(createFunctor(&AIController::action, this)));
     }
 

code/branches/core5/src/orxonox/controllers/AIController.h

@@ -50 +50 @@
 
         private:
-            Timer<AIController> actionTimer_;
+            Timer actionTimer_;
     };
 }

code/branches/core5/src/orxonox/controllers/WaypointPatrolController.cc

@@ -45 +45 @@
         this->alertnessradius_ = 500;
 
-        this->patrolTimer_.setTimer(rnd(), true, this, createExecutor(createFunctor(&WaypointPatrolController::searchEnemy)));
+        this->patrolTimer_.setTimer(rnd(), true, createExecutor(createFunctor(&WaypointPatrolController::searchEnemy, this)));
     }
 

code/branches/core5/src/orxonox/controllers/WaypointPatrolController.h

@@ -61 +61 @@
             int team_;
             float alertnessradius_;
-            Timer<WaypointPatrolController> patrolTimer_;
+            Timer patrolTimer_;
     };
 }