SPAWNRYS/bloxstrap
1
0
Fork 0
mirror of https://github.com/bloxstraplabs/bloxstrap.git synced 2025-04-21 10:01:27 -07:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove options for rendering mode selection

Browse Source
This commit is contained in:
pizzaboxer 2023-11-03 09:03:55 +00:00
parent 2552b3139d
commit df54dcb9e1
No known key found for this signature in database
GPG Key ID: 59D4A1DBAD0F2BA8
4 changed files with 12 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
Bloxstrap/FastFlagManager.cs
View File

@ -28,12 +28,6 @@ namespace Bloxstrap
{ "Rendering.TexturePack", "FStringPartTexturePackTable2022" }, { "Rendering.TexturePack", "FStringPartTexturePackTable2022" },
{ "Rendering.DisableScaling", "DFFlagDisableDPIScale" }, { "Rendering.DisableScaling", "DFFlagDisableDPIScale" },
{ "Rendering.Mode.D3D11", "FFlagDebugGraphicsPreferD3D11" },
{ "Rendering.Mode.D3D10", "FFlagDebugGraphicsPreferD3D11FL10" },
{ "Rendering.Mode.Vulkan", "FFlagDebugGraphicsPreferVulkan" },
{ "Rendering.Mode.Vulkan.Fix", "FFlagRenderVulkanFixMinimizeWindow" },
{ "Rendering.Mode.OpenGL", "FFlagDebugGraphicsPreferOpenGL" },
{ "Rendering.Lighting.Voxel", "DFFlagDebugRenderForceTechnologyVoxel" }, { "Rendering.Lighting.Voxel", "DFFlagDebugRenderForceTechnologyVoxel" },
{ "Rendering.Lighting.ShadowMap", "FFlagDebugForceFutureIsBrightPhase2" }, { "Rendering.Lighting.ShadowMap", "FFlagDebugForceFutureIsBrightPhase2" },
{ "Rendering.Lighting.Future", "FFlagDebugForceFutureIsBrightPhase3" }, { "Rendering.Lighting.Future", "FFlagDebugForceFutureIsBrightPhase3" },
@ -53,16 +47,6 @@ namespace Bloxstrap
{ "UI.Menu.Style.ABTest.4", "FFlagEnableV3MenuABTest3" } { "UI.Menu.Style.ABTest.4", "FFlagEnableV3MenuABTest3" }
}; };
// only one missing here is Metal because lol
public static IReadOnlyDictionary<string, string> RenderingModes => new Dictionary<string, string>
{
{ "Automatic", "None" },
{ "Vulkan", "Vulkan" },
{ "Direct3D 11", "D3D11" },
{ "Direct3D 10", "D3D10" },
{ "OpenGL", "OpenGL" }
};
public static IReadOnlyDictionary<string, string> LightingModes => new Dictionary<string, string> public static IReadOnlyDictionary<string, string> LightingModes => new Dictionary<string, string>
{ {
{ "Chosen by game", "None" }, { "Chosen by game", "None" },
@ -199,14 +183,6 @@ namespace Bloxstrap
return mapping.First().Key; return mapping.First().Key;
} }
public void CheckManualFullscreenPreset()
{
if (GetPreset("Rendering.Mode.Vulkan") == "True" || GetPreset("Rendering.Mode.OpenGL") == "True")
SetPreset("Rendering.ManualFullscreen", null);
else
SetPreset("Rendering.ManualFullscreen", "False");
}
public override void Save() public override void Save()
{ {
// convert all flag values to strings before saving // convert all flag values to strings before saving
@ -221,7 +197,8 @@ namespace Bloxstrap
{ {
base.Load(); base.Load();
CheckManualFullscreenPreset(); if (GetPreset("Rendering.ManualFullscreen") != "False")
SetPreset("Rendering.ManualFullscreen", "False");
// TODO - remove when activity tracking has been revamped // TODO - remove when activity tracking has been revamped
if (GetPreset("Network.Log") != "7") if (GetPreset("Network.Log") != "7")

10
Bloxstrap/InstallChecker.cs
View File

@ -227,6 +227,16 @@ namespace Bloxstrap
if (App.FastFlags.GetPreset("UI.Menu.Style.DisableV2") is not null) if (App.FastFlags.GetPreset("UI.Menu.Style.DisableV2") is not null)
App.FastFlags.SetPreset("UI.Menu.Style.ABTest", false); App.FastFlags.SetPreset("UI.Menu.Style.ABTest", false);
App.FastFlags.Save();
}
else if (existingVersionInfo.ProductVersion == "2.5.3")
{
App.FastFlags.SetValue("FFlagDebugGraphicsPreferD3D11", null);
App.FastFlags.SetValue("FFlagDebugGraphicsPreferD3D11FL10", null);
App.FastFlags.SetValue("FFlagDebugGraphicsPreferVulkan", null);
App.FastFlags.SetValue("FFlagRenderVulkanFixMinimizeWindow", null);
App.FastFlags.SetValue("FFlagDebugGraphicsPreferOpenGL", null);
App.FastFlags.Save(); App.FastFlags.Save();
} }
} }

9
Bloxstrap/UI/Elements/Menu/Pages/FastFlagsPage.xaml
View File

@ -162,15 +162,6 @@
</ui:CardControl.Header> </ui:CardControl.Header>
<ui:ToggleSwitch IsChecked="{Binding Pre2022TexturesEnabled, Mode=TwoWay}" /> <ui:ToggleSwitch IsChecked="{Binding Pre2022TexturesEnabled, Mode=TwoWay}" />
</ui:CardControl> </ui:CardControl>
<ui:CardControl Margin="0,8,0,0">
<ui:CardControl.Header>
<StackPanel>
<TextBlock FontSize="14" Text="Rendering mode" />
<TextBlock Margin="0,2,0,0" FontSize="12" Text="Choose what renderer Roblox should use. VR requires Direct3D/Automatic." Foreground="{DynamicResource TextFillColorTertiaryBrush}" />
</StackPanel>
</ui:CardControl.Header>
<ComboBox Margin="5,0,0,0" Padding="10,5,10,5" Width="200" ItemsSource="{Binding RenderingModes.Keys, Mode=OneTime}" Text="{Binding SelectedRenderingMode, Mode=TwoWay}" />
</ui:CardControl>
<ui:CardControl Margin="0,8,0,0"> <ui:CardControl Margin="0,8,0,0">
<ui:CardControl.Header> <ui:CardControl.Header>
<StackPanel> <StackPanel>

12
Bloxstrap/UI/ViewModels/Menu/FastFlagsViewModel.cs
View File

@ -58,18 +58,6 @@ namespace Bloxstrap.UI.ViewModels.Menu
set => App.FastFlags.SetPreset("Rendering.Framerate", value); set => App.FastFlags.SetPreset("Rendering.Framerate", value);
} }
public IReadOnlyDictionary<string, string> RenderingModes => FastFlagManager.RenderingModes;
public string SelectedRenderingMode
{
get => App.FastFlags.GetPresetEnum(RenderingModes, "Rendering.Mode", "True");
set
{
App.FastFlags.SetPresetEnum("Rendering.Mode", RenderingModes[value], "True");
App.FastFlags.CheckManualFullscreenPreset();
}
}
public bool FixDisplayScaling public bool FixDisplayScaling
{ {
get => App.FastFlags.GetPreset("Rendering.DisableScaling") == "True"; get => App.FastFlags.GetPreset("Rendering.DisableScaling") == "True";