Syntriax/Syntriax.Engine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chore: bumped dotnet version to 10

Browse Source
This commit is contained in:
Syntriax
2026-01-23 12:16:07 +03:00
parent 097f1897c2
commit 90e59802c6
32 changed files with 210 additions and 257 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
Engine.Core/BaseEntity.cs
View File

@@ -10,46 +10,41 @@ public abstract class BaseEntity : IEntity
public Event<IHasStateEnable> OnStateEnableAssigned { get; } = new();
public Event<IAssignable> OnUnassigned { get; } = new();
private IStateEnable _stateEnable = null!;
private bool _initialized = false;
private string _id = string.Empty;
public virtual IStateEnable StateEnable => _stateEnable;
public virtual IStateEnable StateEnable { get; private set; } = null!;
public string Id
{
get => _id;
get;
set
{
if (IsInitialized)
throw new($"Can't change {nameof(Id)} of {_id} because it's initialized");
throw new($"Can't change {nameof(Id)} of {field} because it's initialized");
if (value == _id)
if (value == field)
return;
string previousId = _id;
string previousId = field;
_id = value;
field = value;
OnIdChanged?.Invoke(this, new(previousId));
}
}
} = string.Empty;
public bool IsInitialized
{
get => _initialized;
get;
private set
{
if (value == _initialized)
if (value == field)
return;
_initialized = value;
field = value;
if (value)
OnInitialized?.Invoke(this);
else
OnFinalized?.Invoke(this);
}
}
} = false;
protected virtual void OnAssign(IStateEnable stateEnable) { }
public bool Assign(IStateEnable stateEnable)
@@ -57,8 +52,8 @@ public abstract class BaseEntity : IEntity
if (IsInitialized)
return false;
_stateEnable = stateEnable;
_stateEnable.Assign(this);
StateEnable = stateEnable;
StateEnable.Assign(this);
OnAssign(stateEnable);
OnStateEnableAssigned?.Invoke(this);
return true;
@@ -72,8 +67,8 @@ public abstract class BaseEntity : IEntity
UnassignInternal();
_stateEnable = null!;
_stateEnable.Unassign();
StateEnable = null!;
StateEnable.Unassign();
OnUnassigned?.Invoke(this);
return true;
}
@@ -84,7 +79,7 @@ public abstract class BaseEntity : IEntity
if (IsInitialized)
return false;
_stateEnable ??= Factory.StateEnableFactory.Instantiate(this);
StateEnable ??= Factory.StateEnableFactory.Instantiate(this);
InitializeInternal();
@@ -104,6 +99,6 @@ public abstract class BaseEntity : IEntity
return true;
}
protected BaseEntity() => _id = Guid.NewGuid().ToString("D");
protected BaseEntity(string id) => _id = id;
protected BaseEntity() => Id = Guid.NewGuid().ToString("D");
protected BaseEntity(string id) => Id = id;
}

23
Engine.Core/Behaviour.cs
View File

@@ -14,26 +14,23 @@ public abstract class Behaviour : BaseEntity, IBehaviour
public IUniverse Universe => BehaviourController.UniverseObject.Universe;
public IUniverseObject UniverseObject => BehaviourController.UniverseObject;
private IBehaviourController _behaviourController = null!;
public IBehaviourController BehaviourController => _behaviourController;
public IBehaviourController BehaviourController { get; private set; } = null!;
private int _priority = 0;
public int Priority
{
get => _priority;
get;
set
{
if (value == _priority)
if (value == field)
return;
int previousPriority = _priority;
_priority = value;
int previousPriority = field;
field = value;
OnPriorityChanged?.Invoke(this, new(previousPriority));
}
}
} = 0;
private bool _isActive = false;
public bool IsActive => _isActive;
public bool IsActive { get; private set; } = false;
protected virtual void OnAssign(IBehaviourController behaviourController) { }
public bool Assign(IBehaviourController behaviourController)
@@ -41,7 +38,7 @@ public abstract class Behaviour : BaseEntity, IBehaviour
if (IsInitialized)
return false;
_behaviourController = behaviourController;
BehaviourController = behaviourController;
OnAssign(behaviourController);
behaviourController.OnUniverseObjectAssigned.AddListener(delegateOnUniverseObjectAssigned);
behaviourController.StateEnable.OnEnabledChanged.AddListener(delegateOnStateEnabledChanged);
@@ -71,7 +68,7 @@ public abstract class Behaviour : BaseEntity, IBehaviour
BehaviourController.OnUniverseObjectAssigned.RemoveListener(delegateOnUniverseObjectAssigned);
BehaviourController.StateEnable.OnEnabledChanged.RemoveListener(delegateOnStateEnabledChanged);
base.UnassignInternal();
_behaviourController = null!;
BehaviourController = null!;
}
protected override void InitializeInternal()
@@ -88,7 +85,7 @@ public abstract class Behaviour : BaseEntity, IBehaviour
private void UpdateActive()
{
bool previousActive = IsActive;
_isActive = StateEnable.Enabled && _behaviourController.StateEnable.Enabled && _behaviourController.UniverseObject.IsActive;
IsActive = StateEnable.Enabled && BehaviourController.StateEnable.Enabled && BehaviourController.UniverseObject.IsActive;
if (previousActive != IsActive)
OnActiveChanged?.Invoke(this, new(previousActive));

5
Engine.Core/BehaviourController.cs
View File

@@ -12,9 +12,8 @@ public class BehaviourController : BaseEntity, IBehaviourController
private readonly FastList<IBehaviour> behaviours = new(Constants.BEHAVIOURS_SIZE_INITIAL);
private IUniverseObject _universeObject = null!;
public IUniverseObject UniverseObject { get; private set; } = null!;
public IUniverseObject UniverseObject => _universeObject;
public int Count => behaviours.Count;
public IBehaviour this[Index index] => behaviours[index];
@@ -103,7 +102,7 @@ public class BehaviourController : BaseEntity, IBehaviourController
if (UniverseObject is not null && UniverseObject.IsInitialized)
return false;
_universeObject = universeObject;
UniverseObject = universeObject;
OnAssign(universeObject);
OnUniverseObjectAssigned?.Invoke(this);
return true;

2
Engine.Core/Engine.Core.csproj
View File

@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<ImplicitUsings>false</ImplicitUsings>
<Nullable>enable</Nullable>
<RootNamespace>Engine.Core</RootNamespace>

9
Engine.Core/Helpers/Event.cs
View File

@@ -56,8 +56,7 @@ public class Event
// We use Ascending order because draw calls are running from last to first
private static readonly Comparer<ListenerData> SortByAscendingPriority = Comparer<ListenerData>.Create((x, y) => x.Priority.CompareTo(y.Priority));
private ILogger _logger = ILogger.Shared;
public ILogger Logger { get => _logger; set => _logger = value ?? ILogger.Shared; }
public ILogger Logger { get; set => field = value ?? ILogger.Shared; } = ILogger.Shared;
private readonly List<ListenerData> listeners = null!;
private readonly List<ListenerData> onceListeners = null!;
@@ -215,8 +214,7 @@ public class Event<TSender> where TSender : class
// We use Ascending order because draw calls are running from last to first
private static readonly Comparer<ListenerData> SortByAscendingPriority = Comparer<ListenerData>.Create((x, y) => x.Priority.CompareTo(y.Priority));
private ILogger _logger = ILogger.Shared;
public ILogger Logger { get => _logger; set => _logger = value ?? ILogger.Shared; }
public ILogger Logger { get; set => field = value ?? ILogger.Shared; } = ILogger.Shared;
private readonly List<ListenerData> listeners = null!;
private readonly List<ListenerData> onceListeners = null!;
@@ -382,8 +380,7 @@ public class Event<TSender, TArguments> where TSender : class
// We use Ascending order because draw calls are running from last to first
private static readonly Comparer<ListenerData> SortByAscendingPriority = Comparer<ListenerData>.Create((x, y) => x.Priority.CompareTo(y.Priority));
private ILogger _logger = ILogger.Shared;
public ILogger Logger { get => _logger; set => _logger = value ?? ILogger.Shared; }
public ILogger Logger { get; set => field = value ?? ILogger.Shared; } = ILogger.Shared;
private readonly List<ListenerData> listeners = null!;
private readonly List<ListenerData> onceListeners = null!;

2
Engine.Core/Primitives/Shape2D.cs
View File

@@ -20,7 +20,7 @@ public class Shape2D(List<Vector2D> vertices) : IEnumerable<Vector2D>
public Event<Shape2D> OnShapeUpdated { get; } = new();
private List<Vector2D> _vertices = vertices;
private readonly List<Vector2D> _vertices = vertices;
/// <summary>
/// Gets the vertices of the <see cref="Shape2D"/>.

23
Engine.Core/StateEnable.cs
View File

@@ -6,32 +6,29 @@ public class StateEnable : IStateEnable
public Event<IHasEntity> OnEntityAssigned { get; } = new();
public Event<IAssignable>? OnUnassigned { get; } = new();
private bool _enabled = true;
private IEntity _entity = null!;
public IEntity Entity => _entity;
public IEntity Entity { get; private set; } = null!;
public bool Enabled
{
get => _enabled;
get;
set
{
if (value == _enabled)
if (value == field)
return;
bool previousState = _enabled;
_enabled = value;
bool previousState = field;
field = value;
OnEnabledChanged?.Invoke(this, new(previousState));
}
}
} = true;
protected virtual void OnAssign(IEntity entity) { }
public bool Assign(IEntity entity)
{
if (_entity is not null && _entity.IsInitialized)
if (Entity is not null && Entity.IsInitialized)
return false;
_entity = entity;
Entity = entity;
OnAssign(entity);
OnEntityAssigned?.Invoke(this);
return true;
@@ -39,10 +36,10 @@ public class StateEnable : IStateEnable
public bool Unassign()
{
if (_entity is null)
if (Entity is null)
return false;
_entity = null!;
Entity = null!;
OnUnassigned?.Invoke(this);
return true;
}

11
Engine.Core/Universe.cs
View File

@@ -23,7 +23,6 @@ public class Universe : BaseEntity, IUniverse
private readonly Event<IUniverseObject, IUniverseObject.ExitedUniverseArguments>.EventHandler delegateOnUniverseObjectExitedUniverse = null!;
private readonly FastList<IUniverseObject> _universeObjects = new(Constants.UNIVERSE_OBJECTS_SIZE_INITIAL);
private float _timeScale = 1f;
public Universe()
{
@@ -37,18 +36,18 @@ public class Universe : BaseEntity, IUniverse
public UniverseTime UnscaledTime { get; private set; } = new();
public float TimeScale
{
get => _timeScale;
get;
set
{
value = value.Max(0f);
if (value == _timeScale)
if (value == field)
return;
float previousTimeScale = _timeScale;
_timeScale = value;
float previousTimeScale = field;
field = value;
OnTimeScaleChanged?.Invoke(this, new(previousTimeScale));
}
}
} = 1f;
public void Register(IUniverseObject universeObject)
{

48
Engine.Core/UniverseObject.cs
View File

@@ -15,41 +15,37 @@ public class UniverseObject : BaseEntity, IUniverseObject
public Event<INameable, INameable.NameChangedArguments> OnNameChanged { get; } = new();
public Event<IHasBehaviourController> OnBehaviourControllerAssigned { get; } = new();
private string _name = nameof(UniverseObject);
private IUniverse _universe = null!;
private IBehaviourController _behaviourController = null!;
private bool _isActive = false;
private readonly FastList<IUniverseObject> _children = [];
private IUniverseObject? _parent = null;
public IBehaviourController BehaviourController { get; private set; } = null!;
public IUniverse Universe { get; private set; } = null!;
public bool IsActive { get; private set; } = false;
public IReadOnlyList<IUniverseObject> Children => _children;
public IBehaviourController BehaviourController => _behaviourController;
public IUniverse Universe => _universe;
public bool IsInUniverse => _universe is not null;
public bool IsActive => _isActive;
public bool IsInUniverse => Universe is not null;
public string Name
{
get => _name;
get;
set
{
if (value == _name) return;
if (value == field) return;
string previousName = _name;
_name = value;
string previousName = field;
field = value;
OnNameChanged?.Invoke(this, new(previousName));
}
}
} = nameof(UniverseObject);
public IUniverseObject? Parent
{
get => _parent;
get;
set
{
if (value == this)
throw new Exceptions.AssignFailedException($"{Name} can not parent itself");
if (_parent == value)
if (field == value)
return;
IUniverseObject? previousParent = Parent;
@@ -59,7 +55,7 @@ public class UniverseObject : BaseEntity, IUniverseObject
previousParent.OnActiveChanged.RemoveListener(OnParentActiveChanged);
}
_parent = value;
field = value;
if (value is not null)
{
@@ -73,7 +69,7 @@ public class UniverseObject : BaseEntity, IUniverseObject
UpdateActive();
OnParentChanged?.Invoke(this, new(previousParent, value));
}
}
} = null;
protected virtual void OnEnteringUniverse(IUniverse universe) { }
bool IUniverseObject.EnterUniverse(IUniverse universe)
@@ -81,7 +77,7 @@ public class UniverseObject : BaseEntity, IUniverseObject
if (IsInUniverse)
return false;
_universe = universe;
Universe = universe;
UpdateActive();
OnEnteringUniverse(universe);
OnEnteredUniverse?.Invoke(this, new(universe));
@@ -91,11 +87,11 @@ public class UniverseObject : BaseEntity, IUniverseObject
protected virtual void OnExitingUniverse(IUniverse universe) { }
bool IUniverseObject.ExitUniverse()
{
if (!IsInUniverse || _universe is not IUniverse universe)
if (!IsInUniverse || Universe is not IUniverse universe)
return false;
OnExitingUniverse(universe);
_universe = null!;
Universe = null!;
OnExitedUniverse?.Invoke(this, new(universe));
return true;
}
@@ -125,7 +121,7 @@ public class UniverseObject : BaseEntity, IUniverseObject
if (IsInitialized)
return false;
_behaviourController = behaviourController;
BehaviourController = behaviourController;
OnAssign(behaviourController);
OnBehaviourControllerAssigned?.Invoke(this);
return true;
@@ -145,7 +141,7 @@ public class UniverseObject : BaseEntity, IUniverseObject
private void UpdateActive()
{
bool previousActive = IsActive;
_isActive = StateEnable.Enabled && (Parent?.IsActive ?? true);
IsActive = StateEnable.Enabled && (Parent?.IsActive ?? true);
if (previousActive != IsActive)
OnActiveChanged?.Invoke(this, new(previousActive));
@@ -160,12 +156,12 @@ public class UniverseObject : BaseEntity, IUniverseObject
protected override void InitializeInternal()
{
base.InitializeInternal();
_behaviourController ??= Factory.BehaviourControllerFactory.Instantiate(this);
_behaviourController.Initialize();
BehaviourController ??= Factory.BehaviourControllerFactory.Instantiate(this);
BehaviourController.Initialize();
}
public UniverseObject()
{
_name = GetType().Name;
Name = GetType().Name;
}
}