Refactor project structure and improve performance
Changed the `ProjectRepository` class to be static for easier usage. Changed `ProjectService` constants to public properties for accessibility. Changed `App.xaml` to consolidate theme resources into `Override.xaml`. Changed `App.xaml.cs` to implement an `AppStateMachine` for better state management. Changed `ConsolePage` and `HierarchyPage` to utilize the new ViewModel structure. Changed `ProjectPage` to use the `ExplorerItem` model for asset display. Changed `Entity` and `EntityManager` to enhance component management with a new `IComponentData` interface. Changed the `Logger` class to introduce structured logging functionality. Changed the system architecture to support dependency management for better organization. Changed the `QueryEnumerable` class to allow for more flexible entity queries. Changed the `TypeHandle` class to improve efficiency in retrieving type handles. Changed the `World` class to support robust world management and multiple worlds. Updated the `Test` class to demonstrate the new entity and component management system.
This commit is contained in:
24
Ghost.Engine/Components/Hierarchy.cs
Normal file
24
Ghost.Engine/Components/Hierarchy.cs
Normal file
@@ -0,0 +1,24 @@
|
||||
using Ghost.Entities;
|
||||
using Ghost.Entities.Components;
|
||||
using System.Runtime.CompilerServices;
|
||||
|
||||
namespace Ghost.Engine.Components;
|
||||
|
||||
[SkipLocalsInit]
|
||||
public struct Hierarchy : IComponentData
|
||||
{
|
||||
public Entity parent;
|
||||
public Entity firstChild;
|
||||
public Entity nextSibling;
|
||||
|
||||
public static Hierarchy Root
|
||||
{
|
||||
[MethodImpl(MethodImplOptions.AggressiveInlining)]
|
||||
get => new()
|
||||
{
|
||||
parent = Entity.Invalid,
|
||||
firstChild = Entity.Invalid,
|
||||
nextSibling = Entity.Invalid
|
||||
};
|
||||
}
|
||||
}
|
||||
21
Ghost.Engine/Components/LocalToWorld.cs
Normal file
21
Ghost.Engine/Components/LocalToWorld.cs
Normal file
@@ -0,0 +1,21 @@
|
||||
using Ghost.Engine.Helpers;
|
||||
using Ghost.Entities.Components;
|
||||
using System.Numerics;
|
||||
using System.Runtime.CompilerServices;
|
||||
|
||||
namespace Ghost.Engine.Components;
|
||||
|
||||
[SkipLocalsInit]
|
||||
public struct LocalToWorld : IComponentData
|
||||
{
|
||||
public Matrix4x4 matrix;
|
||||
|
||||
public static LocalToWorld Identity
|
||||
{
|
||||
[MethodImpl(MethodImplOptions.AggressiveInlining)]
|
||||
get => new()
|
||||
{
|
||||
matrix = MatrixHelpers.CreateTRS(Vector3.Zero, Quaternion.Identity, Vector3.One)
|
||||
};
|
||||
}
|
||||
}
|
||||
@@ -1,77 +0,0 @@
|
||||
using Ghost.Engine.Helpers;
|
||||
using Ghost.Entities;
|
||||
using System.Numerics;
|
||||
using System.Runtime.CompilerServices;
|
||||
|
||||
namespace Ghost.Engine.Components;
|
||||
|
||||
public struct Transform : IComponentData
|
||||
{
|
||||
private Vector3 _position = Vector3.Zero;
|
||||
public Vector3 Position
|
||||
{
|
||||
get => _position;
|
||||
set
|
||||
{
|
||||
_position = value;
|
||||
hasChanged = true;
|
||||
UpdateMatrices();
|
||||
}
|
||||
}
|
||||
|
||||
private Quaternion _rotation = Quaternion.Identity;
|
||||
public Quaternion Rotation
|
||||
{
|
||||
get => _rotation;
|
||||
set
|
||||
{
|
||||
_rotation = value;
|
||||
hasChanged = true;
|
||||
UpdateMatrices();
|
||||
}
|
||||
}
|
||||
|
||||
private Vector3 _scale = Vector3.One;
|
||||
public Vector3 Scale
|
||||
{
|
||||
get => _scale;
|
||||
set
|
||||
{
|
||||
_scale = value;
|
||||
hasChanged = true;
|
||||
UpdateMatrices();
|
||||
}
|
||||
}
|
||||
|
||||
public bool hasChanged;
|
||||
|
||||
private Matrix4x4 _localToWorldMatrix;
|
||||
private Matrix4x4 _worldToLocalMatrix;
|
||||
|
||||
public readonly Matrix4x4 LocalToWorldMatrix => _localToWorldMatrix;
|
||||
public readonly Matrix4x4 WorldToLocalMatrix => _worldToLocalMatrix;
|
||||
|
||||
public static Transform Default
|
||||
{
|
||||
[MethodImpl(MethodImplOptions.AggressiveInlining)]
|
||||
get => new(Vector3.Zero, Quaternion.Identity, Vector3.One);
|
||||
}
|
||||
|
||||
public Transform(Vector3 position, Quaternion rotation, Vector3 scale)
|
||||
{
|
||||
_position = position;
|
||||
_rotation = rotation;
|
||||
_scale = scale;
|
||||
hasChanged = false;
|
||||
_localToWorldMatrix = Matrix4x4.Identity;
|
||||
_worldToLocalMatrix = Matrix4x4.Identity;
|
||||
|
||||
UpdateMatrices();
|
||||
}
|
||||
|
||||
private void UpdateMatrices()
|
||||
{
|
||||
_localToWorldMatrix = MatrixHelpers.CreateTRS(_position, _rotation, _scale);
|
||||
Matrix4x4.Invert(_localToWorldMatrix, out _worldToLocalMatrix);
|
||||
}
|
||||
}
|
||||
@@ -1,25 +1,16 @@
|
||||
using Ghost.Engine.Models;
|
||||
using Ghost.Engine.Services;
|
||||
|
||||
namespace Ghost.Engine;
|
||||
|
||||
internal class EngineCore
|
||||
internal class EngineCore : IDisposable, IAsyncDisposable
|
||||
{
|
||||
public static EngineCore? Current
|
||||
public async Task StartAsync(LaunchArgument args)
|
||||
{
|
||||
get;
|
||||
private set;
|
||||
}
|
||||
|
||||
public static async Task StartAsync(LaunchArgument args)
|
||||
{
|
||||
if (Current != null)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
Current = new EngineCore();
|
||||
|
||||
ActivationHandler.Handle(args);
|
||||
|
||||
Logger.LogInfo("Engine started successfully.");
|
||||
|
||||
await Task.CompletedTask;
|
||||
}
|
||||
|
||||
@@ -27,4 +18,14 @@ internal class EngineCore
|
||||
{
|
||||
await Task.CompletedTask;
|
||||
}
|
||||
|
||||
public void Dispose()
|
||||
{
|
||||
ShutDownAsync().GetAwaiter().GetResult();
|
||||
}
|
||||
|
||||
public async ValueTask DisposeAsync()
|
||||
{
|
||||
await ShutDownAsync();
|
||||
}
|
||||
}
|
||||
56
Ghost.Engine/Models/LogMessage.cs
Normal file
56
Ghost.Engine/Models/LogMessage.cs
Normal file
@@ -0,0 +1,56 @@
|
||||
using System.Diagnostics;
|
||||
|
||||
namespace Ghost.Engine.Models;
|
||||
|
||||
public enum LogLevel
|
||||
{
|
||||
Info,
|
||||
Warning,
|
||||
Error
|
||||
}
|
||||
|
||||
internal class LogMessage
|
||||
{
|
||||
public LogLevel Level
|
||||
{
|
||||
get; set;
|
||||
}
|
||||
|
||||
public string Message
|
||||
{
|
||||
get; set;
|
||||
}
|
||||
|
||||
public StackTrace? StackTrace
|
||||
{
|
||||
get; set;
|
||||
}
|
||||
|
||||
public DateTime Timestamp
|
||||
{
|
||||
get; set;
|
||||
}
|
||||
|
||||
public LogMessage(LogLevel level, string message, StackTrace? stackTrace = null)
|
||||
{
|
||||
Level = level;
|
||||
Message = message;
|
||||
StackTrace = stackTrace;
|
||||
Timestamp = DateTime.Now;
|
||||
}
|
||||
|
||||
public override string ToString()
|
||||
{
|
||||
return $"{Timestamp:HH:mm:ss} [{Level}] {Message}";
|
||||
}
|
||||
|
||||
public string ToStringWithStackTrace()
|
||||
{
|
||||
if (StackTrace == null)
|
||||
{
|
||||
return ToString();
|
||||
}
|
||||
|
||||
return $"{ToString()}\n{StackTrace}";
|
||||
}
|
||||
}
|
||||
73
Ghost.Engine/Services/Logger.cs
Normal file
73
Ghost.Engine/Services/Logger.cs
Normal file
@@ -0,0 +1,73 @@
|
||||
using Ghost.Engine.Models;
|
||||
using System.Diagnostics;
|
||||
|
||||
namespace Ghost.Engine.Services;
|
||||
|
||||
internal enum LogChangeType
|
||||
{
|
||||
LogAdded,
|
||||
LogRemoved,
|
||||
LogsCleared
|
||||
}
|
||||
|
||||
public static class Logger
|
||||
{
|
||||
|
||||
private const int _MAX_LOGS = 4096;
|
||||
|
||||
private static readonly List<LogMessage> _logs = new();
|
||||
internal static List<LogMessage> Logs => _logs;
|
||||
|
||||
internal static event Action<LogChangeType>? OnLogsUpdate;
|
||||
|
||||
internal static bool HasStackTrace
|
||||
{
|
||||
get; set;
|
||||
}
|
||||
|
||||
private static void LogInternal(LogLevel level, string message, int skipFrame)
|
||||
{
|
||||
if (_logs.Count >= _MAX_LOGS)
|
||||
{
|
||||
_logs.RemoveAt(0);
|
||||
OnLogsUpdate?.Invoke(LogChangeType.LogRemoved);
|
||||
}
|
||||
|
||||
StackTrace? stackTrace = null;
|
||||
if (HasStackTrace)
|
||||
{
|
||||
stackTrace = new StackTrace(skipFrame, true);
|
||||
}
|
||||
|
||||
var logMessage = new LogMessage(level, message, stackTrace);
|
||||
_logs.Add(logMessage);
|
||||
|
||||
OnLogsUpdate?.Invoke(LogChangeType.LogAdded);
|
||||
}
|
||||
|
||||
public static void Log(LogLevel level, string message)
|
||||
{
|
||||
LogInternal(level, message, 2);
|
||||
}
|
||||
|
||||
public static void LogInfo(string message)
|
||||
{
|
||||
LogInternal(LogLevel.Info, message, 3);
|
||||
}
|
||||
|
||||
public static void LogWarning(string message)
|
||||
{
|
||||
LogInternal(LogLevel.Warning, message, 3);
|
||||
}
|
||||
|
||||
public static void LogError(string message)
|
||||
{
|
||||
LogInternal(LogLevel.Error, message, 3);
|
||||
}
|
||||
|
||||
internal static void Clear()
|
||||
{
|
||||
_logs.Clear();
|
||||
OnLogsUpdate?.Invoke(LogChangeType.LogsCleared);
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user