Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add Anisotropic Sampling option to ZZZ GSP #703

Merged
merged 4 commits into from
Mar 22, 2025
Merged

Add Anisotropic Sampling option to ZZZ GSP #703

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
21df6d8
Add Anisotropic Sampling option to ZZZ GSP
Cryotechnic Mar 16, 2025
23b77ee
Merge branch 'main' into imp/zzz-gsp-16
Cryotechnic Mar 16, 2025
6d33baf
Changes based on feedback
Cryotechnic Mar 22, 2025
46ccb18
Merge remote-tracking branch 'origin/main' into imp/zzz-gsp-16
Cryotechnic Mar 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions CollapseLauncher/Classes/GameManagement/GameSettings/Zenless/Enums.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,20 @@ public enum AudioPlaybackDevice
TV = 3
}

/// <summary>
/// Available options for graphics settings that have 5 options <br/>
/// 1x, 2x, 4x, 8x, 16x
/// Default : 8x [3]
/// </summary>
public enum AnisotropicSamplingOption
{
x1,
x2,
x4,
x8,
x16
}

public static class ServerName
{
public const string Europe = "prod_gf_eu";
Expand Down
19 changes: 18 additions & 1 deletion CollapseLauncher/Classes/GameManagement/GameSettings/Zenless/FileClass/GeneralData.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -499,7 +499,24 @@ public QualityOption2 EnvironmentQuality
.GetDataEnum<QualityOption2>();
set => _envQualityData?.SetDataEnum(value);
}


// Key 16184 Anisotropic Sampling
private SystemSettingLocalData<AnisotropicSamplingOption>? _anisotropicSamplingData;

/// <summary>
/// Sets the in-game quality settings for Anisotropic Sampling
/// </summary>
/// <see cref="AnisotropicSamplingOption"/>

[JsonIgnore]
public AnisotropicSamplingOption AnisotropicSampling
{
get => (_anisotropicSamplingData ??= SystemSettingDataMap
.AsSystemSettingLocalData("16184", AnisotropicSamplingOption.x8))
.GetDataEnum<AnisotropicSamplingOption>();
set => _anisotropicSamplingData?.SetDataEnum(value);
}

// Key 12155 Global Illumination
private SystemSettingLocalData<QualityOption3>? _envGlobalIllumination;

Expand Down
69 changes: 39 additions & 30 deletions CollapseLauncher/XAMLs/MainApp/Pages/GameSettingsPages/ZenlessGameSettingsPage.Ext.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ private void PresetSelector(object sender, SelectionChangedEventArgs _)
ShadingQualitySelector.SelectedIndex = (int)QualityOption3.High;
CharacterQualitySelector.SelectedIndex = (int)QualityOption2.High;
EnvironmentQualitySelector.SelectedIndex = (int)QualityOption2.High;
AnisotropicSamplingSelector.SelectedIndex = (int)AnisotropicSamplingOption.x8;
ReflectionQualitySelector.SelectedIndex = (int)QualityOption4.High;
VolumetricFogSelector.SelectedIndex = (int)QualityOption4.High;
HpcaSelector.SelectedIndex = (int)HiPrecisionCharaAnimOption.Dynamic;
Expand All @@ -56,38 +57,40 @@ private void PresetSelector(object sender, SelectionChangedEventArgs _)
MotionBlurToggle.IsChecked = true;
break;
case GraphicsPresetOption.Medium:
VSyncToggle.IsChecked = true;
RenderResolutionSelector.SelectedIndex = (int)RenderResOption.f10;
AntiAliasingSelector.SelectedIndex = (int)AntiAliasingOption.TAA;
GlobalIlluminationSelector.SelectedIndex = (int)QualityOption3.High;
ShadowQualitySelector.SelectedIndex = (int)QualityOption3.High;
FxQualitySelector.SelectedIndex = (int)QualityOption5.Medium;
ShadingQualitySelector.SelectedIndex = (int)QualityOption3.High;
CharacterQualitySelector.SelectedIndex = (int)QualityOption2.High;
EnvironmentQualitySelector.SelectedIndex = (int)QualityOption2.High;
ReflectionQualitySelector.SelectedIndex = (int)QualityOption4.Medium;
VolumetricFogSelector.SelectedIndex = (int)QualityOption4.Medium;
HpcaSelector.SelectedIndex = (int)HiPrecisionCharaAnimOption.Off;
BloomToggle.IsChecked = true;
DistortionToggle.IsChecked = true;
MotionBlurToggle.IsChecked = true;
VSyncToggle.IsChecked = true;
RenderResolutionSelector.SelectedIndex = (int)RenderResOption.f10;
AntiAliasingSelector.SelectedIndex = (int)AntiAliasingOption.TAA;
GlobalIlluminationSelector.SelectedIndex = (int)QualityOption3.High;
ShadowQualitySelector.SelectedIndex = (int)QualityOption3.High;
FxQualitySelector.SelectedIndex = (int)QualityOption5.Medium;
ShadingQualitySelector.SelectedIndex = (int)QualityOption3.High;
CharacterQualitySelector.SelectedIndex = (int)QualityOption2.High;
EnvironmentQualitySelector.SelectedIndex = (int)QualityOption2.High;
AnisotropicSamplingSelector.SelectedIndex = (int)AnisotropicSamplingOption.x8;
ReflectionQualitySelector.SelectedIndex = (int)QualityOption4.Medium;
VolumetricFogSelector.SelectedIndex = (int)QualityOption4.Medium;
HpcaSelector.SelectedIndex = (int)HiPrecisionCharaAnimOption.Off;
BloomToggle.IsChecked = true;
DistortionToggle.IsChecked = true;
MotionBlurToggle.IsChecked = true;
break;
case GraphicsPresetOption.Low:
VSyncToggle.IsChecked = true;
RenderResolutionSelector.SelectedIndex = (int)RenderResOption.f10;
AntiAliasingSelector.SelectedIndex = (int)AntiAliasingOption.TAA;
GlobalIlluminationSelector.SelectedIndex = (int)QualityOption3.Low;
ShadowQualitySelector.SelectedIndex = (int)QualityOption3.Medium;
FxQualitySelector.SelectedIndex = (int)QualityOption5.Low;
ShadingQualitySelector.SelectedIndex = (int)QualityOption3.High;
CharacterQualitySelector.SelectedIndex = (int)QualityOption2.High;
EnvironmentQualitySelector.SelectedIndex = (int)QualityOption2.High;
ReflectionQualitySelector.SelectedIndex = (int)QualityOption4.Low;
VolumetricFogSelector.SelectedIndex = (int)QualityOption4.Low;
HpcaSelector.SelectedIndex = (int)HiPrecisionCharaAnimOption.Off;
BloomToggle.IsChecked = true;
DistortionToggle.IsChecked = true;
MotionBlurToggle.IsChecked = true;
VSyncToggle.IsChecked = true;
RenderResolutionSelector.SelectedIndex = (int)RenderResOption.f10;
AntiAliasingSelector.SelectedIndex = (int)AntiAliasingOption.TAA;
GlobalIlluminationSelector.SelectedIndex = (int)QualityOption3.Low;
ShadowQualitySelector.SelectedIndex = (int)QualityOption3.Medium;
FxQualitySelector.SelectedIndex = (int)QualityOption5.Low;
ShadingQualitySelector.SelectedIndex = (int)QualityOption3.High;
CharacterQualitySelector.SelectedIndex = (int)QualityOption2.High;
EnvironmentQualitySelector.SelectedIndex = (int)QualityOption2.High;
AnisotropicSamplingSelector.SelectedIndex = (int)AnisotropicSamplingOption.x8;
ReflectionQualitySelector.SelectedIndex = (int)QualityOption4.Low;
VolumetricFogSelector.SelectedIndex = (int)QualityOption4.Low;
HpcaSelector.SelectedIndex = (int)HiPrecisionCharaAnimOption.Off;
BloomToggle.IsChecked = true;
DistortionToggle.IsChecked = true;
MotionBlurToggle.IsChecked = true;
break;
}

Expand Down Expand Up @@ -562,6 +565,12 @@ public int Graphics_Environment
get => (int)Settings.GeneralData.EnvironmentQuality;
set => Settings.GeneralData.EnvironmentQuality = (QualityOption2)value;
}

public int Graphics_AnisotropicSampling
{
get => (int)Settings.GeneralData.AnisotropicSampling;
set => Settings.GeneralData.AnisotropicSampling = (AnisotropicSamplingOption)value;
}

public int Graphics_GlobalIllumination
{
Expand Down
21 changes: 20 additions & 1 deletion CollapseLauncher/XAMLs/MainApp/Pages/GameSettingsPages/ZenlessGameSettingsPage.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -462,6 +462,25 @@
<ColumnDefinition />
</Grid.ColumnDefinitions>
<StackPanel Grid.Column="0">
<TextBlock Margin="0,0,8,8"
HorizontalAlignment="Left"
Style="{ThemeResource BodyStrongTextBlockStyle}"
Text="{x:Bind helper:Locale.Lang._ZenlessGameSettingsPage.Graphics_AnisotropicSampling}"
TextWrapping="WrapWholeWords" />
<ComboBox x:Name="AnisotropicSamplingSelector"
Margin="0,0,16,8"
HorizontalAlignment="Stretch"
CornerRadius="14"
SelectedIndex="{x:Bind Graphics_AnisotropicSampling, Mode=TwoWay}"
SelectionChanged="EnforceCustomPreset_ComboBox">
<ComboBoxItem Content="1x" />
<ComboBoxItem Content="2x" />
<ComboBoxItem Content="4x" />
<ComboBoxItem Content="8x" />
<ComboBoxItem Content="16x" />
</ComboBox>
</StackPanel>
<StackPanel Grid.Column="1">
<TextBlock Margin="0,0,8,8"
HorizontalAlignment="Left"
Style="{ThemeResource BodyStrongTextBlockStyle}"
Expand All @@ -479,7 +498,7 @@
<ComboBoxItem Content="{x:Bind helper:Locale.Lang._GameSettingsPage.SpecHigh}" />
</ComboBox>
</StackPanel>
<StackPanel Grid.Column="1">
<StackPanel Grid.Column="2">
<TextBlock Margin="0,0,8,8"
HorizontalAlignment="Left"
Style="{ThemeResource BodyStrongTextBlockStyle}"
Expand Down
3 changes: 3 additions & 0 deletions Hi3Helper.Core/Lang/Locale/LangZenlessGameSettingsPage.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,9 @@ public sealed partial class LangZenlessGameSettingsPage
public string Graphics_Distortion { get; set; } =
LangFallback?._ZenlessGameSettingsPage.Graphics_Distortion;

public string Graphics_AnisotropicSampling { get; set; } =
LangFallback?._ZenlessGameSettingsPage.Graphics_AnisotropicSampling;

public string Graphics_HighPrecisionCharacterAnimation { get; set; } =
LangFallback?._ZenlessGameSettingsPage.Graphics_HighPrecisionCharacterAnimation;

Expand Down
1 change: 1 addition & 0 deletions Hi3Helper.Core/Lang/en_US.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1574,6 +1574,7 @@
"Graphics_EffectsQ": "Effects Quality",
"Graphics_ShadingQ": "Shading Quality",
"Graphics_Distortion": "Distortion",
"Graphics_AnisotropicSampling": "Anisotropic Sampling",
"Graphics_HighPrecisionCharacterAnimation": "High-Precision Character Animation",
"Audio_PlaybackDev": "Audio Playback Device",
"Audio_PlaybackDev_Headphones": "Headphones",
Expand Down
Loading