Just need to work on input now.

softwareantics · Apr 17, 2024 · 0a9d53e · 0a9d53e
1 parent b73e4d9
commit 0a9d53e
Show file tree

Hide file tree

Showing 20 changed files with 201 additions and 109 deletions.
diff --git a/FinalEngine.Editor.Common/FinalEngine.Editor.Common.csproj b/FinalEngine.Editor.Common/FinalEngine.Editor.Common.csproj
@@ -34,6 +34,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\FinalEngine.ECS\FinalEngine.ECS.csproj" />
+    <ProjectReference Include="..\FinalEngine.Input\FinalEngine.Input.csproj" />
     <ProjectReference Include="..\FinalEngine.Rendering\FinalEngine.Rendering.csproj" />
   </ItemGroup>
 </Project>
diff --git a/FinalEngine.Editor.Common/Models/Scenes/Scene.cs b/FinalEngine.Editor.Common/Models/Scenes/Scene.cs
@@ -11,7 +11,7 @@ namespace FinalEngine.Editor.Common.Models.Scenes;
 using FinalEngine.ECS;
 using FinalEngine.ECS.Components.Core;
 using FinalEngine.ECS.Exceptions;
-using FinalEngine.Rendering.Core;
+using FinalEngine.Rendering.Components;
 using Microsoft.Extensions.Logging;
 
 public sealed class Scene : IScene
@@ -42,12 +42,12 @@ public void AddEntity(string tag, Guid uniqueID)
 
         var entity = new Entity(uniqueID);
 
-        entity.AddComponent(new Tag()
+        entity.AddComponent(new TagComponent()
         {
             Name = tag,
         });
 
-        entity.AddComponent(new Transform());
+        entity.AddComponent(new TransformComponent());
 
         this.world.AddEntity(entity);
         this.entities.Add(entity);

diff --git a/FinalEngine.Editor.Desktop/App.xaml.cs b/FinalEngine.Editor.Desktop/App.xaml.cs
@@ -32,7 +32,11 @@ namespace FinalEngine.Editor.Desktop;
 using FinalEngine.Editor.ViewModels.Services.Interactions;
 using FinalEngine.Editor.ViewModels.Services.Layout;
 using FinalEngine.Rendering;
+using FinalEngine.Rendering.Geometry;
+using FinalEngine.Rendering.Lighting;
 using FinalEngine.Rendering.OpenGL;
+using FinalEngine.Rendering.Renderers;
+using FinalEngine.Rendering.Systems.Queues;
 using FinalEngine.Resources;
 using FinalEngine.Runtime;
 using Microsoft.Extensions.DependencyInjection;
@@ -83,11 +87,29 @@ private static void ConfigureServices(HostBuilderContext context, IServiceCollec
 
         services.AddSingleton<IResourceManager>(ResourceManager.Instance);
 
-        services.AddTransient<IEntityWorld, EntityWorld>();
+        services.AddTransient<IEntityWorld>(x =>
+        {
+            var world = new EntityWorld();
+
+            world.AddSystem(new RenderModelRenderQueueSystem(x.GetRequiredService<IRenderQueue<RenderModel>>()));
+
+            return world;
+        });
 
         services.AddSingleton<IRenderPipeline, OpenGLRenderPipeline>();
         services.AddSingleton<IRenderDevice, OpenGLRenderDevice>();
 
+        services.AddSingleton<IGeometryRenderer, GeometryRenderer>();
+        services.AddSingleton<ISceneRenderer, SceneRenderer>();
+        services.AddSingleton<ILightRenderer, LightRenderer>();
+        services.AddSingleton<IRenderCoordinator, RenderCoordinator>();
+        services.AddSingleton<IRenderingEngine, RenderingEngine>();
+
+        //// TODO: ILightRenderer and IGeometryRenderer should just implement IRenderQueue directly.
+        services.AddSingleton<IRenderQueue<Model>>(x => (IRenderQueue<Model>)x.GetRequiredService<IGeometryRenderer>());
+        services.AddSingleton<IRenderQueue<RenderModel>>(x => (IRenderQueue<RenderModel>)x.GetRequiredService<IGeometryRenderer>());
+        services.AddSingleton<IRenderQueue<Light>>(x => (IRenderQueue<Light>)x.GetRequiredService<ILightRenderer>());
+
         services.AddSingleton<IEngineInitializer, EngineInitializer>();
 
         services.AddSingleton<IFileSystem, FileSystem>();

diff --git a/FinalEngine.Editor.ViewModels/Inspectors/EntityComponentViewModel.cs b/FinalEngine.Editor.ViewModels/Inspectors/EntityComponentViewModel.cs
@@ -134,7 +134,7 @@ public ICommand ToggleCommand
 
     private bool CanRemove()
     {
-        return this.component.GetType() != typeof(Tag);
+        return this.component.GetType() != typeof(TagComponent);
     }
 
     private void Remove()

diff --git a/FinalEngine.Editor.ViewModels/Inspectors/EntityInspectorViewModel.cs b/FinalEngine.Editor.ViewModels/Inspectors/EntityInspectorViewModel.cs
@@ -78,7 +78,7 @@ private void IntializeComponentTypes()
     {
         this.categorizedComponentTypes.Clear();
 
-        var assembly = Assembly.GetAssembly(typeof(Tag)) ?? throw new TypeAccessException("Failed to initialize core engine components.");
+        var assembly = Assembly.GetAssembly(typeof(TagComponent)) ?? throw new TypeAccessException("Failed to initialize core engine components.");
 
         var categoryToTypeMap = this.typeResolver.GetCategorizedTypes(assembly);
 

diff --git a/FinalEngine.Examples.Sponza/Camera.cs b/FinalEngine.Examples.Sponza/Camera.cs
@@ -6,7 +6,8 @@ namespace FinalEngine.Examples.Sponza;
 using FinalEngine.Input.Mouses;
 using FinalEngine.Maths;
 using FinalEngine.Rendering;
-using FinalEngine.Rendering.Core;
+using FinalEngine.Rendering.Components;
+using FinalEngine.Rendering.Geometry;
 
 public sealed class Camera : ICamera
 {
@@ -22,7 +23,7 @@ public Camera(int width, int height)
     {
         this.width = width;
         this.height = height;
-        this.Transform = new Transform()
+        this.Transform = new TransformComponent()
         {
             Position = new Vector3(0, 50, 0),
             Rotation = Quaternion.CreateFromAxisAngle(Vector3.UnitY, MathHelper.DegreesToRadians(45.0f)),
@@ -41,7 +42,7 @@ public Matrix4x4 Projection
         get { return Matrix4x4.CreatePerspectiveFieldOfView(MathHelper.DegreesToRadians(70.0f), this.width / this.height, 0.1f, 1000.0f); }
     }
 
-    public Transform Transform { get; }
+    public TransformComponent Transform { get; }
 
     public Matrix4x4 View
     {

diff --git a/FinalEngine.Rendering/Core/Transform.cs b/FinalEngine.Rendering/Core/Transform.cs
diff --git a/FinalEngine.Rendering/Core/ICamera.cs → FinalEngine.Rendering/Geometry/ICamera.cs b/FinalEngine.Rendering/Core/ICamera.cs → FinalEngine.Rendering/Geometry/ICamera.cs
@@ -2,18 +2,19 @@
 //     Copyright (c) Software Antics. All rights reserved.
 // </copyright>
 
-namespace FinalEngine.Rendering.Core;
+namespace FinalEngine.Rendering.Geometry;
 
 using System.Drawing;
 using System.Numerics;
+using FinalEngine.Rendering.Components;
 
 public interface ICamera
 {
     Rectangle Bounds { get; }
 
     Matrix4x4 Projection { get; }
 
-    Transform Transform { get; }
+    TransformComponent Transform { get; }
 
     Matrix4x4 View { get; }
 }
diff --git a/FinalEngine.Rendering/Geometry/RenderModel.cs b/FinalEngine.Rendering/Geometry/RenderModel.cs
@@ -4,13 +4,13 @@
 
 namespace FinalEngine.Rendering.Geometry;
 
-using FinalEngine.Rendering.Core;
+using FinalEngine.Rendering.Components;
 
 public sealed class RenderModel
 {
     private IMaterial? material;
 
-    private Transform? transform;
+    private TransformComponent? transform;
 
     public IMaterial Material
     {
@@ -20,9 +20,9 @@ public IMaterial Material
 
     public IMesh? Mesh { get; set; }
 
-    public Transform Transform
+    public TransformComponent Transform
     {
-        get { return this.transform ??= new Transform(); }
+        get { return this.transform ??= new TransformComponent(); }
         set { this.transform = value; }
     }
 }
diff --git a/FinalEngine.Rendering/IRenderingEngine.cs b/FinalEngine.Rendering/IRenderingEngine.cs
@@ -4,9 +4,12 @@
 
 namespace FinalEngine.Rendering;
 
-using FinalEngine.Rendering.Core;
+using System.Drawing;
+using FinalEngine.Rendering.Geometry;
 
 public interface IRenderingEngine
 {
+    Color ClearColor { get; }
+
     void Render(ICamera camera);
 }
diff --git a/FinalEngine.Rendering/Renderers/GeometryRenderer.cs b/FinalEngine.Rendering/Renderers/GeometryRenderer.cs
@@ -6,7 +6,7 @@ namespace FinalEngine.Rendering.Renderers;
 
 using System;
 using System.Collections.Generic;
-using FinalEngine.Rendering.Core;
+using FinalEngine.Rendering.Components;
 using FinalEngine.Rendering.Geometry;
 
 public sealed class GeometryRenderer : IRenderQueue<RenderModel>, IRenderQueue<Model>, IGeometryRenderer
@@ -87,7 +87,7 @@ private void RenderBatchInstance(IMesh? mesh)
         mesh.Draw(this.renderDevice);
     }
 
-    private void UpdateUniforms(Transform transform)
+    private void UpdateUniforms(TransformComponent transform)
     {
         this.renderDevice.Pipeline.SetUniform("u_transform", transform.CreateTransformationMatrix());
     }

diff --git a/FinalEngine.Rendering/Renderers/ISceneRenderer.cs b/FinalEngine.Rendering/Renderers/ISceneRenderer.cs
@@ -4,7 +4,7 @@
 
 namespace FinalEngine.Rendering.Renderers;
 
-using FinalEngine.Rendering.Core;
+using FinalEngine.Rendering.Geometry;
 
 public interface ISceneRenderer
 {

diff --git a/FinalEngine.Rendering/Renderers/ISkyboxRenderer.cs b/FinalEngine.Rendering/Renderers/ISkyboxRenderer.cs
@@ -4,7 +4,7 @@
 
 namespace FinalEngine.Rendering.Renderers;
 
-using FinalEngine.Rendering.Core;
+using FinalEngine.Rendering.Geometry;
 using FinalEngine.Rendering.Textures;
 
 public interface ISkyboxRenderer

diff --git a/FinalEngine.Rendering/Renderers/SceneRenderer.cs b/FinalEngine.Rendering/Renderers/SceneRenderer.cs
@@ -5,7 +5,7 @@
 namespace FinalEngine.Rendering.Renderers;
 
 using System;
-using FinalEngine.Rendering.Core;
+using FinalEngine.Rendering.Geometry;
 using FinalEngine.Rendering.Pipeline;
 using FinalEngine.Resources;
 

diff --git a/FinalEngine.Rendering/Renderers/SkyboxRenderer.cs b/FinalEngine.Rendering/Renderers/SkyboxRenderer.cs
@@ -11,7 +11,6 @@ namespace FinalEngine.Rendering.Renderers;
 
 using System;
 using System.Numerics;
-using FinalEngine.Rendering.Core;
 using FinalEngine.Rendering.Geometry;
 using FinalEngine.Rendering.Pipeline;
 using FinalEngine.Rendering.Primitives;

diff --git a/FinalEngine.Rendering/RenderingEngine.cs b/FinalEngine.Rendering/RenderingEngine.cs
@@ -7,7 +7,7 @@ namespace FinalEngine.Rendering;
 using System;
 using System.Drawing;
 using System.IO.Abstractions;
-using FinalEngine.Rendering.Core;
+using FinalEngine.Rendering.Geometry;
 using FinalEngine.Rendering.Renderers;
 
 public sealed class RenderingEngine : IRenderingEngine
@@ -20,32 +20,32 @@ public sealed class RenderingEngine : IRenderingEngine
 
     private readonly ISceneRenderer sceneRenderer;
 
-    private readonly ISkyboxRenderer skyboxRenderer;
-
     public RenderingEngine(
         IFileSystem fileSystem,
         IRenderDevice renderDevice,
         ILightRenderer lightRenderer,
-        ISkyboxRenderer skyboxRenderer,
         ISceneRenderer sceneRenderer,
         IRenderCoordinator renderCoordinator)
     {
         ArgumentNullException.ThrowIfNull(fileSystem, nameof(fileSystem));
 
         this.renderDevice = renderDevice ?? throw new ArgumentNullException(nameof(renderDevice));
         this.lightRenderer = lightRenderer ?? throw new ArgumentNullException(nameof(lightRenderer));
-        this.skyboxRenderer = skyboxRenderer ?? throw new ArgumentNullException(nameof(skyboxRenderer));
         this.sceneRenderer = sceneRenderer ?? throw new ArgumentNullException(nameof(sceneRenderer));
         this.renderCoordinator = renderCoordinator ?? throw new ArgumentNullException(nameof(renderCoordinator));
+
+        this.ClearColor = Color.FromArgb(255, 30, 30, 30);
     }
 
+    public Color ClearColor { get; set; }
+
     public void Render(ICamera camera)
     {
         ArgumentNullException.ThrowIfNull(camera, nameof(camera));
 
         this.renderDevice.Pipeline.SetFrameBuffer(null);
         this.renderDevice.Rasterizer.SetViewport(camera.Bounds);
-        this.renderDevice.Clear(Color.Black);
+        this.renderDevice.Clear(this.ClearColor);
 
         this.renderDevice.OutputMerger.SetDepthState(new DepthStateDescription()
         {
@@ -83,7 +83,5 @@ private void RenderScene(ICamera camera)
                 this.sceneRenderer.Render(camera, false);
             });
         }
-
-        this.skyboxRenderer.Render(camera);
     }
 }