forked from Misaki/GhostEngine
Fixed compilation errors;
Added MaterialPalette
This commit is contained in:
@@ -59,7 +59,7 @@ internal static class ActivationHandler
|
||||
((EngineCore)App.GetService<IEngineContext>()).Init();
|
||||
});
|
||||
|
||||
await ((Core.AssetHandle.AssetService)App.GetService<IAssetService>()).Init();
|
||||
// await ((Core.AssetHandle.AssetService)App.GetService<IAssetService>()).Init();
|
||||
|
||||
// TODO: Init other subsystems here.
|
||||
// await Task.Delay(10000); // Wait 10 seconds to simulate work.
|
||||
|
||||
@@ -63,7 +63,7 @@ public partial class App : Application
|
||||
services.AddSingleton<IProgressService, ProgressService>();
|
||||
services.AddSingleton<IInspectorService, InspectorService>();
|
||||
services.AddSingleton<IPreviewService, PreviewService>();
|
||||
services.AddSingleton<IAssetService, AssetService>();
|
||||
// services.AddSingleton<IAssetService, AssetService>();
|
||||
|
||||
services.AddSingleton<EngineEditorViewModel>();
|
||||
|
||||
|
||||
@@ -46,7 +46,7 @@
|
||||
<!-- Named Style -->
|
||||
<Style
|
||||
x:Key="ToolbarButton"
|
||||
BasedOn="{ThemeResource SubtleButtonStyle}"
|
||||
BasedOn="{StaticResource SubtleButtonStyle}"
|
||||
TargetType="Button" />
|
||||
|
||||
<!-- Named Resource -->
|
||||
|
||||
@@ -10,7 +10,7 @@ namespace Ghost.Editor.ViewModels.Controls;
|
||||
internal partial class ProjectBrowserViewModel : ObservableObject
|
||||
{
|
||||
private readonly IInspectorService _inspectorService;
|
||||
private readonly IAssetService _assetService;
|
||||
// private readonly IAssetService _assetService;
|
||||
|
||||
private readonly Dictionary<string, ExplorerItem> _pathToDirectoryItemMap = new();
|
||||
private ExplorerItem? _selectedItem;
|
||||
@@ -40,10 +40,10 @@ internal partial class ProjectBrowserViewModel : ObservableObject
|
||||
get; set;
|
||||
} = string.Empty;
|
||||
|
||||
public ProjectBrowserViewModel(IInspectorService inspectorService, IAssetService assetService)
|
||||
public ProjectBrowserViewModel(IInspectorService inspectorService) // , IAssetService assetService)
|
||||
{
|
||||
_inspectorService = inspectorService;
|
||||
_assetService = assetService;
|
||||
// _assetService = assetService;
|
||||
|
||||
var assetsRootItem = new ExplorerItem(EditorApplication.ASSETS_FOLDER_NAME, Path.Combine(EditorApplication.ProjectPath, EditorApplication.ASSETS_FOLDER_NAME), true);
|
||||
LoadSubFolderRecursive(assetsRootItem);
|
||||
@@ -109,7 +109,7 @@ internal partial class ProjectBrowserViewModel : ObservableObject
|
||||
}
|
||||
else
|
||||
{
|
||||
_assetService.OpenAsset(SelectedItem.FullName);
|
||||
// _assetService.OpenAsset(SelectedItem.FullName);
|
||||
return (null, 1);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -7,7 +7,7 @@ namespace Ghost.Editor.ViewModels.Pages.EngineEditor;
|
||||
|
||||
internal partial class ProjectViewModel : ObservableObject
|
||||
{
|
||||
private readonly IAssetService _assetService;
|
||||
// private readonly IAssetService _assetService;
|
||||
|
||||
public ObservableCollection<ExplorerItem> SubDirectories
|
||||
{
|
||||
@@ -35,15 +35,15 @@ internal partial class ProjectViewModel : ObservableObject
|
||||
set;
|
||||
}
|
||||
|
||||
public ProjectViewModel(IAssetService assetService)
|
||||
{
|
||||
_assetService = assetService;
|
||||
// public ProjectViewModel(IAssetService assetService)
|
||||
// {
|
||||
// _assetService = assetService;
|
||||
|
||||
var assetsRootItem = new ExplorerItem("Assets", Path.Combine(EditorApplication.ProjectPath, EditorApplication.ASSETS_FOLDER_NAME), true);
|
||||
LoadSubFolderRecursive(ref assetsRootItem);
|
||||
// var assetsRootItem = new ExplorerItem("Assets", Path.Combine(EditorApplication.ProjectPath, EditorApplication.ASSETS_FOLDER_NAME), true);
|
||||
// LoadSubFolderRecursive(ref assetsRootItem);
|
||||
|
||||
SubDirectories.Add(assetsRootItem);
|
||||
}
|
||||
// SubDirectories.Add(assetsRootItem);
|
||||
// }
|
||||
|
||||
private static void LoadSubFolderRecursive(ref ExplorerItem parentItem)
|
||||
{
|
||||
@@ -127,7 +127,7 @@ internal partial class ProjectViewModel : ObservableObject
|
||||
}
|
||||
else
|
||||
{
|
||||
_assetService.OpenAsset(SelectedAsset.FullName);
|
||||
// _assetService.OpenAsset(SelectedAsset.FullName);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user