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

47
Ghost.App/View/Windows/EngineEditorWindow.xaml
View File

@@ -1,14 +1,15 @@
<?xml version="1.0" encoding="utf-8" ?>
<winex:WindowEx
x:Class="Ghost.App.View.Windows.EngineEditorWindow"
x:Class="Ghost.Editor.View.Windows.EngineEditorWindow"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:behaviors="using:CommunityToolkit.WinUI.Behaviors"
xmlns:controls="using:CommunityToolkit.WinUI.Controls"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:ee="using:Ghost.App.View.Pages.EngineEditor"
xmlns:ee="using:Ghost.Editor.View.Pages.EngineEditor"
xmlns:interactivity="using:Microsoft.Xaml.Interactivity"
xmlns:local="using:Ghost.App.View.Windows"
xmlns:internal="using:Ghost.Editor.Controls.Internal"
xmlns:local="using:Ghost.Editor.View.Windows"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:winex="using:WinUIEx"
Activated="WindowEx_Activated"
@@ -86,23 +87,18 @@
<ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions>
<TabView
<internal:NavigationTabView
Grid.Column="0"
Width="350"
HorizontalAlignment="Stretch"
VerticalAlignment="Stretch">
<TabView.TabItems>
<TabViewItem Header="Hierarchy">
<TabViewItem.IconSource>
<FontIconSource Glyph="&#xE8A4;" />
</TabViewItem.IconSource>
<ee:HierarchyPage />
</TabViewItem>
</TabView.TabItems>
</TabView>
<internal:NavigationTabView.TabItems>
<ee:HierarchyPage />
</internal:NavigationTabView.TabItems>
</internal:NavigationTabView>
<TabView Grid.Column="1">
<TabView.TabItems>
<internal:NavigationTabView Grid.Column="1">
<internal:NavigationTabView.TabItems>
<TabViewItem Header="Scene">
<TabViewItem.IconSource>
<FontIconSource Glyph="&#xF159;" />
@@ -112,17 +108,22 @@
Source="C:\Users\Misaki\OneDrive\Pictures\Screenshots\Screenshot 2024-07-20 021657.png"
Stretch="UniformToFill" />
</TabViewItem>
</TabView.TabItems>
</TabView>
</internal:NavigationTabView.TabItems>
</internal:NavigationTabView>
<Grid
<internal:NavigationTabView
Grid.Column="2"
Width="350"
Background="Bisque" />
HorizontalAlignment="Stretch"
VerticalAlignment="Stretch">
<internal:NavigationTabView.TabItems>
<ee:InspectorPage />
</internal:NavigationTabView.TabItems>
</internal:NavigationTabView>
</Grid>
<TabView Grid.Row="1" Height="350">
<TabView.TabItems>
<internal:NavigationTabView Grid.Row="1" Height="350">
<internal:NavigationTabView.TabItems>
<TabViewItem Header="Project">
<TabViewItem.IconSource>
<FontIconSource Glyph="&#xEC50;" />
@@ -135,8 +136,8 @@
</TabViewItem.IconSource>
<ee:ConsolePage />
</TabViewItem>
</TabView.TabItems>
</TabView>
</internal:NavigationTabView.TabItems>
</internal:NavigationTabView>
</Grid>
<!-- Status Bar -->

14
Ghost.App/View/Windows/EngineEditorWindow.xaml.cs
View File

@@ -1,5 +1,5 @@
using Ghost.App.Services;
using Ghost.Data.Resources;
using Ghost.Data.Resources;
using Ghost.Editor.Services;
using Ghost.Editor.Services.Contracts;
using Ghost.Editor.ViewModels.Windows;
using Ghost.Engine.Resources;
@@ -9,7 +9,7 @@ using WinUIEx;
// To learn more about WinUI, the WinUI project structure,
// and more about our project templates, see: http://aka.ms/winui-project-info.
namespace Ghost.App.View.Windows;
namespace Ghost.Editor.View.Windows;
/// <summary>
/// An empty window that can be used on its own or navigated to within a Frame.
/// </summary>
@@ -27,10 +27,10 @@ internal sealed partial class EngineEditorWindow : WindowEx
public EngineEditorWindow()
{
ViewModel = GhostApplication.GetService<EngineEditorViewModel>();
ViewModel = EditorApplication.GetService<EngineEditorViewModel>();
_notificationService = (NotificationService)GhostApplication.GetService<INotificationService>();
_progressService = (ProgressService)GhostApplication.GetService<IProgressService>();
_notificationService = (NotificationService)EditorApplication.GetService<INotificationService>();
_progressService = (ProgressService)EditorApplication.GetService<IProgressService>();
AppWindow.SetIcon(AssetsPath.s_appIconPath);
Title = EngineData.ENGINE_NAME;
@@ -46,7 +46,7 @@ internal sealed partial class EngineEditorWindow : WindowEx
Bindings.Update();
_editorScope?.Dispose();
_editorScope = GhostApplication.CreateScope();
_editorScope = EditorApplication.CreateScope();
_notificationService.SetReference(InfoBar, NotificationQueue);
_progressService.SetReference(ProgressBarContainer);

4
Ghost.App/View/Windows/LandingWindow.xaml
View File

@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8" ?>
<winex:WindowEx
x:Class="Ghost.App.View.Windows.LandingWindow"
x:Class="Ghost.Editor.View.Windows.LandingWindow"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:behaviors="using:CommunityToolkit.WinUI.Behaviors"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:interactivity="using:Microsoft.Xaml.Interactivity"
xmlns:local="using:Ghost.App.View.Windows"
xmlns:local="using:Ghost.Editor.View.Windows"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:winex="using:WinUIEx"
Activated="WindowEx_Activated"

10
Ghost.App/View/Windows/LandingWindow.xaml.cs
View File

@@ -1,6 +1,6 @@
using Ghost.App.Services;
using Ghost.App.View.Pages.Landing;
using Ghost.Editor.View.Pages.Landing;
using Ghost.Data.Resources;
using Ghost.Editor.Services;
using Ghost.Editor.Services.Contracts;
using Ghost.Engine.Resources;
using Microsoft.Extensions.DependencyInjection;
@@ -8,7 +8,7 @@ using Microsoft.UI.Xaml.Controls;
using Microsoft.UI.Xaml.Media.Animation;
using WinUIEx;
namespace Ghost.App.View.Windows;
namespace Ghost.Editor.View.Windows;
internal sealed partial class LandingWindow : WindowEx
{
@@ -20,7 +20,7 @@ internal sealed partial class LandingWindow : WindowEx
public LandingWindow()
{
_notificationService = (NotificationService)GhostApplication.GetService<INotificationService>();
_notificationService = (NotificationService)EditorApplication.GetService<INotificationService>();
AppWindow.SetIcon(AssetsPath.s_appIconPath);
Title = EngineData.ENGINE_NAME;
@@ -36,7 +36,7 @@ internal sealed partial class LandingWindow : WindowEx
private void WindowEx_Activated(object sender, Microsoft.UI.Xaml.WindowActivatedEventArgs args)
{
_landingScope?.Dispose();
_landingScope = GhostApplication.CreateScope();
_landingScope = EditorApplication.CreateScope();
_notificationService.SetReference(InfoBar, NotificationQueue);
}