From 90a128cb5a81f3025fc5fad2d24e119a0ca0f043 Mon Sep 17 00:00:00 2001 From: Gleb Date: Thu, 2 May 2024 15:01:44 +0100 Subject: [PATCH] CameraOperator in the scene --- .config/dotnet-tools.json | 2 +- Content/Common/Data/Scenes/Scene.scene | 14 +++++-- Content/Common/Data/UI/Options.rml | 32 +-------------- Directory.Build.props | 2 +- RbfxTemplate/GameSettings.cs | 46 +++++++++++++++++++++ RbfxTemplate/GameState.cs | 10 ++--- RbfxTemplate/SettingsMenuState.cs | 56 ++++++++++++++++++++++++++ RbfxTemplate/UrhoApplication.cs | 46 +++++++++++++++++++-- RbfxTemplate/UrhoPluginApplication.cs | 19 +++++---- 9 files changed, 172 insertions(+), 55 deletions(-) create mode 100644 RbfxTemplate/GameSettings.cs create mode 100644 RbfxTemplate/SettingsMenuState.cs diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 355b7f7..09bc81c 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -9,7 +9,7 @@ ] }, "unofficial.Urho3DNet.Editor": { - "version": "0.3.7.792", + "version": "0.3.7.800", "commands": [ "rbfx" ] diff --git a/Content/Common/Data/Scenes/Scene.scene b/Content/Common/Data/Scenes/Scene.scene index 39bc6c4..8bf270e 100644 --- a/Content/Common/Data/Scenes/Scene.scene +++ b/Content/Common/Data/Scenes/Scene.scene @@ -2,7 +2,7 @@ - + @@ -21,7 +21,7 @@ - + @@ -73,7 +73,7 @@ - + @@ -82,7 +82,13 @@ - + + + + + + + diff --git a/Content/Common/Data/UI/Options.rml b/Content/Common/Data/UI/Options.rml index 70acac6..ecf3cb8 100644 --- a/Content/Common/Data/UI/Options.rml +++ b/Content/Common/Data/UI/Options.rml @@ -36,43 +36,13 @@ - +
Settings

- - - - - - - - -
- - - -
- - - -
diff --git a/Directory.Build.props b/Directory.Build.props index e4baffc..4c3e518 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,6 +1,6 @@ - 0.3.7.792 + 0.3.7.800 \ No newline at end of file diff --git a/RbfxTemplate/GameSettings.cs b/RbfxTemplate/GameSettings.cs new file mode 100644 index 0000000..61cb0aa --- /dev/null +++ b/RbfxTemplate/GameSettings.cs @@ -0,0 +1,46 @@ +using Urho3DNet; + +namespace RbfxTemplate +{ + /// + /// Settings file content. + /// + public class GameSettings + { + private static readonly string SOUND_MASTER = "Master"; + + private static readonly string SOUND_EFFECT = "Effect"; + + //static readonly string SOUND_AMBIENT = "Ambient"; + //static readonly string SOUND_VOICE = "Voice"; + private static readonly string SOUND_MUSIC = "Music"; + + /// + /// Get or set master volume. + /// + public float MasterVolume { get; set; } = 1.0f; + + /// + /// Get or set music volume. + /// + public float MusicVolume { get; set; } = 1.0f; + + /// + /// Get or set effects volume. + /// + public float EffectVolume { get; set; } = 1.0f; + + /// + /// Apply settings to the application global settings. + /// + /// Application context. + public void Apply(Context context) + { + var audio = context.GetSubsystem