Ready

FinalEngine.ECS/EntitySystemBase.cs

@@ -55,7 +55,10 @@ internal void RemoveAllEntities()
         this.entities.Clear();
     }
 
-    protected abstract bool IsMatch([NotNull] IReadOnlyEntity entity);
+    protected virtual bool IsMatch([NotNull] IReadOnlyEntity entity)
+    {
+        return false;
+    }
 
     protected virtual void OnEntityAdded(Entity entity)
     {

FinalEngine.Editor.Common/Driver/Systems/EditorUpdateEntitySystem.cs

@@ -0,0 +1,33 @@
+// <copyright file="EditorUpdateEntitySystem.cs" company="Software Antics">
+// Copyright (c) Software Antics. All rights reserved.
+// </copyright>
+
+namespace FinalEngine.Editor.Common.Driver.Systems;
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using FinalEngine.ECS;
+using FinalEngine.ECS.Attributes;
+using FinalEngine.Input.Keyboards;
+using FinalEngine.Input.Mouses;
+
+[EntitySystemProcess(ExecutionType = GameLoopType.Update)]
+public sealed class EditorUpdateEntitySystem : EntitySystemBase
+{
+    private readonly IKeyboard keyboard;
+
+    private readonly IMouse mouse;
+
+    public EditorUpdateEntitySystem(IKeyboard keyboard, IMouse mouse)
+    {
+        this.keyboard = keyboard ?? throw new ArgumentNullException(nameof(keyboard));
+        this.mouse = mouse ?? throw new ArgumentNullException(nameof(mouse));
+    }
+
+    protected override void Process([NotNull] IEnumerable<Entity> entities)
+    {
+        this.keyboard.Update();
+        this.mouse.Update();
+    }
+}

FinalEngine.Editor.Desktop/App.xaml.cs

@@ -13,6 +13,7 @@ namespace FinalEngine.Editor.Desktop;
 using FinalEngine.Editor.Common.Services.Application;
 using FinalEngine.Editor.Common.Services.Environment;
 using FinalEngine.Editor.Common.Services.Scenes;
+using FinalEngine.Editor.Desktop.Extensions;
 using FinalEngine.Editor.Desktop.Services.Actions;
 using FinalEngine.Editor.Desktop.Services.Layout;
 using FinalEngine.Editor.Desktop.Views;
@@ -90,6 +91,7 @@ private static void ConfigureServices(HostBuilderContext context, IServiceCollec
         });
 
         services.AddRuntime();
+        services.AddEditorPlatform();
 
         services.AddTransient<IScene, Scene>();
 

FinalEngine.Editor.Desktop/Extensions/ServiceCollectionExtensions.cs

@@ -0,0 +1,17 @@
+// <copyright file="ServiceCollectionExtensions.cs" company="Software Antics">
+// Copyright (c) Software Antics. All rights reserved.
+// </copyright>
+
+namespace FinalEngine.Editor.Desktop.Extensions;
+
+using System;
+using Microsoft.Extensions.DependencyInjection;
+
+public static class ServiceCollectionExtensions
+{
+    public static IServiceCollection AddEditorPlatform(this IServiceCollection services)
+    {
+        ArgumentNullException.ThrowIfNull(services, nameof(services));
+        return services;
+    }
+}

FinalEngine.Editor.Desktop/FinalEngine.Editor.Desktop.csproj

@@ -64,4 +64,8 @@
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
   </ItemGroup>
+
+  <ItemGroup>
+    <Folder Include="Framework\Input\" />
+  </ItemGroup>
 </Project>

FinalEngine.Platform.Desktop/Extensions/ServiceCollectionExtensions.cs

@@ -31,7 +31,7 @@ public static void AddDesktopPlatform(this IServiceCollection services)
                 Profile = ContextProfile.Core,
 
                 AutoLoadBindings = false,
-                StartVisible = true,
+                StartVisible = false,
 
                 WindowBorder = WindowBorder.Fixed,
                 WindowState = WindowState.Normal,

FinalEngine.Rendering/Batching/SpriteDrawer.cs

@@ -35,7 +35,6 @@ internal sealed class SpriteDrawer : ISpriteDrawer, IDisposable
 
     private IVertexBuffer? vertexBuffer;
 
-    //// TODO: Projection width and height should be customizable and not set in constructor for DI.
     public SpriteDrawer(IRenderDevice renderDevice, ISpriteBatcher batcher, ITextureBinder binder, int projectionWidth, int projectionHeight)
     {
         this.renderDevice = renderDevice ?? throw new ArgumentNullException(nameof(renderDevice));

FinalEngine.Rendering/Extensions/ServiceCollectionExtensions.cs

@@ -45,7 +45,6 @@ public static IServiceCollection AddRendering(this IServiceCollection services)
         services.AddSingleton<IRenderCoordinator, RenderCoordinator>();
         services.AddSingleton<IRenderingEngine, RenderingEngine>();
 
-        // TODO: Model should be IModel? Think about a better solution to the whole thing tbh.
         services.AddResourceLoader<ITexture2D, Texture2DResourceLoader>();
         services.AddResourceLoader<IShader, ShaderResourceLoader>();
         services.AddResourceLoader<IShaderProgram, ShaderProgramResourceLoader>();

FinalEngine.Rendering/Renderers/SkyboxRenderer.cs

@@ -29,7 +29,6 @@ internal sealed class SkyboxRenderer : ISkyboxRenderer, IDisposable
 
     private ITextureCube? texture;
 
-    //// TODO: Fix this for DI stuff.
     public SkyboxRenderer(IRenderDevice renderDevice)
     {
         this.renderDevice = renderDevice ?? throw new ArgumentNullException(nameof(renderDevice));

FinalEngine.Runtime/Extensions/ServiceCollectionExtensions.cs

@@ -8,11 +8,9 @@ namespace FinalEngine.Runtime.Extensions;
 using System.IO.Abstractions;
 using FinalEngine.Audio.OpenAL.Extensions;
 using FinalEngine.Input.Extensions;
-using FinalEngine.Platform.Desktop.Extensions;
 using FinalEngine.Rendering.Extensions;
 using FinalEngine.Rendering.OpenGL.Extensions;
 using FinalEngine.Resources.Extensionss;
-using FinalEngine.Runtime.Rendering;
 using Microsoft.Extensions.DependencyInjection;
 
 public static class ServiceCollectionExtensions
@@ -22,10 +20,8 @@ public static IServiceCollection AddRuntime(this IServiceCollection services)
         ArgumentNullException.ThrowIfNull(services, nameof(services));
 
         services.AddSingleton<IFileSystem, FileSystem>();
-        services.AddSingleton<IDisplayManager, DisplayManager>();
         services.AddSingleton<IRuntimeContext, RuntimeContext>();
 
-        services.AddDesktopPlatform();
         services.AddOpenGL();
         services.AddOpenAL();
         services.AddInput();