From 2ad25f07558cc6fecc00a9f52dafdaf7c2bbb082 Mon Sep 17 00:00:00 2001 From: ikpil Date: Tue, 4 Apr 2023 13:52:07 +0900 Subject: [PATCH] remove unused vDistSqr --- src/DotRecast.Core/RecastMath.cs | 49 +++++-------------- .../Tools/ConvexVolumeTool.cs | 2 +- .../Tools/CrowdProfilingTool.cs | 4 +- 3 files changed, 16 insertions(+), 39 deletions(-) diff --git a/src/DotRecast.Core/RecastMath.cs b/src/DotRecast.Core/RecastMath.cs index 638006f..d4856cc 100644 --- a/src/DotRecast.Core/RecastMath.cs +++ b/src/DotRecast.Core/RecastMath.cs @@ -27,14 +27,6 @@ namespace DotRecast.Core public const float EPS = 1e-4f; private static readonly float EQUAL_THRESHOLD = sqr(1.0f / 16384.0f); - public static float vDistSqr(float[] v1, float[] v2, int i) - { - float dx = v2[i] - v1[0]; - float dy = v2[i + 1] - v1[1]; - float dz = v2[i + 2] - v1[2]; - return dx * dx + dy * dy + dz * dz; - } - public static float vDistSqr(Vector3f v1, float[] v2, int i) { float dx = v2[i] - v1[0]; @@ -43,14 +35,21 @@ namespace DotRecast.Core return dx * dx + dy * dy + dz * dz; } - public static float vDistSqr(Vector3f v1, Vector3f v2, int i) + public static float vDistSqr(Vector3f v1, Vector3f v2) { - float dx = v2[i] - v1[0]; - float dy = v2[i + 1] - v1[1]; - float dz = v2[i + 2] - v1[2]; + float dx = v2[0] - v1[0]; + float dy = v2[1] - v1[1]; + float dz = v2[2] - v1[2]; + return dx * dx + dy * dy + dz * dz; + } + + public static float vDistSqr(float[] v, int i, int j) + { + float dx = v[i] - v[j]; + float dy = v[i + 1] - v[j + 1]; + float dz = v[i + 2] - v[j + 2]; return dx * dx + dy * dy + dz * dz; } - public static Vector3f vCross(Vector3f v1, Vector3f v2) { @@ -82,13 +81,7 @@ namespace DotRecast.Core return totd; } - public static float vDistSqr(float[] v, int i, int j) - { - float dx = v[i] - v[j]; - float dy = v[i + 1] - v[j + 1]; - float dz = v[i + 2] - v[j + 2]; - return dx * dx + dy * dy + dz * dz; - } + public static float step(float threshold, float v) { @@ -330,22 +323,6 @@ namespace DotRecast.Core return dx * dx + dy * dy + dz * dz; } - public static float vDistSqr(Vector3f v1, float[] v2) - { - float dx = v2[0] - v1[0]; - float dy = v2[1] - v1[1]; - float dz = v2[2] - v1[2]; - return dx * dx + dy * dy + dz * dz; - } - - - public static float vDistSqr(Vector3f v1, Vector3f v2) - { - float dx = v2[0] - v1[0]; - float dy = v2[1] - v1[1]; - float dz = v2[2] - v1[2]; - return dx * dx + dy * dy + dz * dz; - } /// Derives the square of the scalar length of the vector. (len * len) diff --git a/src/DotRecast.Recast.Demo/Tools/ConvexVolumeTool.cs b/src/DotRecast.Recast.Demo/Tools/ConvexVolumeTool.cs index b4604af..e9143b0 100644 --- a/src/DotRecast.Recast.Demo/Tools/ConvexVolumeTool.cs +++ b/src/DotRecast.Recast.Demo/Tools/ConvexVolumeTool.cs @@ -80,7 +80,7 @@ public class ConvexVolumeTool : Tool // Create // If clicked on that last pt, create the shape. - if (pts.Count > 0 && RecastMath.vDistSqr(p, Vector3f.Of(pts[pts.Count - 3], pts[pts.Count - 2], pts[pts.Count - 1]), 0) < 0.2f * 0.2f) + if (pts.Count > 0 && RecastMath.vDistSqr(p, Vector3f.Of(pts[pts.Count - 3], pts[pts.Count - 2], pts[pts.Count - 1])) < 0.2f * 0.2f) { if (hull.Count > 2) { diff --git a/src/DotRecast.Recast.Demo/Tools/CrowdProfilingTool.cs b/src/DotRecast.Recast.Demo/Tools/CrowdProfilingTool.cs index a89cfa8..31a8369 100644 --- a/src/DotRecast.Recast.Demo/Tools/CrowdProfilingTool.cs +++ b/src/DotRecast.Recast.Demo/Tools/CrowdProfilingTool.cs @@ -188,7 +188,7 @@ public class CrowdProfilingTool bool valid = true; foreach (FindRandomPointResult zone in zones) { - if (RecastMath.vDistSqr(zone.getRandomPt(), result.result.getRandomPt(), 0) < zoneSeparation) + if (RecastMath.vDistSqr(zone.getRandomPt(), result.result.getRandomPt()) < zoneSeparation) { valid = false; break; @@ -312,7 +312,7 @@ public class CrowdProfilingTool List potentialTargets = new(); foreach (FindRandomPointResult zone in zones) { - if (RecastMath.vDistSqr(zone.getRandomPt(), ag.npos, 0) > zoneRadius * zoneRadius) + if (RecastMath.vDistSqr(zone.getRandomPt(), ag.npos) > zoneRadius * zoneRadius) { potentialTargets.Add(zone); }