Removed RcVecUtils.Create(float[] values)

ikpil · Jun 8, 2024 · fd03f0f · fd03f0f
1 parent ed7173d
commit fd03f0f
Show file tree

Hide file tree

Showing 10 changed files with 33 additions and 39 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -22,6 +22,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Removed RcVecUtils.Subtract(float[] verts, int i, int j)
 - Removed RcMeshDetails.VdistSq2(float[], float[])
 - Removed RcVecUtils.Min(), RcVecUtils.Max()
+- Removed RcVecUtils.Create(float[] values)
 
 ### Special Thanks
 - [@Doprez](https://github.com/Doprez)

diff --git a/src/DotRecast.Core/Numerics/RcVec3f.cs b/src/DotRecast.Core/Numerics/RcVec3f.cs
@@ -50,6 +50,19 @@ public RcVec3f(float f)
             Z = f;
         }
 
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public RcVec3f(ReadOnlySpan<float> values)
+        {
+            if (values.Length < 3)
+            {
+                RcThrowHelper.ThrowArgumentOutOfRangeException(nameof(values));
+            }
+
+            X = values[0];
+            Y = values[1];
+            Z = values[2];
+        }
+
 
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public readonly float Length()

diff --git a/src/DotRecast.Core/Numerics/RcVecUtils.cs b/src/DotRecast.Core/Numerics/RcVecUtils.cs
@@ -7,12 +7,6 @@ public static class RcVecUtils
     {
         public const float EPSILON = 1e-6f;
 
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static RcVec3f Create(float[] values)
-        {
-            return Create(values, 0);
-        }
-
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public static RcVec3f Create(Span<float> values, int n)
         {
@@ -112,26 +106,6 @@ public static RcVec3f SafeNormalize(RcVec3f v)
             return v;
         }
 
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static RcVec3f Min(RcVec3f v, float[] @in, int i)
-        {
-            return new RcVec3f(
-                (v.X < @in[i + 0]) ? v.X : @in[i + 0],
-                (v.Y < @in[i + 1]) ? v.Y : @in[i + 1],
-                (v.Z < @in[i + 2]) ? v.Z : @in[i + 2]
-            );
-        }
-
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static RcVec3f Max(RcVec3f v, float[] @in, int i)
-        {
-            return new RcVec3f(
-                (v.X > @in[i + 0]) ? v.X : @in[i + 0],
-                (v.Y > @in[i + 1]) ? v.Y : @in[i + 1],
-                (v.Z > @in[i + 2]) ? v.Z : @in[i + 2]
-            );
-        }
-
         /// Derives the distance between the specified points on the xz-plane.
         /// @param[in] v1 A point. [(x, y, z)]
         /// @param[in] v2 A point. [(x, y, z)]

diff --git a/src/DotRecast.Core/RcThrowHelper.cs b/src/DotRecast.Core/RcThrowHelper.cs
@@ -15,6 +15,12 @@ public static void ThrowExceptionIfIndexOutOfRange(int index, int size)
             }
         }
 
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public static void ThrowArgumentOutOfRangeException(string argument)
+        {
+            throw new ArgumentOutOfRangeException(argument);
+        }
+
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public static void StackOverflow()
         {

diff --git a/src/DotRecast.Detour.Crowd/DtPathCorridor.cs b/src/DotRecast.Detour.Crowd/DtPathCorridor.cs
@@ -436,7 +436,7 @@ public bool TrimInvalidPath(long safeRef, float[] safePos, DtNavMeshQuery navque
             else if (n == 0)
             {
                 // The first polyref is bad, use current safe values.
-                m_pos = RcVecUtils.Create(safePos);
+                m_pos = new RcVec3f(safePos);
                 m_path.Clear();
                 m_path.Add(safeRef);
                 m_npath = 1;

diff --git a/src/DotRecast.Recast.Toolset/Geom/DemoInputGeomProvider.cs b/src/DotRecast.Recast.Toolset/Geom/DemoInputGeomProvider.cs
@@ -57,8 +57,8 @@ public DemoInputGeomProvider(float[] vertices, int[] faces)
             this.faces = faces;
             normals = new float[faces.Length];
             CalculateNormals();
-            bmin = RcVecUtils.Create(vertices);
-            bmax = RcVecUtils.Create(vertices);
+            bmin = new RcVec3f(vertices);
+            bmax = new RcVec3f(vertices);
             for (int i = 1; i < vertices.Length / 3; i++)
             {
                 bmin = RcVec3f.Min(bmin, RcVecUtils.Create(vertices, i * 3));

diff --git a/src/DotRecast.Recast/Geom/SimpleInputGeomProvider.cs b/src/DotRecast.Recast/Geom/SimpleInputGeomProvider.cs
@@ -77,8 +77,8 @@ public SimpleInputGeomProvider(float[] vertices, int[] faces)
             this.faces = faces;
             normals = new float[faces.Length];
             CalculateNormals();
-            bmin = RcVecUtils.Create(vertices);
-            bmax = RcVecUtils.Create(vertices);
+            bmin = new RcVec3f(vertices);
+            bmax = new RcVec3f(vertices);
             for (int i = 1; i < vertices.Length / 3; i++)
             {
                 bmin = RcVec3f.Min(bmin, RcVecUtils.Create(vertices, i * 3));

diff --git a/src/DotRecast.Recast/RcAreas.cs b/src/DotRecast.Recast/RcAreas.cs
@@ -456,8 +456,8 @@ public static void MarkConvexPolyArea(RcContext context, float[] verts,
             int zStride = xSize; // For readability
 
             // Compute the bounding box of the polygon
-            RcVec3f bmin = RcVecUtils.Create(verts);
-            RcVec3f bmax = RcVecUtils.Create(verts);
+            RcVec3f bmin = new RcVec3f(verts);
+            RcVec3f bmax = new RcVec3f(verts);
             for (int i = 3; i < verts.Length; i += 3)
             {
                 bmin = RcVec3f.Min(bmin, RcVecUtils.Create(verts, i));

diff --git a/src/DotRecast.Recast/RcFilledVolumeRasterization.cs b/src/DotRecast.Recast/RcFilledVolumeRasterization.cs
@@ -525,7 +525,7 @@ private static float[] IntersectBox(float[] rectangle, float[] vertices, float[]
                 {
                     if (MathF.Abs(planes[j][1]) > EPSILON)
                     {
-                        float dotNormalPoint = RcVec3f.Dot(RcVecUtils.Create(planes[j]), point);
+                        float dotNormalPoint = RcVec3f.Dot(new RcVec3f(planes[j]), point);
                         float t = (planes[j][3] - dotNormalPoint) / planes[j][1];
                         float y = point.Y + t;
                         bool valid = true;
@@ -729,15 +729,15 @@ private static bool ZSlabSegmentIntersection(float[] rectangle, float x, float y
         private static bool RayTriangleIntersection(RcVec3f point, int plane, float[][] planes, out float y)
         {
             y = 0.0f;
-            float t = (planes[plane][3] - RcVec3f.Dot(RcVecUtils.Create(planes[plane]), point)) / planes[plane][1];
+            float t = (planes[plane][3] - RcVec3f.Dot(new RcVec3f(planes[plane]), point)) / planes[plane][1];
             RcVec3f s = new RcVec3f(point.X, point.Y + t, point.Z);
-            float u = RcVec3f.Dot(s, RcVecUtils.Create(planes[plane + 1])) - planes[plane + 1][3];
+            float u = RcVec3f.Dot(s, new RcVec3f(planes[plane + 1])) - planes[plane + 1][3];
             if (u < 0.0f || u > 1.0f)
             {
                 return false;
             }
 
-            float v = RcVec3f.Dot(s, RcVecUtils.Create(planes[plane + 2])) - planes[plane + 2][3];
+            float v = RcVec3f.Dot(s, new RcVec3f(planes[plane + 2])) - planes[plane + 2][3];
             if (v < 0.0f)
             {
                 return false;

diff --git a/src/DotRecast.Recast/RcMeshDetails.cs b/src/DotRecast.Recast/RcMeshDetails.cs
@@ -931,8 +931,8 @@ public static int BuildPolyDetail(RcContext ctx, float[] @in, int nin,
             if (sampleDist > 0)
             {
                 // Create sample locations in a grid.
-                RcVec3f bmin = RcVecUtils.Create(@in);
-                RcVec3f bmax = RcVecUtils.Create(@in);
+                RcVec3f bmin = new RcVec3f(@in);
+                RcVec3f bmax = new RcVec3f(@in);
                 for (int i = 1; i < nin; ++i)
                 {
                     bmin = RcVec3f.Min(bmin, RcVecUtils.Create(@in, i * 3));