From 6dbd22ecb7dede6a8479b0e7d0f5e9e76c0a5d70 Mon Sep 17 00:00:00 2001 From: ikpil Date: Mon, 17 Jul 2023 23:24:28 +0900 Subject: [PATCH] change name RcSegmentVert for unity3d --- .../{SegmentVert.cs => RcSegmentVert.cs} | 4 ++-- src/DotRecast.Detour.Crowd/DtLocalBoundary.cs | 6 +++--- src/DotRecast.Detour/DtNavMeshQuery.cs | 8 ++++---- src/DotRecast.Recast.Demo/Tools/TestNavmeshTool.cs | 4 ++-- .../GetPolyWallSegmentsTest.cs | 14 +++++++------- 5 files changed, 18 insertions(+), 18 deletions(-) rename src/DotRecast.Core/{SegmentVert.cs => RcSegmentVert.cs} (70%) diff --git a/src/DotRecast.Core/SegmentVert.cs b/src/DotRecast.Core/RcSegmentVert.cs similarity index 70% rename from src/DotRecast.Core/SegmentVert.cs rename to src/DotRecast.Core/RcSegmentVert.cs index 0e04c4e..7bcadd7 100644 --- a/src/DotRecast.Core/SegmentVert.cs +++ b/src/DotRecast.Core/RcSegmentVert.cs @@ -1,11 +1,11 @@ namespace DotRecast.Core { - public struct SegmentVert + public struct RcSegmentVert { public RcVec3f vmin; public RcVec3f vmax; - public SegmentVert(float v0, float v1, float v2, float v3, float v4, float v5) + public RcSegmentVert(float v0, float v1, float v2, float v3, float v4, float v5) { vmin.x = v0; vmin.y = v1; diff --git a/src/DotRecast.Detour.Crowd/DtLocalBoundary.cs b/src/DotRecast.Detour.Crowd/DtLocalBoundary.cs index 0a6291b..5eddc81 100644 --- a/src/DotRecast.Detour.Crowd/DtLocalBoundary.cs +++ b/src/DotRecast.Detour.Crowd/DtLocalBoundary.cs @@ -48,7 +48,7 @@ namespace DotRecast.Detour.Crowd m_segs.Clear(); } - protected void AddSegment(float dist, SegmentVert s) + protected void AddSegment(float dist, RcSegmentVert s) { // Insert neighbour based on the distance. DtSegment seg = new DtSegment(); @@ -107,7 +107,7 @@ namespace DotRecast.Detour.Crowd // Secondly, store all polygon edges. m_segs.Clear(); - var segmentVerts = new List(); + var segmentVerts = new List(); var segmentRefs = new List(); for (int j = 0; j < m_polys.Count; ++j) @@ -117,7 +117,7 @@ namespace DotRecast.Detour.Crowd { for (int k = 0; k < segmentRefs.Count; ++k) { - SegmentVert s = segmentVerts[k]; + RcSegmentVert s = segmentVerts[k]; var s0 = s.vmin; var s3 = s.vmax; diff --git a/src/DotRecast.Detour/DtNavMeshQuery.cs b/src/DotRecast.Detour/DtNavMeshQuery.cs index 4e9cf18..f802ff0 100644 --- a/src/DotRecast.Detour/DtNavMeshQuery.cs +++ b/src/DotRecast.Detour/DtNavMeshQuery.cs @@ -2998,7 +2998,7 @@ namespace DotRecast.Detour /// @param[in] maxSegments The maximum number of segments the result arrays can hold. /// @returns The status flags for the query. public DtStatus GetPolyWallSegments(long refs, bool storePortals, IDtQueryFilter filter, - ref List segmentVerts, ref List segmentRefs) + ref List segmentVerts, ref List segmentRefs) { segmentVerts.Clear(); segmentRefs.Clear(); @@ -3060,7 +3060,7 @@ namespace DotRecast.Detour int ivj = poly.verts[j] * 3; int ivi = poly.verts[i] * 3; - var seg = new SegmentVert(); + var seg = new RcSegmentVert(); seg.vmin.Set(tile.data.verts, ivj); seg.vmax.Set(tile.data.verts, ivi); // Array.Copy(tile.data.verts, ivj, seg, 0, 3); @@ -3084,7 +3084,7 @@ namespace DotRecast.Detour { float tmin = ints[k].tmin / 255.0f; float tmax = ints[k].tmax / 255.0f; - var seg = new SegmentVert(); + var seg = new RcSegmentVert(); seg.vmin = RcVec3f.Lerp(tile.data.verts, vj, vi, tmin); seg.vmax = RcVec3f.Lerp(tile.data.verts, vj, vi, tmax); segmentVerts.Add(seg); @@ -3098,7 +3098,7 @@ namespace DotRecast.Detour { float tmin = imin / 255.0f; float tmax = imax / 255.0f; - var seg = new SegmentVert(); + var seg = new RcSegmentVert(); seg.vmin = RcVec3f.Lerp(tile.data.verts, vj, vi, tmin); seg.vmax = RcVec3f.Lerp(tile.data.verts, vj, vi, tmax); segmentVerts.Add(seg); diff --git a/src/DotRecast.Recast.Demo/Tools/TestNavmeshTool.cs b/src/DotRecast.Recast.Demo/Tools/TestNavmeshTool.cs index 15370dd..70fc0a2 100644 --- a/src/DotRecast.Recast.Demo/Tools/TestNavmeshTool.cs +++ b/src/DotRecast.Recast.Demo/Tools/TestNavmeshTool.cs @@ -688,7 +688,7 @@ public class TestNavmeshTool : IRcTool { if (m_polys != null) { - var segmentVerts = new List(); + var segmentVerts = new List(); var segmentRefs = new List(); for (int i = 0; i < m_polys.Count; i++) @@ -717,7 +717,7 @@ public class TestNavmeshTool : IRcTool dd.Begin(LINES, 2.0f); for (int j = 0; j < segmentVerts.Count; ++j) { - SegmentVert s = segmentVerts[j]; + RcSegmentVert s = segmentVerts[j]; var v0 = s.vmin; var s3 = s.vmax; // Skip too distant segments. diff --git a/test/DotRecast.Detour.Test/GetPolyWallSegmentsTest.cs b/test/DotRecast.Detour.Test/GetPolyWallSegmentsTest.cs index d0e4946..9add7e0 100644 --- a/test/DotRecast.Detour.Test/GetPolyWallSegmentsTest.cs +++ b/test/DotRecast.Detour.Test/GetPolyWallSegmentsTest.cs @@ -25,15 +25,15 @@ namespace DotRecast.Detour.Test; [Parallelizable] public class GetPolyWallSegmentsTest : AbstractDetourTest { - private static readonly SegmentVert[][] VERTICES = + private static readonly RcSegmentVert[][] VERTICES = { - new SegmentVert[] + new RcSegmentVert[] { new(22.084785f, 10.197294f, -48.341274f, 22.684784f, 10.197294f, -44.141273f), new(22.684784f, 10.197294f, -44.141273f, 23.884785f, 10.197294f, -48.041275f), new(23.884785f, 10.197294f, -48.041275f, 22.084785f, 10.197294f, -48.341274f), }, - new SegmentVert[] + new RcSegmentVert[] { new(27.784786f, 10.197294f, 4.158730f, 28.384785f, 10.197294f, 2.358727f), new(28.384785f, 10.197294f, 2.358727f, 28.384785f, 10.197294f, -2.141273f), @@ -42,7 +42,7 @@ public class GetPolyWallSegmentsTest : AbstractDetourTest new(19.684784f, 10.197294f, -4.241272f, 19.684784f, 10.197294f, 4.158730f), new(19.684784f, 10.197294f, 4.158730f, 27.784786f, 10.197294f, 4.158730f), }, - new SegmentVert[] + new RcSegmentVert[] { new(22.384785f, 14.997294f, -71.741272f, 19.084785f, 16.597294f, -74.741272f), new(19.084785f, 16.597294f, -74.741272f, 18.184784f, 15.997294f, -73.541275f), @@ -51,7 +51,7 @@ public class GetPolyWallSegmentsTest : AbstractDetourTest new(17.584785f, 14.997294f, -70.841278f, 22.084785f, 14.997294f, -70.541275f), new(22.084785f, 14.997294f, -70.541275f, 22.384785f, 14.997294f, -71.741272f), }, - new SegmentVert[] + new RcSegmentVert[] { new(4.684784f, 10.197294f, -6.941269f, 1.984785f, 10.197294f, -8.441269f), new(1.984785f, 10.197294f, -8.441269f, -4.015217f, 10.197294f, -6.941269f), @@ -60,7 +60,7 @@ public class GetPolyWallSegmentsTest : AbstractDetourTest new(1.384785f, 10.197294f, 1.458725f, 7.984783f, 10.197294f, -2.441269f), new(7.984783f, 10.197294f, -2.441269f, 4.684784f, 10.197294f, -6.941269f), }, - new SegmentVert[] + new RcSegmentVert[] { new(-22.315216f, 6.597294f, -17.141273f, -23.815216f, 5.397294f, -13.841270f), new(-23.815216f, 5.397294f, -13.841270f, -24.115217f, 4.997294f, -12.041275f), @@ -82,7 +82,7 @@ public class GetPolyWallSegmentsTest : AbstractDetourTest [Test] public void TestFindDistanceToWall() { - var segmentVerts = new List(); + var segmentVerts = new List(); var segmentRefs = new List(); IDtQueryFilter filter = new DtQueryDefaultFilter();