Blinker

@@ -65,7 +65,7 @@ void Game::updateConfig()

   }

   // color file was modified -> convert color, schedule redraw

-  if (colorUpdate(m_fileBackgroundColor, m_backgroundColor)) {

+  if (colorUpdate(m_fileBackgroundColor, 0, m_backgroundColor)) {

     doRedraw = true;

   }

@@ -319,26 +319,40 @@ void Game::number3x5(int anchorY, int anchorX, int alignY, int alignX,

   digits3x5(topY, leftX, digits, cd);

 }

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

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

+/**

+ * @brief process update of color file

+ * @param[in] colorFile file containing color as string

+ * @param[in] def default color (grayscale) in case file is invalid (0..255)

+ * @pram[out] data color data

+ * @return true on update

+ */

+bool Game::colorUpdate(ColorFile &colorFile, unsigned char def,

+                       ColorData &data) const

 {

   if (colorFile.checkModified()) {

     colorFile.update();

-    color2data(colorFile, data);

+    color2data(colorFile, def, data);

     return true;

   } else {

     return false;

   }

 }

-/// convert color to raw color data

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

+/**

+ * @brief convert color to raw color data

+ * @param[in] colorFile file containing color as string

+ * @param[in] def default color (grayscale) in case file is invalid (0..255)

+ * @pram[out] data color data

+ */

+void Game::color2data(ColorFile const &colorFile, unsigned char def,

+                      ColorData &data) const

 {

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

-    data.clear();

-  } else {

   unsigned int channels = m_fileFormat.m_obj.m_channels;

   unsigned int maxval = m_fileFormat.m_obj.m_maxval;

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

+    data.resize(m_fileFormat.m_obj.m_channels,

+                (unsigned char)(def * maxval / 255.0 + 0.5));

+  } else {

     data.resize(m_fileFormat.m_obj.m_channels);

     Color const &color = colorFile.m_obj;

     if (channels == 1) {

@@ -494,7 +508,7 @@ void Game::createImgBuf()

   m_imgBuf.resize(m_height * m_width * m_channels);

   // convert background color

-  color2data(m_fileBackgroundColor, m_backgroundColor);

+  color2data(m_fileBackgroundColor, 0, m_backgroundColor);

 }

 /// tear down image buffer

@@ -190,11 +190,24 @@ protected:

   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;

+  /**

+   * @brief process update of color file

+   * @param[in] colorFile file containing color as string

+   * @param[in] def default color (grayscale) in case file is invalid (0..255)

+   * @pram[out] data color data

+   * @return true on update

+   */

+  bool colorUpdate(ColorFile &colorFile, unsigned char def,

+                   ColorData &data) const;

-  /// convert color to raw color data

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

+  /**

+   * @brief convert color to raw color data

+   * @param[in] colorFile file containing color as string

+   * @param[in] def default color (grayscale) in case file is invalid (0..255)

+   * @pram[out] data color data

+   */

+  void color2data(ColorFile const &colorFile, unsigned char def,

+                  ColorData &data) const;

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

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

@@ -91,12 +91,12 @@ void Pong::updateConfigGame(bool &doReinit, bool &doRedraw)

   (void)doReinit;

   // color file was modified -> convert color, ask for redraw

-  if (colorUpdate(m_fileBallColor, m_ballColor)) { doRedraw = true; }

-  if (colorUpdate(m_fileLineColor, m_lineColor)) { doRedraw = true; }

-  if (colorUpdate(m_filePadColor, m_padColor)) { doRedraw = true; }

-  if (colorUpdate(m_fileComputerColor, m_computerColor)) { doRedraw = true; }

-  if (colorUpdate(m_fileScoreColor, m_scoreColor)) { doRedraw = true; }

-  if (colorUpdate(m_fileGoalColor, m_goalColor)) { doRedraw = true; }

+  if (colorUpdate(m_fileBallColor, 255, m_ballColor)) { doRedraw = true; }

+  if (colorUpdate(m_fileLineColor, 128, m_lineColor)) { doRedraw = true; }

+  if (colorUpdate(m_filePadColor, 255, m_padColor)) { doRedraw = true; }

+  if (colorUpdate(m_fileComputerColor, 192, m_computerColor)) { doRedraw = true; }

+  if (colorUpdate(m_fileScoreColor, 128, m_scoreColor)) { doRedraw = true; }

+  if (colorUpdate(m_fileGoalColor, 255, m_goalColor)) { doRedraw = true; }

   // cfg value file was updated -> read new cfg value, no reinit/redraw

   valueUpdate(m_fileDelay, c_delayDescr, m_delay);

@@ -266,12 +266,12 @@ void Pong::reinitialize()

   m_rightDelay = 0;

   // convert colors

-  color2data(m_fileBallColor, m_ballColor);

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

+  color2data(m_fileBallColor, 255, m_ballColor);

+  color2data(m_fileLineColor, 128, m_lineColor);

+  color2data(m_filePadColor, 255, m_padColor);

+  color2data(m_fileComputerColor, 192, m_computerColor);

+  color2data(m_fileScoreColor, 128, m_scoreColor);

+  color2data(m_fileGoalColor, 255, m_goalColor);

   // get values

   valueFromFile(m_fileDelay, c_delayDescr, m_delay);

   valueFromFile(m_fileMaxScore, c_maxScoreDescr, m_maxScore);

@@ -86,13 +86,13 @@ void Tetris::updateConfigGame(bool &doReinit, bool &doRedraw)

   (void)doReinit;

   // color file was modified -> convert color, ask for redraw

-  if (colorUpdate(m_fileStoneIColor, m_stoneColors[StoneI])) { doRedraw = true; }

-  if (colorUpdate(m_fileStoneLColor, m_stoneColors[StoneL])) { doRedraw = true; }

-  if (colorUpdate(m_fileStoneJColor, m_stoneColors[StoneJ])) { doRedraw = true; }

-  if (colorUpdate(m_fileStoneTColor, m_stoneColors[StoneT])) { doRedraw = true; }

-  if (colorUpdate(m_fileStoneOColor, m_stoneColors[StoneO])) { doRedraw = true; }

-  if (colorUpdate(m_fileStoneZColor, m_stoneColors[StoneZ])) { doRedraw = true; }

-  if (colorUpdate(m_fileStoneSColor, m_stoneColors[StoneS])) { doRedraw = true; }

+  if (colorUpdate(m_fileStoneIColor, 255, m_stoneColors[StoneI])) { doRedraw = true; }

+  if (colorUpdate(m_fileStoneLColor, 255, m_stoneColors[StoneL])) { doRedraw = true; }

+  if (colorUpdate(m_fileStoneJColor, 255, m_stoneColors[StoneJ])) { doRedraw = true; }

+  if (colorUpdate(m_fileStoneTColor, 255, m_stoneColors[StoneT])) { doRedraw = true; }

+  if (colorUpdate(m_fileStoneOColor, 255, m_stoneColors[StoneO])) { doRedraw = true; }

+  if (colorUpdate(m_fileStoneZColor, 255, m_stoneColors[StoneZ])) { doRedraw = true; }

+  if (colorUpdate(m_fileStoneSColor, 255, m_stoneColors[StoneS])) { doRedraw = true; }

   // delay cfg value file was updated -> read new delay cfg value, no re-*

   valueUpdate(m_fileDelay, c_delayDescr, m_delay);

@@ -265,13 +265,13 @@ void Tetris::opConnClose(OpConn *pConn)

 void Tetris::reinitialize()

 {

   // convert colors

-  color2data(m_fileStoneIColor, m_stoneColors[StoneI]);

-  color2data(m_fileStoneLColor, m_stoneColors[StoneL]);

-  color2data(m_fileStoneJColor, m_stoneColors[StoneJ]);

-  color2data(m_fileStoneTColor, m_stoneColors[StoneT]);

-  color2data(m_fileStoneOColor, m_stoneColors[StoneO]);

-  color2data(m_fileStoneZColor, m_stoneColors[StoneZ]);

-  color2data(m_fileStoneSColor, m_stoneColors[StoneS]);

+  color2data(m_fileStoneIColor, 255, m_stoneColors[StoneI]);

+  color2data(m_fileStoneLColor, 255, m_stoneColors[StoneL]);

+  color2data(m_fileStoneJColor, 255, m_stoneColors[StoneJ]);

+  color2data(m_fileStoneTColor, 255, m_stoneColors[StoneT]);

+  color2data(m_fileStoneOColor, 255, m_stoneColors[StoneO]);

+  color2data(m_fileStoneZColor, 255, m_stoneColors[StoneZ]);

+  color2data(m_fileStoneSColor, 255, m_stoneColors[StoneS]);

   // get values

   valueFromFile(m_fileDelay, c_delayDescr, m_delay);