Blinker

@@ -31,7 +31,8 @@ Game::Game(const std::string &name, Mgrs &mgrs, const Directory &dirBase):

   m_fileFormat(dirBase.getFile("format")),

   m_fileBackgroundColor(dirBase.getFile("backgroundColor")),

   m_fileOutStream(dirBase.getFile("outstream"), mgrs.m_streamMgr),

-  m_height(0), m_width(0), m_channels(0), m_imgBuf(), m_backgroundColor()

+  m_height(0), m_width(0), m_channels(0), m_imgBuf(), m_backgroundColor(),

+  m_haveTimeStep(false), m_timeStepTime()

 {

 }

@@ -40,6 +41,9 @@ Game::~Game()

 {

   // clean up

   deactivate();

+

+  // cancel time callback request

+  m_mgrs.m_callMgr.cancelTimeCall(this);

 }

 /// check for update of configuration

@@ -80,6 +84,21 @@ void Game::updateConfig()

   }

 }

+/// callback when requested time reached

+void Game::timeCall()

+{

+  // TODO: internal stuff

+

+  // time step of game has been reached -> call game

+  if (m_haveTimeStep && Time::now() >= m_timeStepTime) {

+    m_haveTimeStep = false;

+    timeStep();

+  }

+

+  // plan next time call - if any

+  planTimeCall();

+}

+

 /// activate game: set up image buffer, call redraw()

 void Game::activate()

 {

@@ -356,6 +375,21 @@ void Game::sendFrame()

   }

 }

+/// set next game time step - plan timed action of game

+void Game::setTimeStep(const Time& timeStepTime)

+{

+  m_haveTimeStep = true;

+  m_timeStepTime = timeStepTime;

+  planTimeCall();

+}

+

+/// unset game time step - do timed action for game

+void Game::unsetTimeStep()

+{

+  m_haveTimeStep = false;

+  planTimeCall();

+}

+

 /// (re-)create image buffer

 void Game::createImgBuf()

 {

@@ -391,5 +425,18 @@ void Game::destroyImgBuf()

   m_backgroundColor.clear();

 }

+/// request next time call - or cancel request if not needed

+void Game::planTimeCall()

+{

+  // no time step requested by game

+  if (! m_haveTimeStep) {

+    m_mgrs.m_callMgr.cancelTimeCall(this);

+    return;

+  }

+

+  // request next time call

+  m_mgrs.m_callMgr.requestTimeCall(this, m_timeStepTime);

+}

+

 } // namespace Blinker

@@ -19,12 +19,14 @@

 #include "Mgrs.h"

 #include "Module.h"

 #include "OutStreamFile.h"

+#include "Time.h"

+#include "TimeCallee.h"

 #include "UIntFile.h"

 namespace Blinker {

 /// base class for games

-class Game: public Module

+class Game: public Module, public TimeCallee

 {

 protected:

   /// raw color data matching image buffer

@@ -63,6 +65,9 @@ public:

   /// check for update of configuration (derived game), return true on update

   virtual bool updateConfigGame() = 0;

+  /// callback when requested time reached

+  virtual void timeCall();

+

 protected:

   /// re-initialize game (e.g. due to config change)

   virtual void reinitialize() = 0;

@@ -70,6 +75,9 @@ protected:

   /// redraw current game image, expected to call sendFrame() at end

   virtual void redraw() = 0;

+  /// process next time step of game

+  virtual void timeStep() = 0;

+

   /// activate game: set up image buffer, call redraw()

   void activate();

@@ -170,6 +178,12 @@ protected:

   /// send current image buffer as frame to output stream

   void sendFrame();

+  /// set next game time step - plan timed action of game

+  void setTimeStep(const Time& timeStepTime);

+

+  /// unset game time step - do timed action for game

+  void unsetTimeStep();

+

 private:

   /// (re-)create image buffer

   void createImgBuf();

@@ -177,6 +191,9 @@ private:

   /// tear down image buffer

   void destroyImgBuf();

+  /// request next time call - or cancel request if not needed

+  void planTimeCall();

+

 protected:

   FormatFile    m_fileFormat;          ///< format file for output

   ColorFile     m_fileBackgroundColor; ///< color file for background color

@@ -186,6 +203,10 @@ protected:

   int           m_channels;            ///< number of channels of image buffer

   ColorData     m_imgBuf;              ///< image buffer (empty if none)

   ColorData     m_backgroundColor;     ///< background color

+

+private:

+  bool m_haveTimeStep; ///< if a time step is pending

+  Time m_timeStepTime; ///< time of next time step

 }; // class Canvas

 } // namespace Blinker

@@ -82,9 +82,6 @@ Pong::~Pong()

     m_pConnRight->close();

     m_pConnRight = NULL;

   }

-

-  // cancel time callback request

-  m_mgrs.m_callMgr.cancelTimeCall(this);

 }

 /// check for update of configuration (derived game), return true on update

@@ -283,8 +280,8 @@ void Pong::redraw()

   sendFrame();

 }

-/// callback when requested time reached

-void Pong::timeCall()

+/// process next time step of game

+void Pong::timeStep()

 {

   // game is running

   if (m_goalDelay <= 0) {

@@ -324,7 +321,7 @@ void Pong::timeCall()

         // game continues with new ball

         else {

           startBall();

-          return; // startBall() calls redraw() and planTimeCall()

+          return; // startBall() calls redraw() and planTimeStep()

         }

     }

@@ -333,8 +330,8 @@ void Pong::timeCall()

   // draw and send frame

   redraw();

-  // request next call if needed

-  planTimeCall();

+  // request next time step

+  planTimeStep();

 }

 /**

@@ -580,12 +577,12 @@ void Pong::detectGoal()

   }

 }

-/// request next time call - or cancel request if not needed

-void Pong::planTimeCall()

+/// set time for next time step of game - or unset if not needed

+void Pong::planTimeStep()

 {

   // no time call needed if not active

   if (! isActive()) {

-    m_mgrs.m_callMgr.cancelTimeCall(this);

+    unsetTimeStep();

     return;

   }

@@ -597,7 +594,7 @@ void Pong::planTimeCall()

   // request next time call

   Time stepTime;

   stepTime.fromFloatSec(interval);

-  m_mgrs.m_callMgr.requestTimeCall(this, Time::now() + stepTime);

+  setTimeStep(Time::now() + stepTime);

 }

 /// start ball

@@ -628,11 +625,10 @@ void Pong::startBall()

   // draw and send frame

   redraw();

-  // request first time call if needed

-  planTimeCall();

+  // request first time step if needed

+  planTimeStep();

 }

-

 /// game over: close player connections and deactivate

 void Pong::gameOver()

 {

@@ -30,7 +30,7 @@

 namespace Blinker {

 /// pong game

-class Pong: public Game, public OpReqIf, public TimeCallee

+class Pong: public Game, public OpReqIf

 {

 public:

   /**

@@ -100,8 +100,8 @@ protected:

   /// redraw current game image, expected to call sendFrame() at end

   virtual void redraw();

-  /// callback when requested time reached

-  virtual void timeCall();

+  /// process next time step of game

+  virtual void timeStep();

   /**

    * @brief process key received from phone player

@@ -156,8 +156,8 @@ protected:

   /// detect goal

   void detectGoal();

-  /// request next time call - or cancel request if not needed

-  void planTimeCall();

+  /// set time for next time step of game - or unset if not needed

+  void planTimeStep();

   /// start ball

   void startBall();