Changeset 5831 for code/branches/core5/src/modules/pong

Timestamp:

Sep 28, 2009, 10:48:47 PM (16 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/modules/pong

Files:

• Pong.cc (modified) (1 diff)
• Pong.h (modified) (1 diff)
• PongAI.cc (modified) (3 diffs)
• PongAI.h (modified) (1 diff)

code/branches/core5/src/modules/pong/Pong.cc

@@ -52 +52 @@
         this->setHUDTemplate("PongHUD");
 
-        this->starttimer_.setTimer(1.0, false, this, createExecutor(createFunctor(&Pong::startBall)));
+        this->starttimer_.setTimer(1.0, false, createExecutor(createFunctor(&Pong::startBall, this)));
         this->starttimer_.stopTimer();
 

code/branches/core5/src/modules/pong/Pong.h

@@ -62 +62 @@
             PongBall* ball_;
             PongBat* bat_[2];
-            Timer<Pong> starttimer_;
+            Timer starttimer_;
     };
 }

code/branches/core5/src/modules/pong/PongAI.cc

@@ -60 +60 @@
     PongAI::~PongAI()
     {
-        for (std::list<std::pair<Timer<PongAI>*, char> >::iterator it = this->reactionTimers_.begin(); it != this->reactionTimers_.end(); ++it)
+        for (std::list<std::pair<Timer*, char> >::iterator it = this->reactionTimers_.begin(); it != this->reactionTimers_.end(); ++it)
             (*it).first->destroy();
     }
@@ -231 +231 @@
 
             // Add a new Timer
-            Timer<PongAI>* timer = new Timer<PongAI>(delay, false, this, createExecutor(createFunctor(&PongAI::delayedMove)));
-            this->reactionTimers_.push_back(std::pair<Timer<PongAI>*, char>(timer, direction));
+            Timer* timer = new Timer(delay, false, createExecutor(createFunctor(&PongAI::delayedMove, this)));
+            this->reactionTimers_.push_back(std::pair<Timer*, char>(timer, direction));
         }
         else
@@ -246 +246 @@
 
         // Destroy the timer and remove it from the list
-        Timer<PongAI>* timer = this->reactionTimers_.front().first;
+        Timer* timer = this->reactionTimers_.front().first;
         timer->destroy();
 

code/branches/core5/src/modules/pong/PongAI.h

@@ -65 +65 @@
             float strength_;
 
-            std::list<std::pair<Timer<PongAI>*, char> > reactionTimers_;
+            std::list<std::pair<Timer*, char> > reactionTimers_;
             char movement_;
             char oldMove_;