backups/MinecraftConsoles
2
0
Fork 1
mirror of https://github.com/smartcmd/MinecraftConsoles.git synced 2026-08-20 09:57:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Updated gui

Browse source
This commit is contained in:
HARMSTONE 2026-03-09 22:00:05 +01:00 committed by GitHub
parent add6f3a73c
commit 86c7b57272
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 91 additions and 75 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

156
Minecraft.Client/Common/UI/UIScene_SettingsGraphicsMenu.cpp
View file

@ -7,21 +7,22 @@
namespace namespace
{ {
constexpr int FOV_MIN = 70; const int FOV_MIN = 70;
constexpr int FOV_MAX = 110; const int FOV_MAX = 110;
constexpr int FOV_SLIDER_MAX = 100; const int FOV_SLIDER_MAX = 100;
int ClampFov(int value) const int fpsCaps[] = {30, 60, 120, 0};
int clampFov(int value)
{ {
if (value < FOV_MIN) return FOV_MIN; if (value < FOV_MIN) return FOV_MIN;
if (value > FOV_MAX) return FOV_MAX; if (value > FOV_MAX) return FOV_MAX;
return value; return value;
} }
[[maybe_unused]] int fovToSliderValue(float fov)
int FovToSliderValue(float fov)
{ {
const int clampedFov = ClampFov(static_cast<int>(fov + 0.5f)); int clampedFov = clampFov((int)(fov + 0.5f));
return ((clampedFov - FOV_MIN) * FOV_SLIDER_MAX) / (FOV_MAX - FOV_MIN); return ((clampedFov - FOV_MIN) * FOV_SLIDER_MAX) / (FOV_MAX - FOV_MIN);
} }
@ -31,6 +32,14 @@ namespace
if (sliderValue > FOV_SLIDER_MAX) sliderValue = FOV_SLIDER_MAX; if (sliderValue > FOV_SLIDER_MAX) sliderValue = FOV_SLIDER_MAX;
return FOV_MIN + ((sliderValue * (FOV_MAX - FOV_MIN)) / FOV_SLIDER_MAX); return FOV_MIN + ((sliderValue * (FOV_MAX - FOV_MIN)) / FOV_SLIDER_MAX);
} }
void formatFpsCapLabel(WCHAR* buf, int idx)
{
if (fpsCaps[idx] == 0)
swprintf(buf, 256, L"Max Framerate: Unlimited");
else
swprintf(buf, 256, L"Max Framerate: %d", fpsCaps[idx]);
}
} }
int UIScene_SettingsGraphicsMenu::LevelToDistance(int level) int UIScene_SettingsGraphicsMenu::LevelToDistance(int level)
@ -43,73 +52,71 @@ int UIScene_SettingsGraphicsMenu::LevelToDistance(int level)
int UIScene_SettingsGraphicsMenu::DistanceToLevel(int dist) int UIScene_SettingsGraphicsMenu::DistanceToLevel(int dist)
{ {
static const int table[6] = {2,4,8,16,32,64}; static const int table[6] = {2,4,8,16,32,64};
for(int i = 0; i < 6; i++){ for(int i = 0; i < 6; i++){
if(table[i] == dist) if(table[i] == dist)
return i; return i;
} }
return 3; return 3;
} }
UIScene_SettingsGraphicsMenu::UIScene_SettingsGraphicsMenu(int iPad, void *initData, UILayer *parentLayer) : UIScene(iPad, parentLayer) UIScene_SettingsGraphicsMenu::UIScene_SettingsGraphicsMenu(int iPad, void *initData, UILayer *parentLayer) : UIScene(iPad, parentLayer)
{ {
// Setup all the Iggy references we need for this scene
initialiseMovie(); initialiseMovie();
Minecraft* pMinecraft = Minecraft::GetInstance(); Minecraft* pMinecraft = Minecraft::GetInstance();
m_bNotInGame=(Minecraft::GetInstance()->level==nullptr); m_bNotInGame = (Minecraft::GetInstance()->level == NULL);
m_checkboxClouds.init(app.GetString(IDS_CHECKBOX_RENDER_CLOUDS),eControl_Clouds,(app.GetGameSettings(m_iPad,eGameSetting_Clouds)!=0)); m_checkboxClouds.init(app.GetString(IDS_CHECKBOX_RENDER_CLOUDS), eControl_Clouds, (app.GetGameSettings(m_iPad, eGameSetting_Clouds) != 0));
m_checkboxBedrockFog.init(app.GetString(IDS_CHECKBOX_RENDER_BEDROCKFOG),eControl_BedrockFog,(app.GetGameSettings(m_iPad,eGameSetting_BedrockFog)!=0)); m_checkboxBedrockFog.init(app.GetString(IDS_CHECKBOX_RENDER_BEDROCKFOG), eControl_BedrockFog, (app.GetGameSettings(m_iPad, eGameSetting_BedrockFog) != 0));
m_checkboxCustomSkinAnim.init(app.GetString(IDS_CHECKBOX_CUSTOM_SKIN_ANIM),eControl_CustomSkinAnim,(app.GetGameSettings(m_iPad,eGameSetting_CustomSkinAnim)!=0)); m_checkboxCustomSkinAnim.init(app.GetString(IDS_CHECKBOX_CUSTOM_SKIN_ANIM), eControl_CustomSkinAnim, (app.GetGameSettings(m_iPad, eGameSetting_CustomSkinAnim) != 0));
m_checkboxVSync.init(L"VSync", eControl_VSync, (app.GetGameSettings(m_iPad, eGameSetting_VSync) != 0));
WCHAR TempString[256]; WCHAR TempString[256];
swprintf(TempString, 256, L"Render Distance: %d",app.GetGameSettings(m_iPad,eGameSetting_RenderDistance)); swprintf(TempString, 256, L"Render Distance: %d", (int)app.GetGameSettings(m_iPad, eGameSetting_RenderDistance));
m_sliderRenderDistance.init(TempString,eControl_RenderDistance,0,5,DistanceToLevel(app.GetGameSettings(m_iPad,eGameSetting_RenderDistance))); m_sliderRenderDistance.init(TempString, eControl_RenderDistance, 0, 5, DistanceToLevel((int)app.GetGameSettings(m_iPad, eGameSetting_RenderDistance)));
swprintf( TempString, 256, L"%ls: %d%%", app.GetString( IDS_SLIDER_GAMMA ),app.GetGameSettings(m_iPad,eGameSetting_Gamma));
m_sliderGamma.init(TempString,eControl_Gamma,0,100,app.GetGameSettings(m_iPad,eGameSetting_Gamma));
const int initialFovSlider = app.GetGameSettings(m_iPad, eGameSetting_FOV); swprintf(TempString, 256, L"%ls: %d%%", app.GetString(IDS_SLIDER_GAMMA), (int)app.GetGameSettings(m_iPad, eGameSetting_Gamma));
const int initialFovDeg = sliderValueToFov(initialFovSlider); m_sliderGamma.init(TempString, eControl_Gamma, 0, 100, (int)app.GetGameSettings(m_iPad, eGameSetting_Gamma));
swprintf(TempString, 256, L"FOV: %d", initialFovDeg);
int initialFovSlider = (int)app.GetGameSettings(m_iPad, eGameSetting_FOV);
swprintf(TempString, 256, L"FOV: %d", sliderValueToFov(initialFovSlider));
m_sliderFOV.init(TempString, eControl_FOV, 0, FOV_SLIDER_MAX, initialFovSlider); m_sliderFOV.init(TempString, eControl_FOV, 0, FOV_SLIDER_MAX, initialFovSlider);
swprintf( TempString, 256, L"%ls: %d%%", app.GetString( IDS_SLIDER_INTERFACEOPACITY ),app.GetGameSettings(m_iPad,eGameSetting_InterfaceOpacity)); swprintf(TempString, 256, L"%ls: %d%%", app.GetString(IDS_SLIDER_INTERFACEOPACITY), (int)app.GetGameSettings(m_iPad, eGameSetting_InterfaceOpacity));
m_sliderInterfaceOpacity.init(TempString,eControl_InterfaceOpacity,0,100,app.GetGameSettings(m_iPad,eGameSetting_InterfaceOpacity)); m_sliderInterfaceOpacity.init(TempString, eControl_InterfaceOpacity, 0, 100, (int)app.GetGameSettings(m_iPad, eGameSetting_InterfaceOpacity));
int fpsCapIndex = (int)app.GetGameSettings(m_iPad, eGameSetting_FpsCap);
if (fpsCapIndex < 0 || fpsCapIndex > 3) fpsCapIndex = 1;
formatFpsCapLabel(TempString, fpsCapIndex);
m_sliderFpsCap.init(TempString, eControl_FpsCap, 0, 3, fpsCapIndex);
doHorizontalResizeCheck(); doHorizontalResizeCheck();
bool bInGame = (Minecraft::GetInstance()->level != NULL);
bool bIsPrimaryPad = (ProfileManager.GetPrimaryPad() == m_iPad);
const bool bInGame=(Minecraft::GetInstance()->level!=nullptr);
const bool bIsPrimaryPad=(ProfileManager.GetPrimaryPad()==m_iPad);
// if we're not in the game, we need to use basescene 0
if(bInGame) if(bInGame)
{ {
// If the game has started, then you need to be the host to change the in-game gamertags
if(bIsPrimaryPad) if(bIsPrimaryPad)
{ {
// we are the primary player on this machine, but not the game host
// are we the game host? If not, we need to remove the bedrockfog setting
if(!g_NetworkManager.IsHost()) if(!g_NetworkManager.IsHost())
{ {
// hide the in-game bedrock fog setting
removeControl(&m_checkboxBedrockFog, true); removeControl(&m_checkboxBedrockFog, true);
} }
} }
else else
{ {
// We shouldn't have the bedrock fog option, or the m_CustomSkinAnim option
removeControl(&m_checkboxBedrockFog, true); removeControl(&m_checkboxBedrockFog, true);
removeControl(&m_checkboxCustomSkinAnim, true); removeControl(&m_checkboxCustomSkinAnim, true);
} }
} }
if(app.GetLocalPlayerCount()>1) if(app.GetLocalPlayerCount() > 1)
{ {
#if TO_BE_IMPLEMENTED #if TO_BE_IMPLEMENTED
app.AdjustSplitscreenScene(m_hObj,&m_OriginalPosition,m_iPad); app.AdjustSplitscreenScene(m_hObj, &m_OriginalPosition, m_iPad);
#endif #endif
} }
} }
@ -132,24 +139,23 @@ wstring UIScene_SettingsGraphicsMenu::getMoviePath()
void UIScene_SettingsGraphicsMenu::updateTooltips() void UIScene_SettingsGraphicsMenu::updateTooltips()
{ {
ui.SetTooltips( m_iPad, IDS_TOOLTIPS_SELECT,IDS_TOOLTIPS_BACK); ui.SetTooltips(m_iPad, IDS_TOOLTIPS_SELECT, IDS_TOOLTIPS_BACK);
} }
void UIScene_SettingsGraphicsMenu::updateComponents() void UIScene_SettingsGraphicsMenu::updateComponents()
{ {
const bool bNotInGame=(Minecraft::GetInstance()->level==nullptr); bool bNotInGame = (Minecraft::GetInstance()->level == NULL);
if(bNotInGame) if(bNotInGame)
{ {
m_parentLayer->showComponent(m_iPad,eUIComponent_Panorama,true); m_parentLayer->showComponent(m_iPad, eUIComponent_Panorama, true);
m_parentLayer->showComponent(m_iPad,eUIComponent_Logo,true); m_parentLayer->showComponent(m_iPad, eUIComponent_Logo, true);
} }
else else
{ {
m_parentLayer->showComponent(m_iPad,eUIComponent_Panorama,false); m_parentLayer->showComponent(m_iPad, eUIComponent_Panorama, false);
if( app.GetLocalPlayerCount() == 1 ) m_parentLayer->showComponent(m_iPad,eUIComponent_Logo,true); if(app.GetLocalPlayerCount() == 1) m_parentLayer->showComponent(m_iPad, eUIComponent_Logo, true);
else m_parentLayer->showComponent(m_iPad,eUIComponent_Logo,false); else m_parentLayer->showComponent(m_iPad, eUIComponent_Logo, false);
} }
} }
@ -161,10 +167,10 @@ void UIScene_SettingsGraphicsMenu::handleInput(int iPad, int key, bool repeat, b
case ACTION_MENU_CANCEL: case ACTION_MENU_CANCEL:
if(pressed) if(pressed)
{ {
// check the checkboxes app.SetGameSettings(m_iPad, eGameSetting_Clouds, m_checkboxClouds.IsChecked() ? 1 : 0);
app.SetGameSettings(m_iPad,eGameSetting_Clouds,m_checkboxClouds.IsChecked()?1:0); app.SetGameSettings(m_iPad, eGameSetting_BedrockFog, m_checkboxBedrockFog.IsChecked() ? 1 : 0);
app.SetGameSettings(m_iPad,eGameSetting_BedrockFog,m_checkboxBedrockFog.IsChecked()?1:0); app.SetGameSettings(m_iPad, eGameSetting_CustomSkinAnim, m_checkboxCustomSkinAnim.IsChecked() ? 1 : 0);
app.SetGameSettings(m_iPad,eGameSetting_CustomSkinAnim,m_checkboxCustomSkinAnim.IsChecked()?1:0); app.SetGameSettings(m_iPad, eGameSetting_VSync, m_checkboxVSync.IsChecked() ? 1 : 0);
navigateBack(); navigateBack();
handled = true; handled = true;
@ -188,53 +194,59 @@ void UIScene_SettingsGraphicsMenu::handleInput(int iPad, int key, bool repeat, b
void UIScene_SettingsGraphicsMenu::handleSliderMove(F64 sliderId, F64 currentValue) void UIScene_SettingsGraphicsMenu::handleSliderMove(F64 sliderId, F64 currentValue)
{ {
WCHAR TempString[256]; WCHAR TempString[256];
const int value = static_cast<int>(currentValue); int value = (int)currentValue;
switch(static_cast<int>(sliderId)) switch((int)sliderId)
{ {
case eControl_RenderDistance: case eControl_RenderDistance:
{ {
m_sliderRenderDistance.handleSliderMove(value); m_sliderRenderDistance.handleSliderMove(value);
const int dist = LevelToDistance(value); int dist = LevelToDistance(value);
app.SetGameSettings(m_iPad, eGameSetting_RenderDistance, dist);
app.SetGameSettings(m_iPad,eGameSetting_RenderDistance,dist); Minecraft* mc = Minecraft::GetInstance();
const Minecraft* mc = Minecraft::GetInstance();
mc->options->viewDistance = 3 - value; mc->options->viewDistance = 3 - value;
swprintf(TempString,256,L"Render Distance: %d",dist); swprintf(TempString, 256, L"Render Distance: %d", dist);
m_sliderRenderDistance.setLabel(TempString); m_sliderRenderDistance.setLabel(TempString);
} }
break; break;
case eControl_Gamma: case eControl_Gamma:
m_sliderGamma.handleSliderMove(value); m_sliderGamma.handleSliderMove(value);
app.SetGameSettings(m_iPad, eGameSetting_Gamma, value);
app.SetGameSettings(m_iPad,eGameSetting_Gamma,value); swprintf(TempString, 256, L"%ls: %d%%", app.GetString(IDS_SLIDER_GAMMA), value);
swprintf( TempString, 256, L"%ls: %d%%", app.GetString( IDS_SLIDER_GAMMA ),value);
m_sliderGamma.setLabel(TempString); m_sliderGamma.setLabel(TempString);
break; break;
case eControl_FOV: case eControl_FOV:
{ {
m_sliderFOV.handleSliderMove(value); m_sliderFOV.handleSliderMove(value);
const Minecraft* pMinecraft = Minecraft::GetInstance(); Minecraft* pMinecraft = Minecraft::GetInstance();
const int fovValue = sliderValueToFov(value); int fovValue = sliderValueToFov(value);
pMinecraft->gameRenderer->SetFovVal(static_cast<float>(fovValue)); pMinecraft->gameRenderer->SetFovVal((float)fovValue);
app.SetGameSettings(m_iPad, eGameSetting_FOV, value); app.SetGameSettings(m_iPad, eGameSetting_FOV, value);
WCHAR tempString[256]; swprintf(TempString, 256, L"FOV: %d", fovValue);
swprintf(tempString, 256, L"FOV: %d", fovValue); m_sliderFOV.setLabel(TempString);
m_sliderFOV.setLabel(tempString);
} }
break; break;
case eControl_InterfaceOpacity: case eControl_InterfaceOpacity:
m_sliderInterfaceOpacity.handleSliderMove(value); m_sliderInterfaceOpacity.handleSliderMove(value);
app.SetGameSettings(m_iPad, eGameSetting_InterfaceOpacity, value);
app.SetGameSettings(m_iPad,eGameSetting_InterfaceOpacity,value); swprintf(TempString, 256, L"%ls: %d%%", app.GetString(IDS_SLIDER_INTERFACEOPACITY), value);
swprintf( TempString, 256, L"%ls: %d%%", app.GetString( IDS_SLIDER_INTERFACEOPACITY ),value);
m_sliderInterfaceOpacity.setLabel(TempString); m_sliderInterfaceOpacity.setLabel(TempString);
break;
case eControl_FpsCap:
{
int idx = value;
if (idx < 0) idx = 0;
if (idx > 3) idx = 3;
m_sliderFpsCap.handleSliderMove(idx);
app.SetGameSettings(m_iPad, eGameSetting_FpsCap, idx);
formatFpsCapLabel(TempString, idx);
m_sliderFpsCap.setLabel(TempString);
}
break; break;
} }
} }

10
Minecraft.Client/Common/UI/UIScene_SettingsGraphicsMenu.h
View file

@ -15,19 +15,23 @@ private:
eControl_RenderDistance, eControl_RenderDistance,
eControl_Gamma, eControl_Gamma,
eControl_FOV, eControl_FOV,
eControl_InterfaceOpacity eControl_InterfaceOpacity,
eControl_FpsCap,
eControl_VSync
}; };
UIControl_CheckBox m_checkboxClouds, m_checkboxBedrockFog, m_checkboxCustomSkinAnim; // Checkboxes UIControl_CheckBox m_checkboxClouds, m_checkboxBedrockFog, m_checkboxCustomSkinAnim, m_checkboxVSync;
UIControl_Slider m_sliderRenderDistance, m_sliderGamma, m_sliderFOV, m_sliderInterfaceOpacity; // Sliders UIControl_Slider m_sliderRenderDistance, m_sliderGamma, m_sliderFOV, m_sliderInterfaceOpacity, m_sliderFpsCap;
UI_BEGIN_MAP_ELEMENTS_AND_NAMES(UIScene) UI_BEGIN_MAP_ELEMENTS_AND_NAMES(UIScene)
UI_MAP_ELEMENT( m_checkboxClouds, "Clouds") UI_MAP_ELEMENT( m_checkboxClouds, "Clouds")
UI_MAP_ELEMENT( m_checkboxBedrockFog, "BedrockFog") UI_MAP_ELEMENT( m_checkboxBedrockFog, "BedrockFog")
UI_MAP_ELEMENT( m_checkboxCustomSkinAnim, "CustomSkinAnim") UI_MAP_ELEMENT( m_checkboxCustomSkinAnim, "CustomSkinAnim")
UI_MAP_ELEMENT( m_checkboxVSync, "VSync")
UI_MAP_ELEMENT( m_sliderRenderDistance, "RenderDistance") UI_MAP_ELEMENT( m_sliderRenderDistance, "RenderDistance")
UI_MAP_ELEMENT( m_sliderGamma, "Gamma") UI_MAP_ELEMENT( m_sliderGamma, "Gamma")
UI_MAP_ELEMENT(m_sliderFOV, "FOV") UI_MAP_ELEMENT(m_sliderFOV, "FOV")
UI_MAP_ELEMENT( m_sliderInterfaceOpacity, "InterfaceOpacity") UI_MAP_ELEMENT( m_sliderInterfaceOpacity, "InterfaceOpacity")
UI_MAP_ELEMENT( m_sliderFpsCap, "FpsCap")
UI_END_MAP_ELEMENTS_AND_NAMES() UI_END_MAP_ELEMENTS_AND_NAMES()
bool m_bNotInGame; bool m_bNotInGame;