Misaki/GhostEngine
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor project from Ghost.App to Ghost.Editor

Browse Source 
Changed the project structure to reflect a shift from `Ghost.App` to `Ghost.Editor`, updating namespaces and class names throughout.

Changed the application class in `App.xaml` and `App.xaml.cs` from `GhostApplication` to `EditorApplication`.

Changed several service interfaces to reside under `Ghost.Editor.Services.Contracts`, including `IInspectorService`, `INotificationService`, and `IProgressService`.

Added `InspectorView` and `InspectorViewModel` classes to manage inspector functionality.

Added `NavigationTabView` and `NavigationTabPage` classes to facilitate navigation within the editor.

Enhanced `WorldNode` and `EntityNode` classes to support scene graph functionality, including serialization and entity management.

Updated the project file `Ghost.Editor.csproj` to reflect the new structure and removed old references.

Modified the solution file `GhostEngine.sln` to remove references to `Ghost.App` and include `Ghost.Editor`.

Updated unit tests to align with the new namespaces and project structure.
This commit is contained in:
Misaki
2025-06-17 19:37:30 +09:00
parent ff14c0f49a
commit fc44c73ca8
80 changed files with 1244 additions and 309 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Ghost.App/View/Pages/EngineEditor/ConsolePage.xaml
View File

@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="utf-8" ?>
<Page
x:Class="Ghost.App.View.Pages.EngineEditor.ConsolePage"
x:Class="Ghost.Editor.View.Pages.EngineEditor.ConsolePage"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="using:Ghost.App.View.Pages.EngineEditor"
xmlns:local="using:Ghost.Editor.View.Pages.EngineEditor"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
mc:Ignorable="d">
@@ -17,9 +17,10 @@
<!-- Toolbar -->
<Grid
Grid.Row="0"
Background="{ThemeResource CardBackgroundFillColorSecondaryBrush}"
BorderBrush="{ThemeResource CardStrokeColorDefaultSolid}"
BorderThickness="0,0,0,1">
<CommandBar Background="{ThemeResource CardBackgroundFillColorSecondaryBrush}" DefaultLabelPosition="Collapsed">
<CommandBar DefaultLabelPosition="Collapsed">
<CommandBar.PrimaryCommands>
<AppBarButton Command="{x:Bind ViewModel.ClearLogsCommand}" Content="Clear" />
<AppBarSeparator />

6
Ghost.App/View/Pages/EngineEditor/ConsolePage.xaml.cs
View File

@@ -1,7 +1,7 @@
using Ghost.Editor.ViewModels.Pages.EngineEditor;
using Microsoft.UI.Xaml.Controls;
namespace Ghost.App.View.Pages.EngineEditor;
namespace Ghost.Editor.View.Pages.EngineEditor;
internal sealed partial class ConsolePage : Page
{
@@ -12,8 +12,8 @@ internal sealed partial class ConsolePage : Page
public ConsolePage()
{
ViewModel = GhostApplication.GetService<ConsoleViewModel>();
ViewModel = EditorApplication.GetService<ConsoleViewModel>();
InitializeComponent();
}
}
}

21
Ghost.App/View/Pages/EngineEditor/HierarchyPage.xaml
View File

@@ -1,15 +1,16 @@
<?xml version="1.0" encoding="utf-8" ?>
<Page
x:Class="Ghost.App.View.Pages.EngineEditor.HierarchyPage"
<internal:NavigationTabPage
x:Class="Ghost.Editor.View.Pages.EngineEditor.HierarchyPage"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="using:Ghost.App.View.Pages.EngineEditor"
xmlns:internal="using:Ghost.Editor.Controls.Internal"
xmlns:local="using:Ghost.Editor.View.Pages.EngineEditor"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:sg="using:Ghost.Editor.SceneGraph"
xmlns:sg="using:Ghost.Editor.Core.SceneGraph"
mc:Ignorable="d">
<Page.Resources>
<internal:NavigationTabPage.Resources>
<DataTemplate x:Key="SceneTemplate" x:DataType="sg:SceneGraphNode">
<TreeViewItem
AutomationProperties.Name="{x:Bind Name}"
@@ -25,19 +26,19 @@
<DataTemplate x:Key="EntityTemplate" x:DataType="sg:SceneGraphNode">
<TreeViewItem AutomationProperties.Name="{x:Bind Name}" ItemsSource="{x:Bind Children}">
<StackPanel Orientation="Horizontal">
<StackPanel Margin="10,0" Orientation="Horizontal">
<FontIcon FontSize="14" Glyph="&#xF158;" />
<TextBlock Margin="10,0" Text="{x:Bind Name}" />
<TextBlock Margin="5,0,0,0" Text="{x:Bind Name}" />
</StackPanel>
</TreeViewItem>
</DataTemplate>
</Page.Resources>
</internal:NavigationTabPage.Resources>
<Grid Padding="4,6" Background="{ThemeResource LayerFillColorDefaultBrush}">
<TreeView ItemsSource="{x:Bind ViewModel.SceneList}">
<TreeView ItemsSource="{x:Bind ViewModel.SceneList}" SelectionChanged="TreeView_SelectionChanged">
<TreeView.ItemTemplateSelector>
<local:HierarchyTemplateSector EntityTemplate="{StaticResource EntityTemplate}" WorldTemplate="{StaticResource SceneTemplate}" />
</TreeView.ItemTemplateSelector>
</TreeView>
</Grid>
</Page>
</internal:NavigationTabPage>

47
Ghost.App/View/Pages/EngineEditor/HierarchyPage.xaml.cs
View File

@@ -1,17 +1,17 @@
using Ghost.Editor.SceneGraph;
using Ghost.Editor.Contracts;
using Ghost.Editor.Controls.Internal;
using Ghost.Editor.Core.SceneGraph;
using Ghost.Editor.Services.Contracts;
using Ghost.Editor.ViewModels.Pages.EngineEditor;
using Microsoft.UI.Xaml;
using Microsoft.UI.Xaml.Controls;
// To learn more about WinUI, the WinUI project structure,
// and more about our project templates, see: http://aka.ms/winui-project-info.
namespace Ghost.Editor.View.Pages.EngineEditor;
namespace Ghost.App.View.Pages.EngineEditor;
/// <summary>
/// An empty page that can be used on its own or navigated to within a Frame.
/// </summary>
internal sealed partial class HierarchyPage : Page
internal sealed partial class HierarchyPage : NavigationTabPage
{
private readonly IInspectorService _inspectorService;
public HierarchyViewModel ViewModel
{
get;
@@ -19,9 +19,38 @@ internal sealed partial class HierarchyPage : Page
public HierarchyPage()
{
ViewModel = GhostApplication.GetService<HierarchyViewModel>();
_inspectorService = EditorApplication.GetService<IInspectorService>();
ViewModel = EditorApplication.GetService<HierarchyViewModel>();
InitializeComponent();
Header = "Hierarchy";
IconSource = new FontIconSource
{
Glyph = "\uE8A4"
};
}
public override void OnNavigatedTo(object? parameter)
{
ViewModel.OnNavigatedTo(parameter);
}
public override void OnNavigatedFrom()
{
ViewModel.OnNavigatedFrom();
}
private void TreeView_SelectionChanged(TreeView sender, TreeViewSelectionChangedEventArgs args)
{
if (args.AddedItems.Count > 0 && args.AddedItems[0] is IInspectable inspectable)
{
_inspectorService.SelectedInspectable = inspectable;
}
else
{
_inspectorService.SelectedInspectable = null;
}
}
}

45
Ghost.App/View/Pages/EngineEditor/InspectorPage.xaml Normal file
View File

@@ -0,0 +1,45 @@
<?xml version="1.0" encoding="utf-8" ?>
<internal:NavigationTabPage
x:Class="Ghost.Editor.View.Pages.EngineEditor.InspectorPage"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:internal="using:Ghost.Editor.Controls.Internal"
xmlns:local="using:Ghost.Editor.View.Pages.EngineEditor"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
mc:Ignorable="d">
<Grid Background="{ThemeResource LayerFillColorDefaultBrush}">
<Grid.RowDefinitions>
<RowDefinition Height="75" />
<RowDefinition Height="*" />
</Grid.RowDefinitions>
<!-- Header -->
<Grid
Grid.Row="0"
Padding="15,0,10,0"
Background="{ThemeResource CardBackgroundFillColorSecondaryBrush}"
BorderBrush="{ThemeResource CardStrokeColorDefaultSolid}"
BorderThickness="0,0,0,1">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<IconSourceElement
Grid.Column="0"
Margin="0,0,15,0"
HorizontalAlignment="Left"
VerticalAlignment="Center"
IconSource="{x:Bind ViewModel.Inspectable.Icon, Mode=OneWay}" />
<ContentPresenter Grid.Column="1" Content="{x:Bind ViewModel.Inspectable.HeaderContent(), Mode=OneWay}" />
</Grid>
<!-- Content -->
<Grid Grid.Row="1" Padding="10,0,10,0">
<ScrollViewer HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto">
<ContentPresenter Content="{x:Bind ViewModel.Inspectable.InspectorContent(), Mode=OneWay}" />
</ScrollViewer>
</Grid>
</Grid>
</internal:NavigationTabPage>

36
Ghost.App/View/Pages/EngineEditor/InspectorPage.xaml.cs Normal file
View File

@@ -0,0 +1,36 @@
using Ghost.Editor.Controls.Internal;
using Ghost.Editor.ViewModels.Pages.EngineEditor;
using Microsoft.UI.Xaml.Controls;
namespace Ghost.Editor.View.Pages.EngineEditor;
internal sealed partial class InspectorPage : NavigationTabPage
{
public InspectorViewModel ViewModel
{
get;
}
public InspectorPage()
{
ViewModel = EditorApplication.GetService<InspectorViewModel>();
InitializeComponent();
Header = "Inspector";
IconSource = new FontIconSource
{
Glyph = "\uEC7A"
};
}
public override void OnNavigatedTo(object? parameter)
{
ViewModel.OnNavigatedTo(parameter);
}
public override void OnNavigatedFrom()
{
ViewModel.OnNavigatedFrom();
}
}

6
Ghost.App/View/Pages/EngineEditor/ProjectPage.xaml
View File

@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="utf-8" ?>
<Page
x:Class="Ghost.App.View.Pages.EngineEditor.ProjectPage"
x:Class="Ghost.Editor.View.Pages.EngineEditor.ProjectPage"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:converter="using:Ghost.Editor.Utilities.Converters"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="using:Ghost.App.View.Pages.EngineEditor"
xmlns:local="using:Ghost.Editor.View.Pages.EngineEditor"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:model="using:Ghost.App.Models"
xmlns:model="using:Ghost.Editor.Models"
mc:Ignorable="d">
<Page.Resources>

8
Ghost.App/View/Pages/EngineEditor/ProjectPage.xaml.cs
View File

@@ -2,7 +2,7 @@ using Ghost.Editor.ViewModels.Pages.EngineEditor;
using Microsoft.UI.Xaml.Controls;
using Microsoft.UI.Xaml.Input;
namespace Ghost.App.View.Pages.EngineEditor;
namespace Ghost.Editor.View.Pages.EngineEditor;
internal sealed partial class ProjectPage : Page
{
@@ -13,13 +13,13 @@ internal sealed partial class ProjectPage : Page
public ProjectPage()
{
ViewModel = GhostApplication.GetService<ProjectViewModel>();
ViewModel = EditorApplication.GetService<ProjectViewModel>();
InitializeComponent();
}
private async void GridViewItem_DoubleTapped(object sender, DoubleTappedRoutedEventArgs e)
private void GridViewItem_DoubleTapped(object sender, DoubleTappedRoutedEventArgs e)
{
await ViewModel.OpenSelected();
ViewModel.OpenSelected();
}
}

4
Ghost.App/View/Pages/Landing/CreateProjectPage.xaml
View File

@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8" ?>
<Page
x:Class="Ghost.App.View.Pages.Landing.CreateProjectPage"
x:Class="Ghost.Editor.View.Pages.Landing.CreateProjectPage"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:data="using:Ghost.Data.Models"
xmlns:editor="using:Ghost.Editor.Controls"
xmlns:local="using:Ghost.App.View.Pages.Landing"
xmlns:local="using:Ghost.Editor.View.Pages.Landing"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
NavigationCacheMode="Enabled"
mc:Ignorable="d">

4
Ghost.App/View/Pages/Landing/CreateProjectPage.xaml.cs
View File

@@ -2,7 +2,7 @@
using Microsoft.UI.Xaml.Controls;
using Microsoft.UI.Xaml.Navigation;
namespace Ghost.App.View.Pages.Landing;
namespace Ghost.Editor.View.Pages.Landing;
internal sealed partial class CreateProjectPage : Page
{
@@ -13,7 +13,7 @@ internal sealed partial class CreateProjectPage : Page
public CreateProjectPage()
{
ViewModel = GhostApplication.GetService<CreateProjectViewModel>();
ViewModel = EditorApplication.GetService<CreateProjectViewModel>();
InitializeComponent();
}

4
Ghost.App/View/Pages/Landing/OpenProjectPage.xaml
View File

@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="utf-8" ?>
<Page
x:Class="Ghost.App.View.Pages.Landing.OpenProjectPage"
x:Class="Ghost.Editor.View.Pages.Landing.OpenProjectPage"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:converters="using:Ghost.Editor.Utilities.Converters"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:data="using:Ghost.Data.Models"
xmlns:interactivity="using:Microsoft.Xaml.Interactivity"
xmlns:local="using:Ghost.App.View.Pages.Landing"
xmlns:local="using:Ghost.Editor.View.Pages.Landing"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
NavigationCacheMode="Enabled"
mc:Ignorable="d">

8
Ghost.App/View/Pages/Landing/OpenProjectPage.xaml.cs
View File

@@ -1,11 +1,11 @@
using Ghost.Data.Models;
using Ghost.Editor.ViewModels.Pages.Landing;
using Ghost.Editor.ViewModels.Pages.Landing;
using Ghost.Data.Models;
using Microsoft.UI.Xaml;
using Microsoft.UI.Xaml.Controls;
using Microsoft.UI.Xaml.Navigation;
using Windows.ApplicationModel.DataTransfer;
namespace Ghost.App.View.Pages.Landing;
namespace Ghost.Editor.View.Pages.Landing;
internal sealed partial class OpenProjectPage : Page
{
@@ -16,7 +16,7 @@ internal sealed partial class OpenProjectPage : Page
public OpenProjectPage()
{
ViewModel = GhostApplication.GetService<OpenProjectViewModel>();
ViewModel = EditorApplication.GetService<OpenProjectViewModel>();
InitializeComponent();
}