diff --git a/Source/Editor/Windows/SplashScreen.cpp b/Source/Editor/Windows/SplashScreen.cpp index 2700c9694..7e2889ca1 100644 --- a/Source/Editor/Windows/SplashScreen.cpp +++ b/Source/Editor/Windows/SplashScreen.cpp @@ -9,6 +9,7 @@ #include "Engine/Render2D/Font.h" #include "Engine/Render2D/TextLayoutOptions.h" #include "Engine/Render2D/Render2D.h" +#include "Engine/Platform/FileSystem.h" #include "Engine/Content/Content.h" #include "FlaxEngine.Gen.h" @@ -188,8 +189,7 @@ void SplashScreen::Show() // Setup _dpiScale = dpiScale; - _width = settings.Size.X; - _height = settings.Size.Y; + _size = settings.Size; _startTime = DateTime::NowUTC(); auto str = Globals::ProjectFolder; #if PLATFORM_WIN32 @@ -214,6 +214,12 @@ void SplashScreen::Show() font->OnLoaded.Bind(this); } + // Load custom image + _splashTexture.Loaded.Bind(this); + String splashImagePath = Globals::ProjectContentFolder / TEXT("SplashImage.flax"); + if (FileSystem::FileExists(splashImagePath)) + _splashTexture = Content::LoadAsync(splashImagePath); + _window->Show(); } @@ -227,6 +233,10 @@ void SplashScreen::Close() // Close window _window->Close(ClosingReason::CloseEvent); _window = nullptr; + + _titleFont = nullptr; + _subtitleFont = nullptr; + _splashTexture = nullptr; } void SplashScreen::OnShown() @@ -239,16 +249,29 @@ void SplashScreen::OnShown() void SplashScreen::OnDraw() { const float s = _dpiScale; - const float width = _width; - const float height = _height; + const float width = _size.X; + const float height = _size.Y; // Peek time const float time = static_cast((DateTime::NowUTC() - _startTime).GetTotalSeconds()); // Background - const float lightBarHeight = 112 * s; - Render2D::FillRectangle(Rectangle(0, 0, width, 150 * s), Color::FromRGB(0x1C1C1C)); - Render2D::FillRectangle(Rectangle(0, lightBarHeight, width, height), Color::FromRGB(0x0C0C0C)); + float lightBarHeight = 112 * s; + if (_splashTexture != nullptr) + { + if (_splashTexture->IsLoaded()) + { + lightBarHeight = height - lightBarHeight + 20 * s; + Render2D::DrawTexture(_splashTexture, Rectangle(0, 0, width, height)); + Color rectColor = Color::FromRGB(0x0C0C0C); + Render2D::FillRectangle(Rectangle(0, lightBarHeight, width, height - lightBarHeight),rectColor.AlphaMultiplied(0.85f), rectColor.AlphaMultiplied(0.85f), rectColor, rectColor); + } + } + else + { + Render2D::FillRectangle(Rectangle(0, 0, width, 150 * s), Color::FromRGB(0x1C1C1C)); + Render2D::FillRectangle(Rectangle(0, lightBarHeight, width, height), Color::FromRGB(0x0C0C0C)); + } // Animated border const float anim = Math::Sin(time * 4.0f) * 0.5f + 0.5f; @@ -276,15 +299,27 @@ void SplashScreen::OnDraw() for (int32 i = 0; i < 4 - static_cast(time * 2.0f) % 4; i++) subtitle += TEXT(' '); } - layout.Bounds = Rectangle(width - 224 * s, lightBarHeight - 39 * s, 220 * s, 35 * s); + if (_splashTexture != nullptr) + { + layout.Bounds = Rectangle(width - 224 * s, lightBarHeight + 4 * s, 220 * s, 35 * s); + layout.VerticalAlignment = TextAlignment::Near; + } + else + { + layout.Bounds = Rectangle(width - 224 * s, lightBarHeight - 39 * s, 220 * s, 35 * s); + layout.VerticalAlignment = TextAlignment::Far; + } layout.Scale = 1.0f; layout.HorizontalAlignment = TextAlignment::Far; - layout.VerticalAlignment = TextAlignment::Far; Render2D::DrawText(_subtitleFont, subtitle, Color::FromRGB(0x8C8C8C), layout); // Additional info const float infoMargin = 6 * s; - layout.Bounds = Rectangle(infoMargin, lightBarHeight + infoMargin, width - (2 * infoMargin), height - lightBarHeight - (2 * infoMargin)); + if (_splashTexture != nullptr) + layout.Bounds = Rectangle(infoMargin + 4 * s, lightBarHeight + infoMargin, width - (2 * infoMargin), height - lightBarHeight - (2 * infoMargin)); + else + layout.Bounds = Rectangle(infoMargin, lightBarHeight + infoMargin, width - (2 * infoMargin), height - lightBarHeight - (2 * infoMargin)); + layout.HorizontalAlignment = TextAlignment::Near; layout.VerticalAlignment = TextAlignment::Center; Render2D::DrawText(_subtitleFont, _infoText, Color::FromRGB(0xFFFFFF) * 0.9f, layout); @@ -307,3 +342,14 @@ void SplashScreen::OnFontLoaded(Asset* asset) _titleFont = font->CreateFont(35 * s); _subtitleFont = font->CreateFont(9 * s); } + +void SplashScreen::OnSplashLoaded() +{ + // Resize window to be larger if texture is being used + auto desktopSize = Platform::GetDesktopSize(); + auto xSize = (desktopSize.X / (600.0f * 3.0f)) * 600.0f; + auto ySize = (desktopSize.Y / (200.0f * 3.0f)) * 200.0f; + _window->SetClientSize(Float2(xSize, ySize)); + _size = _window->GetSize(); + _window->SetPosition((desktopSize - _size) * 0.5f); +} diff --git a/Source/Editor/Windows/SplashScreen.h b/Source/Editor/Windows/SplashScreen.h index e8afcb97f..6f8f17a7f 100644 --- a/Source/Editor/Windows/SplashScreen.h +++ b/Source/Editor/Windows/SplashScreen.h @@ -2,6 +2,8 @@ #pragma once +#include "Engine/Content/Assets/Texture.h" +#include "Engine/Content/AssetReference.h" #include "Engine/Core/Types/DateTime.h" #include "Engine/Platform/Window.h" @@ -18,10 +20,12 @@ private: Window* _window = nullptr; Font* _titleFont = nullptr; Font* _subtitleFont = nullptr; + AssetReference _splashTexture; String _title; DateTime _startTime; String _infoText; - float _dpiScale, _width, _height; + float _dpiScale; + Float2 _size; StringView _quote; public: @@ -78,4 +82,5 @@ private: void OnDraw(); bool HasLoadedFonts() const; void OnFontLoaded(Asset* asset); + void OnSplashLoaded(); };