Julian/GhostEngine
1
0
Fork 0
forked from Misaki/GhostEngine
Code Pull Requests Activity

Refactor application structure and add database support

Browse Source 
Changed App.xaml.cs to implement dependency injection with Microsoft.Extensions.Hosting, initializing services for LandingWindow and LandingViewModel.

Removed MainWindow.xaml and MainWindow.xaml.cs, shifting to a new landing window structure.

Added Ghost.Database project with necessary database functionality and created ProjectRepository for project management.

Added ProjectInfo and TemplateInfo data models for project attributes.

Added CreateProjectViewModel and LandingViewModel for managing view models using Community Toolkit for MVVM.

Created new XAML pages for project creation, opening projects, and the landing window, along with their corresponding code-behind files.

Added AssemblyInfo.cs for internal visibility to facilitate testing.
This commit is contained in:
Misaki
2025-03-25 13:13:04 +09:00
parent e63c43dbb2
commit 23a08bc8e0
19 changed files with 491 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
Ghost.Editor/App.xaml.cs
View File

@@ -1,4 +1,9 @@
using Microsoft.UI.Xaml;
using Ghost.Editor.View.Windows;
using Ghost.Editor.ViewModel.Windows;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Hosting;
using Microsoft.UI.Xaml;
using System;
// To learn more about WinUI, the WinUI project structure,
// and more about our project templates, see: http://aka.ms/winui-project-info.
@@ -10,6 +15,23 @@ namespace Ghost.Editor
/// </summary>
public partial class App : Application
{
private Window? _window;
public IHost Host
{
get;
}
public static T GetService<T>() where T : class
{
if ((Current as App)!.Host.Services.GetService(typeof(T)) is not T service)
{
throw new ArgumentException($"{typeof(T)} needs to be registered in ConfigureServices within App.xaml.cs.");
}
return service;
}
/// <summary>
/// Initializes the singleton application object. This is the first line of authored code
/// executed, and as such is the logical equivalent of main() or WinMain().
@@ -17,6 +39,16 @@ namespace Ghost.Editor
public App()
{
InitializeComponent();
Host = Microsoft.Extensions.Hosting.Host.
CreateDefaultBuilder().
UseContentRoot(AppContext.BaseDirectory).
ConfigureServices((context, services) =>
{
services.AddTransient<LandingWindow>();
services.AddTransient<LandingViewModel>();
})
.Build();
}
/// <summary>
@@ -25,10 +57,11 @@ namespace Ghost.Editor
/// <param name="args">Details about the launch request and process.</param>
protected override void OnLaunched(LaunchActivatedEventArgs args)
{
m_window = new MainWindow();
m_window.Activate();
}
base.OnLaunched(args);
Host.Start();
private Window? m_window;
_window = GetService<LandingWindow>();
_window.Activate();
}
}
}
}

21
Ghost.Editor/Ghost.Editor.csproj
View File

@@ -10,7 +10,12 @@
<PublishProfile>win-$(Platform).pubxml</PublishProfile>
<UseWinUI>true</UseWinUI>
<EnableMsixTooling>true</EnableMsixTooling>
<LangVersion>preview</LangVersion>
</PropertyGroup>
<ItemGroup>
<None Remove="View\Pages\Landing\CreateProjectPage.xaml" />
<None Remove="View\Pages\Landing\OpenProjectPage.xaml" />
</ItemGroup>
<ItemGroup>
<Content Include="Assets\SplashScreen.scale-200.png" />
@@ -41,8 +46,24 @@
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.7.250310001" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Ghost.Database\Ghost.Database.csproj" />
<ProjectReference Include="..\Ghost.Engine\Ghost.Engine.csproj" />
</ItemGroup>
<ItemGroup>
<Page Update="View\Pages\Landing\CreateProjectPage.xaml">
<Generator>MSBuild:Compile</Generator>
</Page>
</ItemGroup>
<ItemGroup>
<Page Update="View\Window\Landing.xaml">
<Generator>MSBuild:Compile</Generator>
</Page>
</ItemGroup>
<ItemGroup>
<Page Update="View\Pages\Landing\OpenProjectPage.xaml">
<Generator>MSBuild:Compile</Generator>
</Page>
</ItemGroup>
<PropertyGroup Label="Globals" />
<!--

15
Ghost.Editor/MainWindow.xaml
View File

@@ -1,15 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Window
x:Class="Ghost.Editor.MainWindow"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:local="using:Ghost.Editor"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
mc:Ignorable="d"
Title="Ghost.Editor">
<StackPanel Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center">
<Button x:Name="myButton" Click="myButton_Click">Click Me</Button>
</StackPanel>
</Window>

36
Ghost.Editor/MainWindow.xaml.cs
View File

@@ -1,36 +0,0 @@
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Runtime.InteropServices.WindowsRuntime;
using Microsoft.UI.Xaml;
using Microsoft.UI.Xaml.Controls;
using Microsoft.UI.Xaml.Controls.Primitives;
using Microsoft.UI.Xaml.Data;
using Microsoft.UI.Xaml.Input;
using Microsoft.UI.Xaml.Media;
using Microsoft.UI.Xaml.Navigation;
using Windows.Foundation;
using Windows.Foundation.Collections;
// 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
{
/// <summary>
/// An empty window that can be used on its own or navigated to within a Frame.
/// </summary>
public sealed partial class MainWindow : Window
{
public MainWindow()
{
this.InitializeComponent();
}
private void myButton_Click(object sender, RoutedEventArgs e)
{
myButton.Content = "Clicked";
}
}
}

41
Ghost.Editor/View/Pages/Landing/CreateProjectPage.xaml Normal file
View File

@@ -0,0 +1,41 @@
<?xml version="1.0" encoding="utf-8" ?>
<Page
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.Database.Models.Projects"
xmlns:local="using:Ghost.Editor.View.Pages.Landing"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
mc:Ignorable="d">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<!-- Template Info -->
<Grid Grid.Column="0">
<TextBlock
Grid.Column="0"
Style="{StaticResource SubtitleTextBlockStyle}"
Text="Template" />
<ListView SelectedItem="">
<ListView.ItemTemplate>
<DataTemplate x:DataType="data:TemplateInfo">
<TextBlock VerticalAlignment="Center" Text="{x:Bind Name}" />
</DataTemplate>
</ListView.ItemTemplate>
</ListView>
</Grid>
<!-- Project Info -->
<Grid Grid.Column="1" DataContext="{x:Bind ViewModel.SelectedTemplate, Mode=OneWay}">
<Image Stretch="UniformToFill" />
<TextBlock Text="{x:Bind ViewModel.SelectedTemplate.Description}" />
</Grid>
</Grid>
</Page>

22
Ghost.Editor/View/Pages/Landing/CreateProjectPage.xaml.cs Normal file
View File

@@ -0,0 +1,22 @@
using Ghost.Editor.ViewModel.Pages.Landing;
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.Landing;
internal sealed partial class CreateProjectPage : Page
{
public CreateProjectViewModel ViewModel
{
get;
}
public CreateProjectPage(CreateProjectViewModel viewModel)
{
ViewModel = viewModel;
InitializeComponent();
}
}

59
Ghost.Editor/View/Pages/Landing/OpenProjectPage.xaml Normal file
View File

@@ -0,0 +1,59 @@
<?xml version="1.0" encoding="utf-8" ?>
<Page
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:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:data="using:Ghost.Database.Models.Projects"
xmlns:local="using:Ghost.Editor.View.Pages.Landing"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
mc:Ignorable="d">
<Grid>
<ListView
x:Name="ProjectListView"
IsItemClickEnabled="True"
ItemClick="ListView_ItemClick"
ItemsSource="{x:Bind projects}"
Visibility="Visible">
<ListView.ItemTemplate>
<DataTemplate x:DataType="data:ProjectInfo">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*" />
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions>
<Grid Grid.Column="0">
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<TextBlock
Grid.Row="0"
Style="{StaticResource SubtitleTextBlockStyle}"
Text="{x:Bind Name}" />
<TextBlock
Grid.Row="1"
Style="{StaticResource BodyTextBlockStyle}"
Text="{x:Bind Path}" />
</Grid>
<TextBlock Grid.Column="1" Text="{x:Bind LastOpened}" />
<TextBlock Grid.Column="2" Text="{x:Bind EngineVersion}" />
</Grid>
</DataTemplate>
</ListView.ItemTemplate>
</ListView>
<TextBlock
x:Name="PlaceHolderText"
HorizontalAlignment="Center"
VerticalAlignment="Center"
Style="{StaticResource TitleTextBlockStyle}"
Text="No projects found"
Visibility="Collapsed" />
</Grid>
</Page>

41
Ghost.Editor/View/Pages/Landing/OpenProjectPage.xaml.cs Normal file
View File

@@ -0,0 +1,41 @@
using Ghost.Database.DataContext;
using Ghost.Database.Models.Projects;
using Microsoft.UI.Xaml;
using Microsoft.UI.Xaml.Controls;
using System.Collections.ObjectModel;
// 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.Landing;
internal sealed partial class OpenProjectPage : Page
{
public readonly ObservableCollection<ProjectInfo> projects = new();
public OpenProjectPage()
{
foreach (var project in ProjectRepository.LoadProjects())
{
projects.Add(project);
}
InitializeComponent();
if (projects.Count == 0)
{
PlaceHolderText.Visibility = Visibility.Visible;
ProjectListView.Visibility = Visibility.Collapsed;
}
}
private void ListView_ItemClick(object sender, ItemClickEventArgs e)
{
if (e.ClickedItem is not ProjectInfo project)
{
return;
}
//TODO: Load project
}
}

40
Ghost.Editor/View/Windows/LandingWindow.xaml Normal file
View File

@@ -0,0 +1,40 @@
<?xml version="1.0" encoding="utf-8" ?>
<Window
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:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="using:Ghost.Editor.View.Windows"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
Title="Landing"
mc:Ignorable="d">
<Grid Padding="4">
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
<RowDefinition Height="*" />
</Grid.RowDefinitions>
<SelectorBar
Grid.Row="0"
HorizontalAlignment="Right"
SelectionChanged="SelectorBar_SelectionChanged">
<SelectorBarItem IsSelected="True" Text="Open">
<SelectorBarItem.Icon>
<FontIcon Glyph="&#xE8A7;" />
</SelectorBarItem.Icon>
</SelectorBarItem>
<SelectorBarItem Text="Create">
<SelectorBarItem.Icon>
<FontIcon Glyph="&#xE8F4;" />
</SelectorBarItem.Icon>
</SelectorBarItem>
</SelectorBar>
<Frame
x:Name="ContentFrame"
Grid.Row="1"
Padding="24,8"
IsNavigationStackEnabled="False" />
</Grid>
</Window>

47
Ghost.Editor/View/Windows/LandingWindow.xaml.cs Normal file
View File

@@ -0,0 +1,47 @@
// To learn more about WinUI, the WinUI project structure,
// and more about our project templates, see: http://aka.ms/winui-project-info.
using Ghost.Editor.View.Pages.Landing;
using Ghost.Editor.ViewModel.Windows;
using Microsoft.UI.Xaml;
using Microsoft.UI.Xaml.Controls;
using Microsoft.UI.Xaml.Media.Animation;
namespace Ghost.Editor.View.Windows;
internal sealed partial class LandingWindow : Window
{
public LandingViewModel ViewModel
{
get;
}
private int _previousSelectedIndex;
public LandingWindow(LandingViewModel viewModel)
{
ViewModel = viewModel;
InitializeComponent();
AppWindow.Resize(new(1200, 900));
}
private void SelectorBar_SelectionChanged(SelectorBar sender, SelectorBarSelectionChangedEventArgs e)
{
var selectedItem = sender.SelectedItem;
var currentSelectedIndex = sender.Items.IndexOf(selectedItem);
var pageType = currentSelectedIndex switch
{
1 => typeof(CreateProjectPage),
_ => typeof(OpenProjectPage),
};
var slideNavigationTransitionEffect = currentSelectedIndex - _previousSelectedIndex > 0 ?
SlideNavigationTransitionEffect.FromRight : SlideNavigationTransitionEffect.FromLeft;
ContentFrame.Navigate(pageType, null, new SlideNavigationTransitionInfo() { Effect = slideNavigationTransitionEffect });
_previousSelectedIndex = currentSelectedIndex;
}
}

17
Ghost.Editor/ViewModel/Pages/Landing/CreateProjectViewModel.cs Normal file
View File

@@ -0,0 +1,17 @@
using CommunityToolkit.Mvvm.ComponentModel;
using Ghost.Database.Models.Projects;
using System.Collections.ObjectModel;
namespace Ghost.Editor.ViewModel.Pages.Landing;
internal partial class CreateProjectViewModel : ObservableRecipient
{
public ObservableCollection<TemplateInfo> templates = new();
[ObservableProperty]
public partial TemplateInfo SelectedTemplate
{
get;
set;
}
}

13
Ghost.Editor/ViewModel/Windows/LandingViewModel.cs Normal file
View File

@@ -0,0 +1,13 @@
using CommunityToolkit.Mvvm.ComponentModel;
namespace Ghost.Editor.ViewModel.Windows;
internal partial class LandingViewModel : ObservableRecipient
{
[ObservableProperty]
public partial int TabIndex
{
get;
set;
}
}