diff --git a/src/ImeSense.ShaderPlayground/App.axaml.cs b/src/ImeSense.ShaderPlayground/App.axaml.cs index 5fd7555..040b147 100644 --- a/src/ImeSense.ShaderPlayground/App.axaml.cs +++ b/src/ImeSense.ShaderPlayground/App.axaml.cs @@ -24,9 +24,6 @@ private static IServiceCollection ConfigureServices() { services.AddSingleton(); services.AddSingleton(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); services.AddTransient(); diff --git a/src/ImeSense.ShaderPlayground/ViewModels/MainViewModel.cs b/src/ImeSense.ShaderPlayground/ViewModels/MainViewModel.cs index 7a3ba89..078f529 100644 --- a/src/ImeSense.ShaderPlayground/ViewModels/MainViewModel.cs +++ b/src/ImeSense.ShaderPlayground/ViewModels/MainViewModel.cs @@ -10,15 +10,11 @@ namespace ImeSense.ShaderPlayground.ViewModels; public class MainViewModel : ReactiveObject { - private readonly MenuViewModel _menuViewModel; - private readonly ShaderViewModel _shaderViewModel; private readonly ViewportViewModel _viewPortViewModel; private readonly LogViewModel _logViewModel; public MainViewModel(IServiceProvider serviceProvider) { - _menuViewModel = serviceProvider.GetRequiredService(); - _shaderViewModel = serviceProvider.GetRequiredService(); _viewPortViewModel = serviceProvider.GetRequiredService(); _logViewModel = serviceProvider.GetRequiredService(); @@ -27,22 +23,16 @@ public MainViewModel(IServiceProvider serviceProvider) { WindowWidth = 900; WindowTitle = "Shader Playground"; - MenuContext = _menuViewModel; - ShaderContext = _shaderViewModel; ViewportContext = _viewPortViewModel; LogContext = _logViewModel; } public MainViewModel() { - _menuViewModel = null!; - _shaderViewModel = null!; _viewPortViewModel = null!; _logViewModel = null!; - MenuContext = null!; - ShaderContext = null!; } @@ -76,13 +66,6 @@ public string WindowTitle { set => this.RaiseAndSetIfChanged(ref _windowTitle, value); } - private ReactiveObject _menuContext = new(); - - public ReactiveObject MenuContext { - get => _menuContext; - init => this.RaiseAndSetIfChanged(ref _menuContext, value); - } - private ReactiveObject _shaderContext = new(); public ReactiveObject ShaderContext { diff --git a/src/ImeSense.ShaderPlayground/ViewModels/MenuViewModel.cs b/src/ImeSense.ShaderPlayground/ViewModels/MenuViewModel.cs deleted file mode 100644 index c3be2a8..0000000 --- a/src/ImeSense.ShaderPlayground/ViewModels/MenuViewModel.cs +++ /dev/null @@ -1,52 +0,0 @@ -using ReactiveUI; - -namespace ImeSense.ShaderPlayground.ViewModels; - -public class MenuViewModel : ReactiveObject { - public MenuViewModel() { - FileHeader = "Файл"; - ToolsHeader = "Инструменты"; - SettingsHeader = "Настройки"; - HelpHeader = "Помощь"; - } - - private string _fileHeader = string.Empty; - - /// - /// Меню файл - /// - public string FileHeader { - get => _fileHeader; - set => this.RaiseAndSetIfChanged(ref _fileHeader, value); - } - - private string _toolsHeader = string.Empty; - - /// - /// Меню инструменты - /// - public string ToolsHeader { - get => _toolsHeader; - set => this.RaiseAndSetIfChanged(ref _toolsHeader, value); - } - - private string _settingsHeader = string.Empty; - - /// - /// Меню настройки - /// - public string SettingsHeader { - get => _settingsHeader; - set => this.RaiseAndSetIfChanged(ref _settingsHeader, value); - } - - private string _helpHeader = string.Empty; - - /// - /// Меню помощь - /// - public string HelpHeader { - get => _helpHeader; - set => this.RaiseAndSetIfChanged(ref _helpHeader, value); - } -} diff --git a/src/ImeSense.ShaderPlayground/Views/MainWindow.axaml b/src/ImeSense.ShaderPlayground/Views/MainWindow.axaml index 80623dd..58107b4 100644 --- a/src/ImeSense.ShaderPlayground/Views/MainWindow.axaml +++ b/src/ImeSense.ShaderPlayground/Views/MainWindow.axaml @@ -17,9 +17,55 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - diff --git a/src/ImeSense.ShaderPlayground/Views/MenuView.axaml.cs b/src/ImeSense.ShaderPlayground/Views/MenuView.axaml.cs deleted file mode 100644 index acf682a..0000000 --- a/src/ImeSense.ShaderPlayground/Views/MenuView.axaml.cs +++ /dev/null @@ -1,7 +0,0 @@ -using Avalonia.Controls; - -namespace ImeSense.ShaderPlayground.Views; - -public partial class MenuView : UserControl { - public MenuView() => InitializeComponent(); -} diff --git a/src/ImeSense.ShaderPlayground/Views/Toolbars/ViewportView.axaml b/src/ImeSense.ShaderPlayground/Views/Toolbars/ViewportView.axaml index c47f8dd..772ed2f 100644 --- a/src/ImeSense.ShaderPlayground/Views/Toolbars/ViewportView.axaml +++ b/src/ImeSense.ShaderPlayground/Views/Toolbars/ViewportView.axaml @@ -19,14 +19,11 @@ HorizontalAlignment="Center" Orientation="Horizontal">