added countdown timer tick event

src/config/BleepoutConfig.cpp

@@ -80,7 +80,8 @@ _modifierFadeTime(0.2f),
 _domeRadius(150.0f),
 _domeMargin(20.0f),
 _name(name),
-_startDelay(0) { }
+_startDelay(0),
+countdownTimerPeriod(10) { }
 
 void RoundConfig::loadJsonFile(std::string path) {
   Json::Value obj;

src/config/BleepoutConfig.h

@@ -147,6 +147,8 @@ class RoundConfig {
   const GameRules& rules() const { return _rules; }
   GameRules& rules() { return _rules; }
 
+  float countdownTimerPeriod;
+
   Json::Value toJsonVal() const;
 private:
   std::string _name;

src/core/AudioManager.cpp

@@ -79,6 +79,8 @@ void AudioManager::attachTo(RoundController &roundController) {
                 this, &AudioManager::onPlayerLivesChanged);
   ofAddListener(roundController.logicController().playerLostEvent,
                 this, &AudioManager::onPlayerLost);
+  ofAddListener(roundController.logicController().countdownTickEvent,
+                this, &AudioManager::onCountdownTick);
 }
 
 void AudioManager::detachFrom(RoundController &roundController) {
@@ -96,6 +98,8 @@ void AudioManager::detachFrom(RoundController &roundController) {
                    this, &AudioManager::onPlayerLivesChanged);
   ofRemoveListener(roundController.logicController().playerLostEvent,
                    this, &AudioManager::onPlayerLost);
+  ofRemoveListener(roundController.logicController().countdownTickEvent,
+                   this, &AudioManager::onCountdownTick);
 }
 
 void AudioManager::onRoundStarted(RoundStateEventArgs &e) {
@@ -133,3 +137,7 @@ void AudioManager::onPlayerLivesChanged(PlayerStateEventArgs &e) {
 void AudioManager::onPlayerLost(PlayerStateEventArgs &e) {
   _playerLostSound.play();
 }
+
+void AudioManager::onCountdownTick(TimerEventArgs &e) {
+  _countdownTimerTickSound.play();
+}

src/core/AudioManager.h

@@ -35,7 +35,7 @@ class AudioManager {
   void onBallDestroyed(BallStateEventArgs& e);
   void onPlayerLivesChanged(PlayerStateEventArgs& e);
   void onPlayerLost(PlayerStateEventArgs& e);
-//  void onCountdownTimerT
+  void onCountdownTick(TimerEventArgs& e);
 
   const BleepoutParameters& _appParams;
   ofSoundPlayer _roundStartedSound;

src/core/BleepoutApp.cpp

@@ -128,7 +128,7 @@ void BleepoutApp::endRound() {
   _playerManager->setIsInRound(false);
   _audioManager->detachFrom(*_roundController);
   _roundController.reset();
-  _endingRound = true;
+  _endingRound = false;
   notifyRoundEnded();
 }
 

src/core/GameEvents.cpp

@@ -99,6 +99,13 @@ void ModifierRemovedEventArgs::output(std::ostream &os) const {
   os << ")";
 }
 
+void TimerEventArgs::output(std::ostream& os) const {
+  os << "(";
+  os << "current:" << _currentTime << ", ";
+  os << "remaining:" << _remainingTime;
+  os << ")";
+}
+
 void EventSource::logEvent(const char *name,
                            const Outputable &event) const {
   if (loggingEnabled()) {

src/core/GameEvents.h

@@ -237,6 +237,18 @@ class PlayerYawPitchRollEventArgs {
   float _roll;
 };
 
+class TimerEventArgs : public Outputable {
+public:
+  TimerEventArgs(float currentTime, float remainingTime)
+  : _currentTime(currentTime), _remainingTime(remainingTime) { }
+  float currentTime() const { return _currentTime; }
+  float remainingTime() const { return _remainingTime; }
+  void output(std::ostream& os) const override;
+private:
+  float _currentTime;
+  float _remainingTime;
+};
+
 class EventSource {
 public:
   EventSource() : _logLevel(OF_LOG_SILENT) {}

src/core/LogicController.cpp

@@ -13,7 +13,7 @@ LogicController::LogicController(RoundState& state,
                                  RoundConfig& config,
                                  BleepoutParameters& appParams)
 :_state(state), _config(config), _appParams(appParams)
-, _lastSpecifiedTimeLimitOffset(-1)
+, _lastSpecifiedTimeLimitOffset(-1), _countdownTickPulser(1)
 , EventSource() { }
 
 void LogicController::setup() {
@@ -40,9 +40,14 @@ void LogicController::update() {
     }
     _lastSpecifiedTimeLimitOffset = limit;
   }
-  if (_state.endTime > 0 && _state.remainingTime() <= 0) {
-    notifyTryEndRound();
-    return;
+  if (_state.endTime > 0) {
+    if (_state.remainingTime() <= _config.countdownTimerPeriod &&
+        _countdownTickPulser.update(_state.time))
+      notifyCountdownTick();
+    if (_state.remainingTime() <= 0) {
+      notifyTryEndRound();
+      return;
+    }
   }
   for (auto& obj : _state.paddles()) {
     if (obj && obj->alive()) {
@@ -256,3 +261,8 @@ void LogicController::notifyModifierRemoved(RoundState& state, const ModifierSpe
   ofNotifyEvent(modifierRemovedEvent, e);
   logEvent("ModifierRemoved", e);
 }
+void LogicController::notifyCountdownTick() {
+  TimerEventArgs e(_state.time, _state.remainingTime());
+  ofNotifyEvent(countdownTickEvent, e);
+  logEvent("CountdownTick", e);
+}

src/core/LogicController.h

@@ -13,6 +13,7 @@
 #include "GameEvents.h"
 #include "BleepoutConfig.h"
 #include "BleepoutParameters.h"
+#include "Timing.h"
 
 class SpaceController;
 
@@ -34,6 +35,7 @@ class LogicController : public EventSource {
   ofEvent<ModifierEventArgs> modifierDestroyedEvent;
   ofEvent<ModifierEventArgs> modifierAppliedEvent;
   ofEvent<ModifierRemovedEventArgs> modifierRemovedEvent;
+  ofEvent<TimerEventArgs> countdownTickEvent;
 
   void setup();
   void update();
@@ -57,6 +59,7 @@ class LogicController : public EventSource {
   void notifyModifierDestroyed(RoundState& state, Modifier* modifier);
   void notifyModifierApplied(RoundState& state, Modifier* modifier, GameObject* target);
   void notifyModifierRemoved(RoundState& state, const ModifierSpec &modifierSpec, GameObject* target);
+  void notifyCountdownTick();
 
   void onCollision(CollisionEventArgs& e);
 
@@ -73,6 +76,7 @@ class LogicController : public EventSource {
   RoundConfig& _config;
   BleepoutParameters& _appParams;
   float _lastSpecifiedTimeLimitOffset;
+  Pulser _countdownTickPulser;
 };
 
 #endif /* defined(__bleepout__LogicController__) */

src/core/RoundManager.h

@@ -77,6 +77,7 @@ class RoundController : public EventSource
   bool notifyTryEndRound(EndRoundEventArgs &e);
 
   void onModifierAppeared(ModifierEventArgs& e);
+  void onCountdownTick(TimerEventArgs& e);
 
   bool _paused;
   float _startTime;

src/rendering/Animations.cpp

@@ -74,7 +74,7 @@ class MessageAnimation : public AnimationObject {
   virtual void draw(const RoundConfig& config) override;
   virtual void output(std::ostream& os) const override;
 private:
-  const MessageSpec& _message;
+  MessageSpec _message;
   ofTrueTypeFont& _font;
 };
 
@@ -191,13 +191,22 @@ void AnimationManager::onModifierRemoved(ModifierRemovedEventArgs &e) {
   addAnimation(anim);
 }
 
+void AnimationManager::onCountdownTick(TimerEventArgs &e) {
+  int time = static_cast<int>(e.remainingTime());
+  addMessage(MessageSpec("Time: " + ofToString(time), ofColor(255, 0, 0))
+             .setSize(10)
+             .setTiming(0, 0.9));
+}
+
 void AnimationManager::attachTo(LogicController &roundEvents) {
   ofAddListener(roundEvents.brickDestroyedEvent, this,
                 &AnimationManager::onBrickDestroyed);
   ofAddListener(roundEvents.modifierAppliedEvent, this,
                 &AnimationManager::onModifierApplied);
   ofAddListener(roundEvents.modifierRemovedEvent, this,
                 &AnimationManager::onModifierRemoved);
+  ofAddListener(roundEvents.countdownTickEvent, this,
+                &AnimationManager::onCountdownTick);
 }
 
 void AnimationManager::detachFrom(LogicController &roundEvents) {
@@ -207,4 +216,6 @@ void AnimationManager::detachFrom(LogicController &roundEvents) {
                    &AnimationManager::onModifierApplied);
   ofRemoveListener(roundEvents.modifierRemovedEvent, this,
                    &AnimationManager::onModifierRemoved);
+  ofRemoveListener(roundEvents.countdownTickEvent, this,
+                   &AnimationManager::onCountdownTick);
 }

src/rendering/Animations.h

@@ -32,6 +32,7 @@ class AnimationManager {
   void onBrickDestroyed(BrickDestroyedEventArgs& e);
   void onModifierApplied(ModifierEventArgs& e);
   void onModifierRemoved(ModifierRemovedEventArgs& e);
+  void onCountdownTick(TimerEventArgs& e);
 private:
   RoundController& _roundController;
   ofTrueTypeFont _messageFont;