added fade in to new game

and fixed music on new game

5 files changed, 36 insertions, 6 deletions

@@ -16,6 +16,7 @@ Game::Game(std::mt19937& rng, Muxer& muxer, Renderer& renderer) :
   sign(renderer.getFont())
 {
   losePopLampTimer.accumulate(losePopLampTimer.getDt());
+  initialFade.start(1000);
 
   do {
     loadMap();
@@ -846,6 +847,19 @@ void Game::updatePlaying(size_t frameTime) {
 
   switch (losing)
   {
+    case LoseState::NewGame:
+    {
+      if (!startedMusic) {
+        startedMusic = true;
+        muxer.startMusic();
+      }
+      initialFade.tick(frameTime);
+      if (initialFade.isComplete()) {
+        losing = LoseState::None;
+      }
+      break;
+    }
+
     case LoseState::None:
     {
       if (moving) {
@@ -21,6 +21,7 @@ constexpr int TilesetIndex(int x, int y) {
 }
 
 enum class LoseState {
+  NewGame,
   None,
   PoppingLamps,
   PoppingPlayer,
@@ -66,7 +67,10 @@ public:
 
   bool quit = false;
   bool quitting = false; // <- whether we will quit after losing, vs starting a new game
-  LoseState losing = LoseState::None;
+  LoseState losing = LoseState::NewGame;
+
+  Interpolation initialFade;
+  bool startedMusic = false;
 
   Map map;
   std::list<Kickup> kickups;
@@ -26,11 +26,6 @@ Muxer::Muxer() {
 
   FMOD::Studio::Bank* stringsBank = nullptr;
   ERRCHECK(system_->loadBankFile("../res/fmod/Build/Desktop/Master Bank.strings.bank", FMOD_STUDIO_LOAD_BANK_NORMAL, &stringsBank));
-
-  FMOD::Studio::EventDescription* exploration_desc = nullptr;
-  ERRCHECK(system_->getEvent("event:/exploration", &exploration_desc));
-  ERRCHECK(exploration_desc->createInstance(&exploration_event_));
-  ERRCHECK(exploration_event_->start());
 }
 
 void Muxer::setPlayerLoc(int x, int y) {
@@ -96,6 +91,15 @@ void Muxer::setMusicLevel(int level) {
   }
 }
 
+void Muxer::startMusic() {
+  FMOD::Studio::EventDescription* exploration_desc = nullptr;
+  ERRCHECK(system_->getEvent("event:/exploration", &exploration_desc));
+  ERRCHECK(exploration_desc->createInstance(&exploration_event_));
+  ERRCHECK(exploration_event_->start());
+
+  transition_state_ = TransitionState::Pre;
+}
+
 void Muxer::stopMusic() {
   switch (transition_state_) {
     case TransitionState::Pre: {
@@ -34,6 +34,8 @@ public:
 
   void setMusicLevel(int level);
 
+  void startMusic();
+
   void stopMusic();
 
   void update();
@@ -396,6 +396,12 @@ void Renderer::renderGame(
 
   SDL_RenderCopy(ren_.get(), canvas.get(), &zoomRect, nullptr);
 
+  if (game.losing == LoseState::NewGame) {
+    SDL_SetRenderDrawBlendMode(ren_.get(), SDL_BLENDMODE_BLEND);
+    SDL_SetRenderDrawColor(ren_.get(), 0, 0, 0, game.initialFade.getProgress(255, 0));
+    SDL_RenderFillRect(ren_.get(), nullptr);
+  }
+
   texture_ptr overlays(
     SDL_CreateTexture(
       ren_.get(),