diff --git a/assets/locales.json b/assets/locales.json
index 56cf9aacb..9cf3bf732 100644
--- a/assets/locales.json
+++ b/assets/locales.json
@@ -5998,87 +5998,12 @@
}
},
{
- "ID": "SettingsTabTweaks",
- "Translations": {
- "ar_SA": "باتشات",
- "de_DE": "Tweaks",
- "el_GR": "Patches",
- "en_US": "Tweaks",
- "es_ES": "Parches",
- "fr_FR": "Patches",
- "he_IL": "פאצ'ים",
- "it_IT": "Tweaks",
- "ja_JP": "パッチ",
- "ko_KR": "패치",
- "no_NO": "Patcher",
- "pl_PL": "Tweak'i",
- "pt_BR": "Patches",
- "ru_RU": "Твики",
- "sv_SE": "Patcher",
- "th_TH": "แพตช์",
- "tr_TR": "Tweaks",
- "uk_UA": "Твіки",
- "zh_CN": "补丁",
- "zh_TW": "補丁"
- }
- },
- {
- "ID": "SettingsTabTweaksTitle",
- "Translations": {
- "ar_SA": "باتشات: تجارب وتحديثات",
- "de_DE": "Tweaks: Experimente & Patches",
- "el_GR": "Patches: Πειράματα & Διορθώσεις",
- "en_US": "Tweaks: Experiments & Patches",
- "es_ES": "Parches: Experimentos y Ajustes",
- "fr_FR": "Patches : Expériences et Corrections",
- "he_IL": "פאצ'ים: ניסויים ותיקונים",
- "it_IT": "Tweaks: Esperimenti e Patch",
- "ja_JP": "パッチ: 実験と修正",
- "ko_KR": "패치: 실험 및 수정",
- "no_NO": "Patcher: Eksperimenter og Utbedringer",
- "pl_PL": "Tweak'i: Eksperymenty i Łatki",
- "pt_BR": "Patches: Experimentos e Correções",
- "ru_RU": "Твики: Эксперименты и Патчи",
- "sv_SE": "Patcher: Experiment och Korrigeringar",
- "th_TH": "แพตช์: การทดลองและการแก้ไข",
- "tr_TR": "Tweaks: Deneyler ve Yamalar",
- "uk_UA": "Твіки: Експерименти та Патчі",
- "zh_CN": "补丁:实验与修复",
- "zh_TW": "補丁:實驗與修復"
- }
- },
- {
- "ID": "SettingsTabTweaksDescription",
- "Translations": {
- "ar_SA": "تحذير! يجب تغيير هذه الخيارات فقط إذا كانت لعبتك لا تعمل بشكل صحيح.",
- "de_DE": "Warnung! Diese Optionen sollten nur geändert werden, wenn dein Spiel nicht ordnungsgemäß funktioniert.",
- "el_GR": "Προειδοποίηση! Αυτές οι ρυθμίσεις πρέπει να αλλάξουν μόνο αν το παιχνίδι σας δεν λειτουργεί σωστά.",
- "en_US": "Warning! These options should only be changed if your game is not working properly.",
- "es_ES": "Advertencia! Estas opciones deben cambiarse solo si tu juego no funciona correctamente.",
- "fr_FR": "Avertissement! Ces options doivent être modifiées uniquement si votre jeu ne fonctionne pas correctement.",
- "he_IL": "אזהרה! יש לשנות את האפשרויות הללו רק אם המשחק שלך לא פועל כראוי.",
- "it_IT": "Avviso! Queste opzioni devono essere modificate solo se il tuo gioco non funziona correttamente.",
- "ja_JP": "警告! ゲームが正常に動作しない場合にのみ、これらのオプションを変更してください。",
- "ko_KR": "경고! 게임이 제대로 작동하지 않으면 이 옵션들을 변경해야 합니다.",
- "no_NO": "Advarsel! Disse alternativene bør kun endres hvis spillet ditt ikke fungerer som det skal.",
- "pl_PL": "Ostrzeżenie! Te opcje należy zmienić tylko wtedy, gdy twoja gra nie działa poprawnie.",
- "pt_BR": "Aviso! Essas opções devem ser alteradas apenas se o seu jogo não estiver funcionando corretamente.",
- "ru_RU": "Предупреждение! Эти параметры следует изменить только в случае, если ваша игра работает неправильно.",
- "sv_SE": "Varning! Dessa alternativ bör endast ändras om ditt spel inte fungerar som det ska.",
- "th_TH": "คำเตือน! ควรเปลี่ยนตัวเลือกเหล่านี้เฉพาะในกรณีที่เกมของคุณทำงานไม่ถูกต้อง.",
- "tr_TR": "Uyarı! Bu seçenekler, oyununuz düzgün çalışmıyorsa yalnızca değiştirilmelidir.",
- "uk_UA": "Попередження! Ці налаштування слід змінити лише в тому випадку, якщо ваша гра не працює належним чином.",
- "zh_CN": "警告! 只有在游戏无法正常运行的情况下,请更改这些选项。",
- "zh_TW": "警告! 只有當遊戲無法正常運行時,請更改這些選項。"
- }
- },
- {
- "ID": "FixOcclusionCulling",
+ "ID": "DisableFixOcclusionCulling",
"Translations": {
"ar_SA": "",
"de_DE": "",
"el_GR": "",
- "en_US": "Fix Occlusion Culling - flickering of objects.",
+ "en_US": "Disable Fix Occlusion Culling - flickering of objects.",
"es_ES": "",
"fr_FR": "",
"he_IL": "",
@@ -6098,7 +6023,7 @@
}
},
{
- "ID": "FixOcclusionCullingTooltip",
+ "ID": "DisableFixOcclusionCullingTooltip",
"Translations": {
"ar_SA": "",
"de_DE": "",
diff --git a/src/Ryujinx.Graphics.Gpu/Engine/Threed/SemaphoreUpdater.cs b/src/Ryujinx.Graphics.Gpu/Engine/Threed/SemaphoreUpdater.cs
index 2b5fbe034..b9ac4f7ba 100644
--- a/src/Ryujinx.Graphics.Gpu/Engine/Threed/SemaphoreUpdater.cs
+++ b/src/Ryujinx.Graphics.Gpu/Engine/Threed/SemaphoreUpdater.cs
@@ -165,7 +165,7 @@ namespace Ryujinx.Graphics.Gpu.Engine.Threed
Timestamp = ticks,
};
- if (GraphicsConfig.FixOcclusionCulling && result <= 0)
+ if (!GraphicsConfig.DisableFixOcclusionCulling && result <= 0)
{
return;
}
diff --git a/src/Ryujinx.Graphics.Gpu/GraphicsConfig.cs b/src/Ryujinx.Graphics.Gpu/GraphicsConfig.cs
index 160f43abd..48fabbcc0 100644
--- a/src/Ryujinx.Graphics.Gpu/GraphicsConfig.cs
+++ b/src/Ryujinx.Graphics.Gpu/GraphicsConfig.cs
@@ -76,7 +76,7 @@ namespace Ryujinx.Graphics.Gpu
///
/// Enables or disables fix occlusion culling.
///
- public static bool FixOcclusionCulling = true;
+ public static bool DisableFixOcclusionCulling = true;
}
#pragma warning restore CA2211
}
diff --git a/src/Ryujinx/Systems/Configuration/ConfigurationFileFormat.cs b/src/Ryujinx/Systems/Configuration/ConfigurationFileFormat.cs
index 8de256d46..e3543001e 100644
--- a/src/Ryujinx/Systems/Configuration/ConfigurationFileFormat.cs
+++ b/src/Ryujinx/Systems/Configuration/ConfigurationFileFormat.cs
@@ -472,7 +472,7 @@ namespace Ryujinx.Ava.Systems.Configuration
///
/// Fixes Occlusion Culling in Games (test feature)
///
- public bool FixOcclusionCulling { get; set; }
+ public bool DisableFixOcclusionCulling { get; set; }
///
/// Loads a configuration file from disk
diff --git a/src/Ryujinx/Systems/Configuration/ConfigurationState.Migration.cs b/src/Ryujinx/Systems/Configuration/ConfigurationState.Migration.cs
index e7c7c6161..29c64c19e 100644
--- a/src/Ryujinx/Systems/Configuration/ConfigurationState.Migration.cs
+++ b/src/Ryujinx/Systems/Configuration/ConfigurationState.Migration.cs
@@ -156,7 +156,7 @@ namespace Ryujinx.Ava.Systems.Configuration
Multiplayer.LdnPassphrase.Value = cff.MultiplayerLdnPassphrase;
Multiplayer.LdnServer.Value = cff.LdnServer;
- Tweaks.FixOcclusionCulling.Value = cff.FixOcclusionCulling;
+ Tweaks.DisableFixOcclusionCulling.Value = cff.DisableFixOcclusionCulling;
{
Hacks.ShowDirtyHacks.Value = cff.ShowDirtyHacks;
@@ -464,7 +464,7 @@ namespace Ryujinx.Ava.Systems.Configuration
};
}),
(69, static cff => cff.SkipUserProfiles = false),
- (70, static cff => cff.FixOcclusionCulling = false)
+ (70, static cff => cff.DisableFixOcclusionCulling = false)
);
}
}
diff --git a/src/Ryujinx/Systems/Configuration/ConfigurationState.Model.cs b/src/Ryujinx/Systems/Configuration/ConfigurationState.Model.cs
index f252dfb41..6609c7a95 100644
--- a/src/Ryujinx/Systems/Configuration/ConfigurationState.Model.cs
+++ b/src/Ryujinx/Systems/Configuration/ConfigurationState.Model.cs
@@ -651,10 +651,10 @@ namespace Ryujinx.Ava.Systems.Configuration
///
/// Enable or disable Fix Occlusion Culling
///
- public ReactiveObject FixOcclusionCulling { get; private set; }
+ public ReactiveObject DisableFixOcclusionCulling { get; private set; }
public TweaksSection()
{
- FixOcclusionCulling = new ReactiveObject();
+ DisableFixOcclusionCulling = new ReactiveObject();
}
}
diff --git a/src/Ryujinx/Systems/Configuration/ConfigurationState.cs b/src/Ryujinx/Systems/Configuration/ConfigurationState.cs
index b2ae2453e..b156ea9b0 100644
--- a/src/Ryujinx/Systems/Configuration/ConfigurationState.cs
+++ b/src/Ryujinx/Systems/Configuration/ConfigurationState.cs
@@ -147,7 +147,7 @@ namespace Ryujinx.Ava.Systems.Configuration
LdnServer = Multiplayer.LdnServer,
ShowDirtyHacks = Hacks.ShowDirtyHacks,
DirtyHacks = Hacks.EnabledHacks.Select(it => it.Pack()).ToArray(),
- FixOcclusionCulling = Tweaks.FixOcclusionCulling,
+ DisableFixOcclusionCulling = Tweaks.DisableFixOcclusionCulling,
};
return configurationFile;
@@ -321,7 +321,7 @@ namespace Ryujinx.Ava.Systems.Configuration
},
}
];
- Tweaks.FixOcclusionCulling.Value = true;
+ Tweaks.DisableFixOcclusionCulling.Value = true;
}
private static GraphicsBackend DefaultGraphicsBackend()
diff --git a/src/Ryujinx/UI/ViewModels/SettingsViewModel.cs b/src/Ryujinx/UI/ViewModels/SettingsViewModel.cs
index e3f034acd..974333e5f 100644
--- a/src/Ryujinx/UI/ViewModels/SettingsViewModel.cs
+++ b/src/Ryujinx/UI/ViewModels/SettingsViewModel.cs
@@ -383,7 +383,7 @@ namespace Ryujinx.Ava.UI.ViewModels
}
}
- public bool FixOcclusionCulling { get; set; }
+ public bool DisableFixOcclusionCulling { get; set; }
public SettingsViewModel(
VirtualFileSystem virtualFileSystem,
@@ -663,7 +663,7 @@ namespace Ryujinx.Ava.UI.ViewModels
LdnServer = config.Multiplayer.LdnServer;
// Tweaks
- FixOcclusionCulling = config.Tweaks.FixOcclusionCulling.Value;
+ DisableFixOcclusionCulling = config.Tweaks.DisableFixOcclusionCulling.Value;
}
public void SaveSettings()
@@ -791,7 +791,7 @@ namespace Ryujinx.Ava.UI.ViewModels
DirtyHacks.NifmDisableIsAnyInternetRequestAccepted;
// Tweaks
- config.Tweaks.FixOcclusionCulling.Value = FixOcclusionCulling;
+ config.Tweaks.DisableFixOcclusionCulling.Value = DisableFixOcclusionCulling;
config.ToFileFormat().SaveConfig(Program.ConfigurationPath);
diff --git a/src/Ryujinx/UI/Views/Settings/SettingsHacksView.axaml b/src/Ryujinx/UI/Views/Settings/SettingsHacksView.axaml
index 229f9e866..f2968173b 100644
--- a/src/Ryujinx/UI/Views/Settings/SettingsHacksView.axaml
+++ b/src/Ryujinx/UI/Views/Settings/SettingsHacksView.axaml
@@ -4,12 +4,25 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+ xmlns:ext="clr-namespace:Ryujinx.Ava.Common.Markup"
xmlns:viewModels="clr-namespace:Ryujinx.Ava.UI.ViewModels"
mc:Ignorable="d"
x:DataType="viewModels:SettingsViewModel">
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/Ryujinx/UI/Views/Settings/SettingsTweaksView.axaml b/src/Ryujinx/UI/Views/Settings/SettingsTweaksView.axaml
deleted file mode 100644
index 3d98f7038..000000000
--- a/src/Ryujinx/UI/Views/Settings/SettingsTweaksView.axaml
+++ /dev/null
@@ -1,65 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/Ryujinx/UI/Views/Settings/SettingsTweaksView.axaml.cs b/src/Ryujinx/UI/Views/Settings/SettingsTweaksView.axaml.cs
deleted file mode 100644
index 90ce69795..000000000
--- a/src/Ryujinx/UI/Views/Settings/SettingsTweaksView.axaml.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using Avalonia.Controls;
-
-namespace Ryujinx.Ava.UI.Views.Settings
-{
- public partial class SettingsTweaksView : UserControl
- {
- public SettingsTweaksView()
- {
- InitializeComponent();
- }
- }
-}
diff --git a/src/Ryujinx/UI/Windows/GameSpecificSettingsWindow.axaml b/src/Ryujinx/UI/Windows/GameSpecificSettingsWindow.axaml
index eef7103ca..f51f14c1e 100644
--- a/src/Ryujinx/UI/Windows/GameSpecificSettingsWindow.axaml
+++ b/src/Ryujinx/UI/Windows/GameSpecificSettingsWindow.axaml
@@ -34,7 +34,6 @@
-
@@ -102,10 +101,6 @@
Content="{ext:Locale SettingsTabGraphics}"
Tag="GraphicsPage"
IconSource="Image" />
-
-
@@ -89,10 +88,6 @@
Content="{ext:Locale SettingsTabGraphics}"
Tag="GraphicsPage"
IconSource="Image" />
-