Blinker

@@ -0,0 +1 @@

+200

@@ -16,6 +16,7 @@

 #include "Mgrs.h"

 #include "Module.h"

 #include "OutStreamFile.h"

+#include "UIntFile.h"

 namespace Blinker {

@@ -277,7 +278,7 @@ bool Game::colorUpdate(ColorFile &colorFile, ColorData &data) const

 /// convert color to raw color data

 void Game::color2data(ColorFile const &colorFile, ColorData &data) const

 {

-  if (! m_fileFormat.m_valid) {

+  if (! m_fileFormat.m_valid || ! colorFile.m_valid) {

     data.clear();

   } else {

     unsigned int channels = m_fileFormat.m_obj.m_channels;

@@ -306,6 +307,36 @@ void Game::color2data(ColorFile const &colorFile, ColorData &data) const

   }

 }

+/// process update of value file, return true on update

+bool Game::valueUpdate(UIntFile &valueFile, ValueDescr const &descr,

+                       unsigned int &value)

+{

+  if (valueFile.checkModified()) {

+    valueFile.update();

+    valueFromFile(valueFile, descr, value);

+    return true;

+  } else {

+    return false;

+  }

+}

+

+/// get value from value file

+void Game::valueFromFile(UIntFile &valueFile, ValueDescr const &descr,

+                         unsigned int &value)

+{

+  if (! valueFile.m_valid) {

+    value = descr.default_;

+  } else {

+    value = valueFile.m_obj.m_uint;

+    if (value < descr.minimum) {

+      value = descr.minimum;

+    }

+    else if (value > descr.maximum) {

+      value = descr.maximum;

+    }

+  }

+}

+

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

 void Game::sendFrame()

 {

@@ -19,6 +19,7 @@

 #include "Mgrs.h"

 #include "Module.h"

 #include "OutStreamFile.h"

+#include "UIntFile.h"

 namespace Blinker {

@@ -29,6 +30,13 @@ protected:

   /// raw color data matching image buffer

   typedef std::vector<unsigned char> ColorData;

+  /// descriptor of value (e.g. a setting for the game)

+  struct ValueDescr {

+    unsigned int default_;

+    unsigned int minimum;

+    unsigned int maximum;

+  };

+

 public:

   /**

    * @brief constructor

@@ -151,6 +159,14 @@ protected:

   /// convert color to raw color data

   void color2data(ColorFile const &colorFile, ColorData &data) const;

+  /// process update of value file, return true on update

+  static bool valueUpdate(UIntFile &valueFile, ValueDescr const &descr,

+                          unsigned int &value);

+

+  /// get value from value file

+  static void valueFromFile(UIntFile &valueFile, ValueDescr const &descr,

+                            unsigned int &value);

+

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

   void sendFrame();

@@ -23,13 +23,17 @@

 #include "Pong.h"

 #include "Time.h"

 #include "TimeCallee.h"

+#include "UIntFile.h"

 namespace Blinker {

+/// descriptor for delay value

+Pong::ValueDescr const Pong::c_delayDescr = { 200, 100, 500 };

+

 /// operator connection name suffix for left player's connection

-std::string const Pong::OpConnSuffixLeft = "/left";

+std::string const Pong::c_opConnSuffixLeft = "/left";

 /// operator connection name suffix for right player's connection

-std::string const Pong::OpConnSuffixRight = "/right";

+std::string const Pong::c_opConnSuffixRight = "/right";

 /**

  * @brief constructor

@@ -45,24 +49,26 @@ Pong::Pong(const std::string &name, Mgrs &mgrs, const Directory &dirBase):

   m_fileComputerColor(dirBase.getFile("computerColor")),

   m_fileScoreColor(dirBase.getFile("scoreColor")),

   m_fileGoalColor(dirBase.getFile("goalColor")),

+  m_fileDelay(dirBase.getFile("delay")),

   m_ballColor(), m_lineColor(), m_padColor(), m_computerColor(),

   m_scoreColor(), m_goalColor(),

+  m_delay(c_delayDescr.default_),

   m_pConnLeft(NULL), m_pConnRight(NULL),

   m_ballPosX(-1), m_ballPosY(-1), m_ballDirX(0), m_ballDirY(0),

   m_padSize(0), m_leftPosY(0), m_rightPosY(0), m_leftDelay(0), m_rightDelay(0),

   m_goalDelay(0), m_bounceCnt(0), m_scoreLeft(0), m_scoreRight(0)

 {

   // open operator connection interfaces for left and right player

-  m_mgrs.m_opMgr.open(m_name + OpConnSuffixLeft, this);

-  m_mgrs.m_opMgr.open(m_name + OpConnSuffixRight, this);

+  m_mgrs.m_opMgr.open(m_name + c_opConnSuffixLeft, this);

+  m_mgrs.m_opMgr.open(m_name + c_opConnSuffixRight, this);

 }

 /// virtual destructor

 Pong::~Pong()

 {

   // close operator connection interfaces

-  m_mgrs.m_opMgr.close(m_name + OpConnSuffixLeft);

-  m_mgrs.m_opMgr.close(m_name + OpConnSuffixRight);

+  m_mgrs.m_opMgr.close(m_name + c_opConnSuffixLeft);

+  m_mgrs.m_opMgr.close(m_name + c_opConnSuffixRight);

   // close open operator connections

   if (m_pConnLeft) {

@@ -89,7 +95,8 @@ bool Pong::updateConfigGame()

       colorUpdate(m_filePadColor, m_padColor) ||

       colorUpdate(m_fileComputerColor, m_computerColor) ||

       colorUpdate(m_fileScoreColor, m_scoreColor) ||

-      colorUpdate(m_fileGoalColor, m_goalColor)) {

+      colorUpdate(m_fileGoalColor, m_goalColor) ||

+      valueUpdate(m_fileDelay, c_delayDescr, m_delay)) {

     ret = true;

   }

@@ -104,11 +111,11 @@ bool Pong::updateConfigGame()

 bool Pong::acceptNewOpConn(const std::string &name)

 {

   // left player can join if none there yet

-  if (name == m_name + OpConnSuffixLeft && ! m_pConnLeft) {

+  if (name == m_name + c_opConnSuffixLeft && ! m_pConnLeft) {

     return true;

   }

   // right player can join if none there yet

-  if (name == m_name + OpConnSuffixRight && ! m_pConnRight) {

+  if (name == m_name + c_opConnSuffixRight && ! m_pConnRight) {

     return true;

   }

   // default: reject connection

@@ -125,11 +132,11 @@ bool Pong::acceptNewOpConn(const std::string &name)

 void Pong::newOpConn(const std::string &name, OpConn *pConn)

 {

   // left player joins if none there yet

-  if (name == m_name + OpConnSuffixLeft && ! m_pConnLeft) {

+  if (name == m_name + c_opConnSuffixLeft && ! m_pConnLeft) {

     m_pConnLeft = pConn;

   }

   // right player joins if none there yet

-  else if (name == m_name + OpConnSuffixRight && ! m_pConnRight) {

+  else if (name == m_name + c_opConnSuffixRight && ! m_pConnRight) {

     m_pConnRight = pConn;

   }

   // nothing happens

@@ -223,6 +230,8 @@ void Pong::reinitialize()

   color2data(m_fileComputerColor, m_computerColor);

   color2data(m_fileScoreColor, m_scoreColor);

   color2data(m_fileGoalColor, m_goalColor);

+  // get values

+  valueFromFile(m_fileDelay, c_delayDescr, m_delay);

   // reset scores

   m_scoreLeft = 0;

@@ -566,8 +575,9 @@ void Pong::planTimeCall()

   }

   // compute interval based on score and bounce count

-  float speedup = 10 * (m_scoreLeft + m_scoreRight) + m_bounceCnt;

-  float interval = 0.05f + 0.1f * expf(-0.03f * speedup);

+  int speedup = 10 * (m_scoreLeft + m_scoreRight) + m_bounceCnt;

+  float scale = 0.3f + 0.7f * expf(-0.03f * speedup);

+  float interval = 1e-3f * m_delay * scale;

   // request next time call

   Time stepTime;

@@ -25,6 +25,7 @@

 #include "OutStreamFile.h"

 #include "Time.h"

 #include "TimeCallee.h"

+#include "UIntFile.h"

 namespace Blinker {

@@ -163,10 +164,13 @@ protected:

 protected:

+  /// descriptor for delay value

+  static ValueDescr const c_delayDescr;

+

   /// operator connection name suffix for left player's connection

-  static std::string const OpConnSuffixLeft;

+  static std::string const c_opConnSuffixLeft;

   /// operator connection name suffix for right player's connection

-  static std::string const OpConnSuffixRight;

+  static std::string const c_opConnSuffixRight;

   ColorFile m_fileBallColor;     ///< color file for ball color

   ColorFile m_fileLineColor;     ///< color file for center line

@@ -174,14 +178,19 @@ protected:

   ColorFile m_fileComputerColor; ///< color file for computer player pad

   ColorFile m_fileScoreColor;    ///< color file for score when ball is moving

   ColorFile m_fileGoalColor;     ///< color file for score during goal

+  UIntFile  m_fileDelay;         ///< file for initial delay in ms per frame

+

   ColorData    m_ballColor;     ///< ball color

   ColorData    m_lineColor;     ///< center line color

   ColorData    m_padColor;      ///< phone player pad color

   ColorData    m_computerColor; ///< computer player pad color

   ColorData    m_scoreColor;    ///< score color when ball is moving

   ColorData    m_goalColor;     ///< score color during goal

+  unsigned int m_delay;         ///< initial delay in ms per frame (ball speed)

+

   OpConn *m_pConnLeft;  ///< operator connection left player (or NULL)

-  OpConn   *m_pConnRight;        ///< operator connection right player (o NULL)

+  OpConn *m_pConnRight; ///< operator connection right player (or NULL)

+

   int m_ballPosX;   ///< ball position X

   int m_ballPosY;   ///< ball position Y

   int m_ballDirX;   ///< ball direction X