diff --git a/Minecraft.Client/Common/UI/UIScene_SettingsGraphicsMenu.cpp b/Minecraft.Client/Common/UI/UIScene_SettingsGraphicsMenu.cpp index a0c1fc1d..68e06cf2 100644 --- a/Minecraft.Client/Common/UI/UIScene_SettingsGraphicsMenu.cpp +++ b/Minecraft.Client/Common/UI/UIScene_SettingsGraphicsMenu.cpp @@ -77,10 +77,30 @@ UIScene_SettingsGraphicsMenu::UIScene_SettingsGraphicsMenu(int iPad, void *initD m_tabIndex = TAB_GENERAL_OPTIONS; -/* + m_generalOptionsList.AddNewCheckbox(app.GetString(IDS_CHECKBOX_CUSTOM_SKIN_ANIM),eControl_CustomSkinAnim,(app.GetGameSettings(m_iPad,eGameSetting_CustomSkinAnim)!=0)); + + WCHAR TempString[256]; + swprintf(TempString, 256, L"%ls: %d", app.GetString( IDS_SLIDER_RENDERDISTANCE ),app.GetGameSettings(m_iPad,eGameSetting_RenderDistance)); - m_sliderRenderDistance.init(TempString,eControl_RenderDistance,0,3,DistanceToLevel(app.GetGameSettings(m_iPad,eGameSetting_RenderDistance))); -*/ + m_generalOptionsList.AddNewSlider(TempString,eControl_RenderDistance,0,3,DistanceToLevel(app.GetGameSettings(m_iPad,eGameSetting_RenderDistance))); + + swprintf(TempString, 256, L"%ls: %d%%", app.GetString( IDS_SLIDER_GAMMA ),app.GetGameSettings(m_iPad,eGameSetting_Gamma)); + m_generalOptionsList.AddNewSlider(TempString,eControl_Gamma,0,100,app.GetGameSettings(m_iPad,eGameSetting_Gamma)); + + const int initialFovSlider = app.GetGameSettings(m_iPad, eGameSetting_FOV); + const int initialFovDeg = sliderValueToFov(initialFovSlider); + swprintf(TempString, 256, L"%ls: %d", app.GetString( IDS_SLIDER_FOV ),initialFovDeg); + m_generalOptionsList.AddNewSlider(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)); + m_generalOptionsList.AddNewSlider(TempString,eControl_InterfaceOpacity,0,100,app.GetGameSettings(m_iPad,eGameSetting_InterfaceOpacity)); + + m_qualityOptionsList.AddNewCheckbox(app.GetString(IDS_CHECKBOX_RENDER_CLOUDS),eControl_Clouds,(app.GetGameSettings(m_iPad,eGameSetting_Clouds)!=0)); + m_qualityOptionsList.AddNewCheckbox(app.GetString(IDS_CHECKBOX_RENDER_BEDROCKFOG),eControl_BedrockFog,(app.GetGameSettings(m_iPad,eGameSetting_BedrockFog)!=0)); + + int currentGraphics = app.GetGameSettings(m_iPad, eGameSetting_GraphicsMode); + swprintf(TempString, 256, L"%ls %ls", app.GetString( IDS_GRAPHICS ),app.GetString(m_iGraphicsModeTitleSettingA[app.GetGameSettings(m_iPad,eGameSetting_GraphicsMode)])); + m_qualityOptionsList.AddNewSlider(TempString, eControl_GraphicsMode, 0, 3, currentGraphics); /* Minecraft* pMinecraft = Minecraft::GetInstance(); diff --git a/Minecraft.Client/Common/UI/UIScene_SettingsGraphicsMenu.h b/Minecraft.Client/Common/UI/UIScene_SettingsGraphicsMenu.h index a5737d76..3b5ffa8e 100644 --- a/Minecraft.Client/Common/UI/UIScene_SettingsGraphicsMenu.h +++ b/Minecraft.Client/Common/UI/UIScene_SettingsGraphicsMenu.h @@ -3,6 +3,7 @@ #include "UIScene.h" #include "UIControl_Label.h" #include "UIControl_HTMLLabel.h" +#include "UIControl_MultiList.h" class UIScene_SettingsGraphicsMenu : public UIScene { @@ -12,13 +13,21 @@ private: enum EControls { - eLaunchCheckboxes_Count, + eControl_Clouds, + eControl_BedrockFog, + eControl_CustomSkinAnim, + eControl_Gamma, + eControl_FOV, + eControl_InterfaceOpacity, + eControl_RenderDistance, + eControl_GraphicsMode, eControl_Count }; static int m_iGraphicsModeTitleSettingA[4]; UIControl m_qualityOptions, m_generalOptions; + UIControl_MultiList m_qualityOptionsList, m_generalOptionsList; UIControl_Label m_labelQualityOptions, m_labelGeneralOptions; IggyName m_funcSetMenuType, m_funcChangeTab; UI_BEGIN_MAP_ELEMENTS_AND_NAMES(UIScene) @@ -27,10 +36,12 @@ private: UI_MAP_ELEMENT(m_qualityOptions, "QualityOptions") UI_BEGIN_MAP_CHILD_ELEMENTS(m_qualityOptions) + UI_MAP_ELEMENT(m_qualityOptionsList, "QualityOptionsList") UI_END_MAP_CHILD_ELEMENTS() UI_MAP_ELEMENT( m_generalOptions, "GeneralOptions") UI_BEGIN_MAP_CHILD_ELEMENTS(m_generalOptions) + UI_MAP_ELEMENT(m_generalOptionsList, "GeneralOptionsList") UI_END_MAP_CHILD_ELEMENTS() UI_MAP_NAME( m_funcChangeTab, L"ChangeTab")