:sparkles: logo is now centered and keeps its aspect ratio

game/SplashState.cxx

@@ -17,27 +17,49 @@ void SplashState::render(SDLRenderer& renderer)
   SDL_SetRenderDrawColor(renderer, 0, 0, 0, SDL_ALPHA_OPAQUE);
   SDL_RenderClear(renderer);
 
-  int w, h;
-  SDL_GetRendererOutputSize(renderer, &w, &h);
-
-  if (time_in_state_ >= 2'000ms && time_in_state_ < 4'000ms)
-  {
-    auto const progress = static_cast<float>(time_in_state_.count() - 2'000) / 2'000.0f;
-    auto const alpha = static_cast<int>(std::lerp(SDL_ALPHA_TRANSPARENT, SDL_ALPHA_OPAQUE, progress));
-    SDL_SetTextureAlphaMod(logo_, alpha);
-    SDL_RenderCopy(renderer, logo_, nullptr, nullptr);
-  }
-  else if (time_in_state_ >= 4'000ms && time_in_state_ < 9'000ms)
-  {
-    SDL_SetTextureAlphaMod(logo_, SDL_ALPHA_OPAQUE);
-    SDL_RenderCopy(renderer, logo_, nullptr, nullptr);
-  }
-  else if (time_in_state_ >= 9'000ms && time_in_state_ < 11'000ms)
+  if (time_in_state_ >= 2'000ms && time_in_state_ < 11'000ms)
   {
-    auto const progress = static_cast<float>(time_in_state_.count() - 11'000) / 2'000.0f;
-    auto const alpha = static_cast<int>(std::lerp(SDL_ALPHA_OPAQUE, SDL_ALPHA_TRANSPARENT, progress));
-    SDL_SetTextureAlphaMod(logo_, alpha);
-    SDL_RenderCopy(renderer, logo_, nullptr, nullptr);
+    if (time_in_state_ < 4'000ms)
+    {
+      auto const progress = static_cast<float>(time_in_state_.count() - 2'000) / 2'000.0f;
+      auto const alpha = static_cast<int>(std::lerp(SDL_ALPHA_TRANSPARENT, SDL_ALPHA_OPAQUE, progress));
+      SDL_SetTextureAlphaMod(logo_, alpha);
+    }
+    else if (time_in_state_ >= 4'000ms && time_in_state_ < 9'000ms)
+    {
+      SDL_SetTextureAlphaMod(logo_, SDL_ALPHA_OPAQUE);
+    }
+    else if (time_in_state_ >= 9'000ms)
+    {
+      auto const progress = static_cast<float>(time_in_state_.count() - 9'000) / 2'000.0f;
+      auto const alpha = static_cast<int>(std::lerp(SDL_ALPHA_OPAQUE, SDL_ALPHA_TRANSPARENT, progress));
+      SDL_SetTextureAlphaMod(logo_, alpha);
+    }
+
+    int screen_w, screen_h;
+    SDL_GetRendererOutputSize(renderer, &screen_w, &screen_h);
+    int logo_w, logo_h;
+    SDL_QueryTexture(logo_, nullptr, nullptr, &logo_w, &logo_h);
+
+    float const logo_aspect = static_cast<float>(logo_w) / static_cast<float>(logo_h);
+    float const screen_aspect = static_cast<float>(screen_w - 20) / static_cast<float>(screen_h - 20);
+
+    int put_w, put_h;
+    if (logo_aspect > screen_aspect) {
+      put_w = (screen_w - 20);
+      put_h = static_cast<int>(static_cast<float>(put_w) / logo_aspect);
+    } else {
+      put_h = screen_h - 20;
+      put_w = static_cast<int>(static_cast<float>(put_h) * logo_aspect);
+    }
+
+    SDL_Rect const logo_rect = {
+      .x = (screen_w - put_w) / 2,
+      .y = (screen_h - put_h) / 2,
+      .w = put_w,
+      .h = put_h
+    };
+    SDL_RenderCopy(renderer, logo_, nullptr, &logo_rect);
   }
 
   SDL_RenderPresent(renderer);
@@ -48,4 +70,4 @@ void SplashState::on_enter()
   time_in_state_ = 0ms;
   logo_ = AssetManager::instance().get_texture_asset("logo.jpg");
   SDL_SetTextureBlendMode(logo_, SDL_BLENDMODE_BLEND);
-}
+}