Blinker

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

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

    a blinkenarea.org project */

+#include <cmath>

 #include <stdlib.h>

 #include <string>

 #include <vector>

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

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

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

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

+  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_pConnLeft(NULL), m_pConnRight(NULL)

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

@@ -226,8 +228,10 @@ void Pong::redraw()

   lineVert(m_rightPosY, m_rightPosY + m_padSize - 1, m_width - 1,

            m_pConnRight ? m_padColor : m_computerColor);

-  // draw ball

+  // draw ball (blinking if goal delay is active)

+  if (m_goalDelay <= 0 || (m_goalDelay & 4) == 0) {

       pixel(m_ballPosY, m_ballPosX, m_ballColor);

+  }

   // send updated image buffer as frame

   sendFrame();

@@ -236,6 +240,9 @@ void Pong::redraw()

 /// callback when requested time reached

 void Pong::timeCall()

 {

+  // game is running

+  if (m_goalDelay <= 0 && m_ballPosX >= 0 && m_ballPosY >= 0) {

+

     // computer player: move pads

     if (! m_pConnLeft) {

       computerLeft();

@@ -251,6 +258,23 @@ void Pong::timeCall()

     m_ballPosX += m_ballDirX;

     m_ballPosY += m_ballDirY;

+    // detect goal

+    detectGoal();

+

+  }

+  // goal delay (blinking ball)

+  else if (m_goalDelay > 0) {

+

+    --m_goalDelay;

+

+    // new ball when delay is over

+    if (m_goalDelay <= 0) {

+        startBall();

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

+    }

+

+  }

+

   // draw and send frame

   redraw();

@@ -265,6 +289,11 @@ void Pong::timeCall()

  */

 void Pong::processKey(char key, int &padPosY)

 {

+  // do not move pad if goal delay is active

+  if (m_goalDelay > 0) {

+    return;

+  }

+

   // move pad (2 = up, 8 = down), do not move pad out of field

   if (key == '2' && padPosY > 0) {

     --padPosY;

@@ -359,6 +388,11 @@ void Pong::computerComputePadPos(int padBallX, int padY,

  */

 void Pong::computerMovePad(int padYmin, int padYmax, int &padPosY) const

 {

+  // do not move pad if goal delay is active

+  if (m_goalDelay > 0) {

+    return;

+  }

+

   // move pad, do not move pad out of field

   if (padPosY > padYmax && padPosY > 0) {

     --padPosY;

@@ -425,18 +459,21 @@ void Pong::bounceBallLeft()

   if (m_ballPosY == m_leftPosY - 1 && m_ballDirY > 0) {

     m_ballDirX = 1;

     m_ballDirY = -1;

+    ++m_bounceCnt;

   }

   // bottom corner

   else if (m_ballPosY == m_leftPosY + m_padSize && m_ballDirY < 0) {

     m_ballDirX = 1;

     m_ballDirY = 1;

+    ++m_bounceCnt;

   }

   // pad edge

   else if (m_ballPosY >= m_leftPosY &&

            m_ballPosY < m_leftPosY + m_padSize) {

     m_ballDirX = 1;

+    ++m_bounceCnt;

   }

 }

@@ -451,31 +488,59 @@ void Pong::bounceBallRight()

   if (m_ballPosY == m_rightPosY - 1 && m_ballDirY > 0) {

     m_ballDirX = -1;

     m_ballDirY = -1;

+    ++m_bounceCnt;

   }

   // bottom corner

   else if (m_ballPosY == m_rightPosY + m_padSize && m_ballDirY < 0) {

     m_ballDirX = -1;

     m_ballDirY = 1;

+    ++m_bounceCnt;

   }

   // pad edge

   else if (m_ballPosY >= m_rightPosY &&

            m_ballPosY < m_rightPosY + m_padSize) {

     m_ballDirX = -1;

+    ++m_bounceCnt;

+  }

+}

+

+/// detect goal

+void Pong::detectGoal()

+{

+  static int goalBlinkCnt = 3;

+  static int goalDelay = goalBlinkCnt * 8 + 3;

+

+  // ball at far left - goal for right player

+  if (m_ballPosX == 0) {

+    m_goalDelay = goalDelay;

+    ++m_scoreRight;

+  }

+

+  // ball at far right - goal for left player

+  else if (m_ballPosX == m_width - 1) {

+    m_goalDelay = goalDelay;

+    ++m_scoreLeft;

   }

 }

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

 void Pong::planTimeCall()

 {

+  // no time call needed if game is not running

   if (m_ballPosX < 0 ||  m_ballPosY < 0) {

     m_mgrs.m_callMgr.cancelTimeCall(this);

     return;

   }

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

+

+  // request next time call

   Time stepTime;

-  stepTime.fromMs(100);

+  stepTime.fromFloatSec(interval);

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

 }

@@ -487,6 +552,15 @@ void Pong::hideBall()

   m_ballDirX = 0;

   m_ballDirY = 0;

+  // no delays, ball has not bounced at pad

+  m_leftDelay = 0;

+  m_rightDelay = 0;

+  m_goalDelay = 0;

+  m_bounceCnt = 0;

+

+  // draw and send frame

+  redraw();

+

   // update time call request

   planTimeCall();

 }

@@ -501,6 +575,15 @@ void Pong::startBall()

   m_ballDirX = (rand() & 1) * 2 - 1;

   m_ballDirY = (rand() & 1) * 2 - 1;

+  // no delays, ball has not bounced at pad

+  m_leftDelay = 0;

+  m_rightDelay = 0;

+  m_goalDelay = 0;

+  m_bounceCnt = 0;

+

+  // draw and send frame

+  redraw();

+

   // request first time call if needed

   planTimeCall();

 }

@@ -152,6 +152,9 @@ protected:

   /// bounce ball at right pad

   void bounceBallRight();

+  /// detect goal

+  void detectGoal();

+

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

   void planTimeCall();

@@ -176,6 +179,8 @@ protected:

   ColorData m_lineColor;         ///< center line color

   ColorData m_padColor;          ///< phone player pad color

   ColorData m_computerColor;     ///< computer player pad color

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

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

   int       m_ballPosX;          ///< ball position X

   int       m_ballPosY;          ///< ball position Y

   int       m_ballDirX;          ///< ball direction X

@@ -185,8 +190,10 @@ protected:

   int       m_rightPosY;         ///< position of top pixel of right pad

   int       m_leftDelay;         ///< delay for computer moving left pad

   int       m_rightDelay;        ///< delay for computer moving right pad

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

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

+  int       m_goalDelay;         ///< delay after goal (blinking ball)

+  int       m_bounceCnt;         ///< how often the current ball bounced at pad

+  int       m_scoreLeft;         ///< score of left player

+  int       m_scoreRight;        ///< score of right player

 }; // class Canvas

 } // namespace Blinker