Builtin classes refactoring

New component to draw dynamic geometry with custom materials
Selinux24 · Jul 27, 2024 · 698570c · 698570c
1 parent 5ca3a25
commit 698570c
Show file tree

Hide file tree

Showing 69 changed files with 592 additions and 158 deletions.
diff --git a/Engine/CubeMapGeometry.cs → ...tIn/Components/Cubemap/CubeMapGeometry.cs b/Engine/CubeMapGeometry.cs → ...tIn/Components/Cubemap/CubeMapGeometry.cs
@@ -1,5 +1,5 @@
 
-namespace Engine
+namespace Engine.BuiltIn.Components.Cubemap
 {
     /// <summary>
     /// Cube map geometry enumeration

diff --git a/Engine/Cubemap.cs → Engine/BuiltIn/Components/Cubemap/Cubemap.cs b/Engine/Cubemap.cs → Engine/BuiltIn/Components/Cubemap/Cubemap.cs
@@ -3,10 +3,11 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 
-namespace Engine
+namespace Engine.BuiltIn.Components.Cubemap
 {
     using Engine.BuiltIn.Drawers;
     using Engine.BuiltIn.Drawers.Cubemap;
+    using Engine.BuiltIn.Primitives;
     using Engine.Common;
     using Engine.Content;
 

diff --git a/Engine/CubemapDescription.cs → .../Components/Cubemap/CubemapDescription.cs b/Engine/CubemapDescription.cs → .../Components/Cubemap/CubemapDescription.cs
@@ -1,6 +1,6 @@
 using SharpDX;
 
-namespace Engine
+namespace Engine.BuiltIn.Components.Cubemap
 {
     /// <summary>
     /// Cube-map description

diff --git a/Engine/CubemapState.cs → ...uiltIn/Components/Cubemap/CubemapState.cs b/Engine/CubemapState.cs → ...uiltIn/Components/Cubemap/CubemapState.cs
@@ -1,5 +1,5 @@
 
-namespace Engine
+namespace Engine.BuiltIn.Components.Cubemap
 {
     using Engine.Common;
 

diff --git a/Engine/BuiltIn/Components/Decals/DecalDrawer.cs b/Engine/BuiltIn/Components/Decals/DecalDrawer.cs
@@ -6,6 +6,7 @@ namespace Engine.BuiltIn.Components.Decals
 {
     using Engine.BuiltIn.Drawers;
     using Engine.BuiltIn.Drawers.Decals;
+    using Engine.BuiltIn.Primitives;
     using Engine.Common;
     using Engine.Content;
 

diff --git a/Engine/BuiltIn/Components/Foliage/FoliageBuffer.cs b/Engine/BuiltIn/Components/Foliage/FoliageBuffer.cs
@@ -1,4 +1,5 @@
 using Engine.BuiltIn.Drawers;
+using Engine.BuiltIn.Primitives;
 using Engine.Common;
 using System;
 

diff --git a/Engine/BuiltIn/Components/Foliage/FoliagePatch.cs b/Engine/BuiltIn/Components/Foliage/FoliagePatch.cs
@@ -1,4 +1,5 @@
-using Engine.Collections;
+using Engine.BuiltIn.Primitives;
+using Engine.Collections;
 using Engine.Common;
 using SharpDX;
 using System;

diff --git a/Engine/BuiltIn/Components/Ground/Scenery.cs b/Engine/BuiltIn/Components/Ground/Scenery.cs
@@ -11,6 +11,7 @@ namespace Engine.BuiltIn.Components.Ground
     using Engine.BuiltIn.Drawers;
     using Engine.BuiltIn.Drawers.Deferred;
     using Engine.BuiltIn.Drawers.Forward;
+    using Engine.BuiltIn.Primitives;
     using Engine.Collections.Generic;
     using Engine.Common;
     using Engine.Content;

diff --git a/Engine/BuiltIn/Components/Ground/Terrain.cs b/Engine/BuiltIn/Components/Ground/Terrain.cs
@@ -9,6 +9,7 @@ namespace Engine.BuiltIn.Components.Ground
     using Engine.BuiltIn.Drawers;
     using Engine.BuiltIn.Drawers.Common;
     using Engine.BuiltIn.Drawers.Deferred;
+    using Engine.BuiltIn.Primitives;
     using Engine.Common;
     using Engine.Content;
 

diff --git a/Engine/BuiltIn/Components/Ground/TerrainGrid.cs b/Engine/BuiltIn/Components/Ground/TerrainGrid.cs
@@ -7,6 +7,7 @@
 namespace Engine.BuiltIn.Components.Ground
 {
     using Engine.BuiltIn.Drawers;
+    using Engine.BuiltIn.Primitives;
     using Engine.Collections.Generic;
     using Engine.Common;
 

diff --git a/Engine/BuiltIn/Components/Model/Model.cs b/Engine/BuiltIn/Components/Model/Model.cs
@@ -281,7 +281,7 @@ public override bool Draw(DrawContext context)
                     continue;
                 }
 
-                var drawer = GetDrawer(context.DrawerMode, mesh.VertextType, false);
+                var drawer = BuiltInDrawer.GetDrawer(context.DrawerMode, mesh.VertextType, false);
                 if (drawer == null)
                 {
                     continue;

diff --git a/Engine/BuiltIn/Components/Model/ModelInstanced.cs b/Engine/BuiltIn/Components/Model/ModelInstanced.cs
@@ -9,6 +9,7 @@
 namespace Engine.BuiltIn.Components.Models
 {
     using Engine.BuiltIn.Drawers;
+    using Engine.BuiltIn.Primitives;
     using Engine.Common;
 
     /// <summary>
@@ -152,7 +153,7 @@ protected override void Dispose(bool disposing)
         {
             if (disposing)
             {
-                BufferManager.RemoveInstancingData(InstancingBuffer);
+                BufferManager.RemoveInstancingData<VertexInstancingData>(InstancingBuffer);
                 InstancingBuffer = null;
             }
 
@@ -182,7 +183,7 @@ public override async Task ReadAssets(ModelInstancedDescription description)
         /// <inheritdoc/>
         public override async Task InitializeAssets()
         {
-            InstancingBuffer = BufferManager.AddInstancingData($"{Name}.Instances", true, Description.Instances);
+            InstancingBuffer = BufferManager.AddInstancingData<VertexInstancingData>($"{Name}.Instances", true, Description.Instances);
 
             foreach (var drawable in GetDrawingDataCollection())
             {
@@ -493,7 +494,7 @@ private int DrawMesh(DrawContext context, DrawingData drawingData, ModelInstance
                     continue;
                 }
 
-                var drawer = GetDrawer(context.DrawerMode, mesh.VertextType, true);
+                var drawer = BuiltInDrawer.GetDrawer(context.DrawerMode, mesh.VertextType, true);
                 if (drawer == null)
                 {
                     continue;

diff --git a/Engine/BuiltIn/Components/Particles/ParticleSystemCPU.cs b/Engine/BuiltIn/Components/Particles/ParticleSystemCPU.cs
@@ -5,6 +5,7 @@ namespace Engine.BuiltIn.Components.Particles
 {
     using Engine.BuiltIn.Drawers;
     using Engine.BuiltIn.Drawers.Particles;
+    using Engine.BuiltIn.Primitives;
     using Engine.Common;
     using Engine.Content;
 

diff --git a/Engine/BuiltIn/Components/Particles/ParticleSystemGPU.cs b/Engine/BuiltIn/Components/Particles/ParticleSystemGPU.cs
@@ -5,6 +5,7 @@ namespace Engine.BuiltIn.Components.Particles
 {
     using Engine.BuiltIn.Drawers;
     using Engine.BuiltIn.Drawers.Particles;
+    using Engine.BuiltIn.Primitives;
     using Engine.Common;
     using Engine.Content;
 

diff --git a/Engine/BuiltIn/Components/Primitives/GeometryColorDrawer.cs b/Engine/BuiltIn/Components/Primitives/GeometryColorDrawer.cs
@@ -8,6 +8,7 @@ namespace Engine.BuiltIn.Components.Primitives
 {
     using Engine.BuiltIn.Drawers;
     using Engine.BuiltIn.Drawers.Forward;
+    using Engine.BuiltIn.Primitives;
     using Engine.Common;
 
     /// <summary>