Kaynağa Gözat

WIP: macOS port
- Fixing Linux build after macOS splash screen

Marko Pintera 7 yıl önce
ebeveyn
işleme
37e876a764

+ 0 - 5
Source/BansheeEngine/Platform/BsSplashScreen.cpp

@@ -86,7 +86,6 @@ namespace bs
 
 	// Note: Never freed, but that's fine
 	SplashScreen::Pimpl* SplashScreen::m = bs_new<Pimpl>();
-	const UINT32 SplashScreen::SPLASH_SCREEN_DURATION_MS = 1000;
 
 	void SplashScreen::show()
 	{
@@ -140,10 +139,6 @@ namespace bs
 		if (m->window == nullptr)
 			return;
 
-		UINT64 currentTime = m->timer.getMilliseconds();
-		if (currentTime < SPLASH_SCREEN_DURATION_MS)
-			BS_THREAD_SLEEP(SPLASH_SCREEN_DURATION_MS - currentTime);
-
 		LinuxPlatform::lockX();
 		bs_delete(m->window);
 		LinuxPlatform::unlockX();

+ 0 - 2
Source/BansheeEngine/Platform/BsSplashScreen.h

@@ -29,8 +29,6 @@ namespace bs
 
 		struct Pimpl;
 		static Pimpl* m;
-
-		static const UINT32 SPLASH_SCREEN_DURATION_MS;
 	};
 
 	/** @} */

+ 1 - 1
Source/BansheeGLRenderAPI/Linux/BsLinuxRenderWindow.cpp

@@ -134,7 +134,7 @@ namespace bs
 		mIsChild = windowDesc.parent != 0;
 		props.isFullScreen = mDesc.fullscreen && !mIsChild;
 
-		mShowOnSwap = mDesc.hideUntilSwap;
+		mShowOnSwap = mDesc.hideUntilSwap && !mDesc.hidden;
 		props.isHidden = mDesc.hideUntilSwap || mDesc.hidden;
 
 		mWindow = bs_new<LinuxWindow>(windowDesc);

+ 1 - 1
Source/BansheeVulkanRenderAPI/Linux/BsLinuxRenderWindow.cpp

@@ -151,7 +151,7 @@ namespace bs
 		mIsChild = windowDesc.parent != 0;
 		props.isFullScreen = mDesc.fullscreen && !mIsChild;
 
-		mShowOnSwap = mDesc.hideUntilSwap;
+		mShowOnSwap = mDesc.hideUntilSwap && !mDesc.hidden;
 		props.isHidden = mDesc.hideUntilSwap || mDesc.hidden;
 
 		mWindow = bs_new<LinuxWindow>(windowDesc);