implementing game logic events (#12) and basic scoring

Also, switch a bunch of ofPtrs to raw pointers. They don’t need to have
shared ownership since GameState is the owner of all game objects.

src/Ball.cpp

@@ -21,9 +21,9 @@ Ball::~Ball() {
 void Ball::output(std::ostream &os) const {
   auto pos = body->GetPosition();
   os << "Ball{id:" << id() << ", pos:(" << pos.x << "," << pos.y << ")";
-  os << ", curPlayer:";
-  if (_lastPlayer)
-    os << _lastPlayer->id();
+  os << ", player:";
+  if (_player)
+    os << _player->id();
   else
     os << "(none)";
   os << "}";

src/Ball.h

@@ -20,13 +20,12 @@ class Ball : public GameObject, public ofxBox2dCircle {
   Ball();
   ~Ball() override;
 
-  ofPtr<Player> lastPlayer() { return _lastPlayer; }
-  void setLastPlayer(ofPtr<Player> player) {
-    _lastPlayer = player;
-  }
+  Player* player() { return _player; }
+  void setPlayer(Player* player) { _player = player; }
+
   void output(std::ostream& os) const override;
 private:
-  ofPtr<Player> _lastPlayer;
+  Player* _player;
 };
 
 #endif /* defined(__bleepout__Ball__) */

src/Brick.h

@@ -15,10 +15,14 @@
 
 class Brick : public GameObject, public ofxBox2dRect {
 public:
-  Brick() : GameObject(GAME_OBJECT_BRICK) {}
+  Brick() : GameObject(GAME_OBJECT_BRICK), _value(1) {}
 
   void output(std::ostream& os) const override;
+
+  int value() const { return _value; }
+  void setValue(int value) { _value = value; }
 private:
+  int _value;
 };
 
 #endif /* defined(__bleepout__Brick__) */

src/LogicController.cpp

@@ -20,28 +20,35 @@ void LogicController::update() {
 }
 
 void LogicController::onBallHitPaddle(BallHitPaddleEventArgs &e) {
-  Player* previousPlayer = e.ball()->lastPlayer().get();
-  ofPtr<Player> player = e.object()->player();
-  e.ball()->setLastPlayer(player);
-  notifyBallOwnerChanged(e.ball(), player.get(), previousPlayer);
+  Player* previousPlayer = e.ball()->player();
+  Player* player = e.object()->player();
+  e.ball()->setPlayer(player);
+  notifyBallOwnerChanged(e.ball(), player, previousPlayer);
 }
 
 void LogicController::onBallHitBrick(BallHitBrickEventArgs &e) {
+  Ball* ball = e.ball();
+  Brick* brick = e.object();
+  Player* player = ball->player();
+
+  brick->kill();
+  notifyBrickDestroyed(brick, ball);
+
+  if (player) {
+    player->addScore(brick->value());
+    notifyPlayerScoreChanged(player);
+  }
   //...
 }
 
 void LogicController::onBallHitWall(BallHitWallEventArgs &e) {
-  Ball* ball = e.ball();
   Wall* wall = e.object();
   if (wall->isExit()) {
+    Ball* ball = e.ball();
+    Player* player = ball->player();
   }
 }
 
 void LogicController::onBallHitBall(BallHitBallEventArgs &e) {
   //...
 }
-
-void LogicController::playerBallOut(Player &player, Ball &ball) {
-  // ball destroyed!!!
-  //???
-}

src/LogicController.h

@@ -25,10 +25,6 @@ class LogicController : public RoundStateEventSource {
   void onBallHitWall(BallHitWallEventArgs& e);
   void onBallHitBall(BallHitBallEventArgs& e);
 
-private:
-  void playerBallOut(Player& player, Ball& ball);
-  void playerTakeBallOwnership(Player& player, Ball& ball);
-
 private:
   RoundState& _state;
   RoundConfig& _config;

src/Paddle.cpp

@@ -8,7 +8,7 @@
 
 #include "Paddle.h"
 
-Paddle::Paddle(ofPtr<Player> player)
+Paddle::Paddle(Player* player)
 : GameObject(GAME_OBJECT_PADDLE), _player(player) {
   ofLogVerbose() << "Create Paddle";
 }
@@ -19,6 +19,7 @@ Paddle::~Paddle() {
 }
 
 void Paddle::output(std::ostream &os) const {
+  // this shouldn't be necessary. getPosition should really be marked as const
   auto pos = const_cast<Paddle*>(this)->getPosition();
   os << "Paddle{id:" << id() << ", pos:(" << pos.x << "," << pos.y << ")";
   if (_player)

src/Paddle.h

@@ -16,14 +16,14 @@
 
 class Paddle : public GameObject, public ofxBox2dRect {
 public:
-  Paddle(ofPtr<Player> player);
+  Paddle(Player* player);
   ~Paddle() override;
 
-  ofPtr<Player> player() { return _player; }
+  Player* player() { return _player; }
 
   void output(std::ostream& os) const override;
 private:
-  ofPtr<Player> _player;
+  Player* _player;
 };
 
 

src/Player.cpp

@@ -10,11 +10,6 @@
 #include <ofMain.h>
 
 Player::Player() : GameObject(GAME_OBJECT_PLAYER) {
-  ofLogVerbose() << "Create Player";
-}
-
-Player::~Player() {
-  ofLogVerbose() << "Destroy Player";
 }
 
 void Player::output(std::ostream &os) const {

src/Player.h

@@ -18,13 +18,22 @@ class Paddle;
 class Player : public GameObject {
 public:
   Player();
-  ~Player() override;
-  void setPaddle(ofPtr<Paddle> paddle) { _paddle = paddle; }
-  ofPtr<Paddle> paddle() { return _paddle; }
+
+  void setPaddle(Paddle* paddle) { _paddle = paddle; }
+  Paddle* paddle() { return _paddle; }
+
+  int score() const { return _score; }
+
+  int addScore(int add) {
+    _score += add;
+    return _score;
+  }
+
 private:
   void output(std::ostream& os) const override;
 
-  ofPtr<Paddle> _paddle;
+  Paddle* _paddle;
+  int _score;
 };
 
 #endif /* defined(__bleepout__Player__) */

src/RoundManager.cpp

@@ -59,7 +59,7 @@ void RoundController::setPaddlePosition(GameObjectId playerId, float xPercent) {
     return;
   }
 
-  ofPtr<Paddle> paddle = player->paddle();
+  Paddle* paddle = player->paddle();
   if (!paddle) {
     ofLogError() << "Unable to set paddle position for player: " << playerId;
     return;

src/SpaceController.cpp

@@ -50,7 +50,7 @@ void SpaceController::setup() {
   for (int i = 0; i < numPlayers; i++) {
     ofPtr<Player> player = _state.players()[i];
     ofVec2f paddleCenter = getPaddleStartPosition(i, numPlayers, _config);
-    addPaddle(paddleCenter, player);
+    addPaddle(paddleCenter, player.get());
     ofVec2f ballCenter = getBallStartPosition(i, numPlayers, _config);
     addBall(ballCenter);
   }
@@ -82,10 +82,10 @@ void SpaceController::addBall(ofVec2f center) {
   _state.balls().push_back(ball);
 }
 
-void SpaceController::addPaddle(ofVec2f center, ofPtr<Player> player) {
+void SpaceController::addPaddle(ofVec2f center, Player* player) {
   ofPtr<Paddle> paddle(new Paddle(player));
   ofRectangle rect;
-  player->setPaddle(paddle);
+  player->setPaddle(paddle.get());
   rect.setFromCenter(center, _config.paddleSize().x, _config.paddleSize().y);
   setObjPhysics(paddle.get(), _config.paddlePhysics());
   paddle->setup(_box2d.getWorld(), rect);

src/SpaceController.h

@@ -26,7 +26,7 @@ class SpaceController : public CollisionEventSource {
 
   void addBrick(ofVec2f center);
   void addBall(ofVec2f center);
-  void addPaddle(ofVec2f center, ofPtr<Player> player);
+  void addPaddle(ofVec2f center, Player* player);
 
   void contactStart(ofxBox2dContactArgs& e);
   void contactEnd(ofxBox2dContactArgs& e);