Blinker

@@ -0,0 +1 @@

+FFFFFF

@@ -0,0 +1 @@

+303030

@@ -3,6 +3,7 @@

    Copyleft GNU public license - http://www.gnu.org/copyleft/gpl.html

    a blinkenarea.org project */

+#include <sstream>

 #include <string>

 #include <vector>

@@ -172,6 +173,95 @@ void Game::rectFill(int y1, int y2, int x1, int x2, ColorData const &cd)

   }

 }

+/**

+ * @brief draw a small digit (3x5 pixels) to image buffer

+ * @param[in] topY y coordinate of top of digit

+ * @param[in] leftX x coordinate of left of digit

+ * @param[in] digit to draw ('0'..'9')

+ * @param[in] cd color to use for drawing

+ */

+void Game::digit3x5(int topY, int leftX, char digit, ColorData const &cd)

+{

+  /**

+   * digit data in octal,

+   * each row is 3 bits, msb of row is left,

+   * msb row is top

+   */

+  static const unsigned int digitData[10] = {

+    075557, 022222, 071747, 071717, 055711,

+    074717, 074757, 071111, 075757, 075717

+  };

+

+  if (digit < '0' || digit > '9') {

+    return;

+  }

+  int idx = digit - '0';

+  unsigned int data = digitData[idx];

+  for (int y = topY; y < topY + 5; ++y) {

+    for (int x = leftX; x < leftX + 3; ++x) {

+      data <<= 1;

+      if (data & 0100000) {

+        pixel(y, x, cd);

+      }

+    }

+  }

+}

+

+/**

+ * @brief draw small digits (3x5 each, 1 pixel gap) to image buffer

+ * @param[in] topY y coordinate of top of digits

+ * @param[in] leftX x coordinate of left of digits

+ * @param[in] digits to draw (string of '0'..'9')

+ * @param[in] cd color to use for drawing

+ */

+void Game::digits3x5(int topY, int leftX, std::string const &digits,

+                     ColorData const &cd)

+{

+  for (char digit: digits) {

+    digit3x5(topY, leftX, digit, cd);

+    leftX += 4;

+  }

+}

+

+/**

+ * @brief draw number using 3x5 digits to image buffer

+ * @param[in] anchorY y coordinate of anchor point

+ * @param[in] anchorX x coordinate of anchor point

+ * @param[in] alignY y alignment, -1 for top, 0 for center, 1 for bottom

+ * @param[in] alignX x alignment, -1 for left, 0 for center, 1 for right

+ * @param[in] number non-negative number to draw

+ * @param[in] cd color to use for drawing

+ */

+void Game::number3x5(int anchorY, int anchorX, int alignY, int alignX,

+                     int number, ColorData const &cd)

+{

+  // convert number to digits string

+  if (number < 0) {

+    return;

+  }

+  std::stringstream digitsStrm;

+  digitsStrm << number;

+  std::string const &digits = digitsStrm.str();

+

+  // compute top left position

+  int topY, leftX;

+  switch (alignY) {

+  case -1: topY = anchorY; break;

+  case 0: topY = anchorY - 2; break;

+  case 1: topY = anchorY - 4; break;

+  default: return;

+  }

+  switch (alignX) {

+  case -1: leftX = anchorX; break;

+  case 0: leftX = anchorX - 2 * digits.length() + 1; break;

+  case 1: leftX = anchorX - 4 * digits.length() + 2; break;

+  default: return;

+  }

+

+  // draw digits

+  digits3x5(topY, leftX, digits, cd);

+}

+

 /// process update of color file, return true on update

 bool Game::colorUpdate(ColorFile &colorFile, ColorData &data) const

 {

@@ -114,6 +114,37 @@ protected:

   /// draw filled rectangle to image buffer

   void rectFill(int y1, int y2, int x1, int x2, ColorData const &cd);

+  /**

+   * @brief draw a small digit (3x5 pixels) to image buffer

+   * @param[in] topY y coordinate of top of digit

+   * @param[in] leftX x coordinate of left of digit

+   * @param[in] digit to draw ('0'..'9')

+   * @param[in] cd color to use for drawing

+   */

+  void digit3x5(int topY, int leftX, char digit, ColorData const &cd);

+

+  /**

+   * @brief draw small digits (3x5 each, 1 pixel gap) to image buffer

+   * @param[in] topY y coordinate of top of digits

+   * @param[in] leftX x coordinate of left of digits

+   * @param[in] digits to draw (string of '0'..'9')

+   * @param[in] cd color to use for drawing

+   */

+  void digits3x5(int topY, int leftX, std::string const &digits,

+                 ColorData const &cd);

+

+  /**

+   * @brief draw number using 3x5 digits to image buffer

+   * @param[in] anchorY y coordinate of anchor point

+   * @param[in] anchorX x coordinate of anchor point

+   * @param[in] alignY y alignment, -1 for top, 0 for center, 1 for bottom

+   * @param[in] alignX x alignment, -1 for left, 0 for center, 1 for right

+   * @param[in] number non-negative number to draw

+   * @param[in] cd color to use for drawing

+   */

+  void number3x5(int anchorY, int anchorX, int alignY, int alignX,

+                 int number, ColorData const &cd);

+

   /// process update of color file, return true on update

   bool colorUpdate(ColorFile &colorFile, ColorData &data) const;

@@ -43,7 +43,10 @@ Pong::Pong(const std::string &name, Mgrs &mgrs, const Directory &dirBase):

   m_fileLineColor(dirBase.getFile("lineColor")),

   m_filePadColor(dirBase.getFile("padColor")),

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

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

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

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

+  m_scoreColor(), m_goalColor(),

   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),

@@ -84,7 +87,9 @@ bool Pong::updateConfigGame()

   if (colorUpdate(m_fileBallColor, m_ballColor) ||

       colorUpdate(m_fileLineColor, m_lineColor) ||

       colorUpdate(m_filePadColor, m_padColor) ||

-      colorUpdate(m_fileComputerColor, m_computerColor)) {

+      colorUpdate(m_fileComputerColor, m_computerColor) ||

+      colorUpdate(m_fileScoreColor, m_scoreColor) ||

+      colorUpdate(m_fileGoalColor, m_goalColor)) {

     ret = true;

   }

@@ -216,6 +221,8 @@ void Pong::reinitialize()

   color2data(m_fileLineColor, m_lineColor);

   color2data(m_filePadColor, m_padColor);

   color2data(m_fileComputerColor, m_computerColor);

+  color2data(m_fileScoreColor, m_scoreColor);

+  color2data(m_fileGoalColor, m_goalColor);

   // reset scores

   m_scoreLeft = 0;

@@ -239,6 +246,13 @@ void Pong::redraw()

     pixel(y, x, m_lineColor);

   }

+  // draw score

+  ColorData const &scoreColor = m_goalDelay <= 0 ? m_scoreColor : m_goalColor;

+  y = (m_height - 1) / 2;

+  x = m_width / 4;

+  number3x5(y, x, 0, 0, m_scoreLeft, scoreColor);

+  number3x5(y, m_width - 1 - x, 0, 0, m_scoreRight, scoreColor);

+

   // draw pads

   lineVert(m_leftPosY, m_leftPosY + m_padSize - 1, 0,

            m_pConnLeft ? m_padColor : m_computerColor);

@@ -172,10 +172,14 @@ protected:

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

   ColorFile m_filePadColor;      ///< color file for phone player pad

   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

   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

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

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

   int       m_ballPosX;          ///< ball position X