pieeebot/cafeberry
1
0
Fork 4
Code Issues Pull Requests 2 Actions Packages Projects Releases 2 Wiki Activity

feat(Windows64): ReloadSkin on another thread & improved screen height to swf

Browse Source
This commit is contained in:
str1k3r
2026-08-10 00:28:30 -04:00
parent 77a4ee39b5
commit b737c3eccb
2 changed files with 18 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Minecraft.Client/Common/UI/UIController.cpp
+9 -8
View File
@@ -500,7 +500,7 @@ void UIController::loadSkins()
#elif defined __PSVITA__
platformSkinPath = L"skinVita.swf";
#elif defined _WINDOWS64
if(m_fScreenHeight==1080.0f)
if(m_fScreenHeight >= 1080.0f)
{
platformSkinPath = L"skinHDWin.swf";
}
@@ -611,17 +611,19 @@ void UIController::ReloadSkin()
m_iggyLibraries[i] = IGGY_INVALID_LIBRARY;
}
#ifdef _WINDOWS64
// 4J Stu - Don't load on a thread on windows. I haven't investigated this in detail, so a quick fix
reloadSkinThreadProc(this);
#else
m_reloadSkinThread = new C4JThread(reloadSkinThreadProc, (void*)this, "Reload skin thread");
m_reloadSkinThread->SetProcessor(CPU_CORE_UI_SCENE);
// Navigate to the timer scene so that we can display something while the loading is happening
// str1k3r - Exclude this from windows64 as its not needed
#ifndef _WINDOWS64
ui.NavigateToScene(0,eUIScene_Timer,(void *)1,eUILayer_Tooltips,eUIGroup_Fullscreen);
//m_reloadSkinThread->Run();
#endif
// str1k3r - Fixes 4J's issue with the screen staying on the timer scene if on another thread on windows64
#ifdef _WINDOWS64
m_reloadSkinThread->Run();
#endif
//// Load new skin
//loadSkins();
@@ -634,7 +636,6 @@ void UIController::ReloadSkin()
//// Always reload the fullscreen group
//m_groups[eUIGroup_Fullscreen]->ReloadAll();
#endif
}
void UIController::StartReloadSkinThread()
Minecraft.Client/Common/UI/UIScene.cpp
+9 -9
View File
@@ -285,25 +285,25 @@ void UIScene::loadMovie()
moviePath.append(L"Vita.swf");
m_loadedResolution = eSceneResolution_Vita;
#elif defined _WINDOWS64
if(ui.getScreenHeight() == 720)
if(ui.getScreenHeight() >= 1080)
{
moviePath.append(L"1080.swf");
m_loadedResolution = eSceneResolution_1080;
}
else if(ui.getScreenHeight() >= 720)
{
moviePath.append(L"720.swf");
m_loadedResolution = eSceneResolution_720;
}
else if(ui.getScreenHeight() == 480)
{
moviePath.append(L"480.swf");
m_loadedResolution = eSceneResolution_480;
}
else if(ui.getScreenHeight() < 720)
else if(ui.getScreenHeight() >= 544)
{
moviePath.append(L"Vita.swf");
m_loadedResolution = eSceneResolution_Vita;
}
else
{
moviePath.append(L"1080.swf");
m_loadedResolution = eSceneResolution_1080;
moviePath.append(L"480.swf");
m_loadedResolution = eSceneResolution_480;
}
#else
moviePath.append(L"1080.swf");