No point passing in funcs to the Mesh class

softwareantics · Jan 11, 2024 · c44a979 · c44a979
1 parent 6fb1d6a
commit c44a979
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 9 deletions.
diff --git a/FinalEngine.Examples.Sponza/Program.cs b/FinalEngine.Examples.Sponza/Program.cs
@@ -123,14 +123,15 @@ private static void Main()
             3
         ];
 
+        MeshVertex.CalculateNormals(vertices, indices);
+        MeshVertex.CalculateTangents(vertices, indices);
+
         var mesh = new Mesh<MeshVertex>(
             renderDevice.Factory,
             vertices,
             indices,
             MeshVertex.InputElements,
-            MeshVertex.SizeInBytes,
-            MeshVertex.CalculateNormals,
-            MeshVertex.CalculateTangents);
+            MeshVertex.SizeInBytes);
 
         var material = new Material()
         {

diff --git a/FinalEngine.Rendering/Geometry/Mesh.cs b/FinalEngine.Rendering/Geometry/Mesh.cs
@@ -24,18 +24,13 @@ public Mesh(
         TVertex[] vertices,
         int[] indices,
         IReadOnlyCollection<InputElement> inputElements,
-        int vertexStride,
-        CalculateNormals? calculateNormals = null,
-        CalculateTangents? calculateTangents = null)
+        int vertexStride)
     {
         ArgumentNullException.ThrowIfNull(factory, nameof(factory));
         ArgumentNullException.ThrowIfNull(vertices, nameof(vertices));
         ArgumentNullException.ThrowIfNull(indices, nameof(indices));
         ArgumentNullException.ThrowIfNull(inputElements, nameof(inputElements));
 
-        calculateNormals?.Invoke(vertices, indices);
-        calculateTangents?.Invoke(vertices, indices);
-
         this.vertexBuffer = factory.CreateVertexBuffer(
             BufferUsageType.Static,
             vertices,