From d58f3937deb10366c663f5b94da0bd78ec998fc4 Mon Sep 17 00:00:00 2001 From: ikpil Date: Tue, 18 Jul 2023 22:16:06 +0900 Subject: [PATCH] for unity3d --- .../Tools/TestNavmeshTool.cs | 27 ++---------------- .../Tools/TestNavmeshToolImpl.cs | 28 +++++++++++++++++++ 2 files changed, 31 insertions(+), 24 deletions(-) diff --git a/src/DotRecast.Recast.Demo/Tools/TestNavmeshTool.cs b/src/DotRecast.Recast.Demo/Tools/TestNavmeshTool.cs index 70fc0a2..cf68fe5 100644 --- a/src/DotRecast.Recast.Demo/Tools/TestNavmeshTool.cs +++ b/src/DotRecast.Recast.Demo/Tools/TestNavmeshTool.cs @@ -38,7 +38,7 @@ public class TestNavmeshTool : IRcTool private List m_polys; private List m_parent; private float m_neighbourhoodRadius; - private readonly RcVec3f[] m_queryPoly = new RcVec3f[4]; + private RcVec3f[] m_queryPoly = new RcVec3f[4]; private List m_smoothPath; private DtStatus m_pathFindStatus = DtStatus.DT_FAILURE; private readonly List randomPoints = new(); @@ -264,7 +264,6 @@ public class TestNavmeshTool : IRcTool m_distanceToWall = 0; if (m_sposSet && m_startRef != 0) { - m_distanceToWall = 0.0f; var result = m_navQuery.FindDistanceToWall(m_startRef, m_spos, 100.0f, m_filter, out var hitDist, out var hitPos, out var hitNormal); if (result.Succeeded()) { @@ -298,33 +297,13 @@ public class TestNavmeshTool : IRcTool { if (m_sposSet && m_startRef != 0 && m_eposSet) { - float nx = (m_epos.z - m_spos.z) * 0.25f; - float nz = -(m_epos.x - m_spos.x) * 0.25f; - float agentHeight = _impl.GetSample() != null ? _impl.GetSample().GetSettings().agentHeight : 0; - - m_queryPoly[0].x = m_spos.x + nx * 1.2f; - m_queryPoly[0].y = m_spos.y + agentHeight / 2; - m_queryPoly[0].z = m_spos.z + nz * 1.2f; - - m_queryPoly[1].x = m_spos.x - nx * 1.3f; - m_queryPoly[1].y = m_spos.y + agentHeight / 2; - m_queryPoly[1].z = m_spos.z - nz * 1.3f; - - m_queryPoly[2].x = m_epos.x - nx * 0.8f; - m_queryPoly[2].y = m_epos.y + agentHeight / 2; - m_queryPoly[2].z = m_epos.z - nz * 0.8f; - - m_queryPoly[3].x = m_epos.x + nx; - m_queryPoly[3].y = m_epos.y + agentHeight / 2; - m_queryPoly[3].z = m_epos.z + nz; - var refs = new List(); var parentRefs = new List(); - var costs = new List(); - var status = m_navQuery.FindPolysAroundShape(m_startRef, m_queryPoly, m_filter, ref refs, ref parentRefs, ref costs); + var status = _impl.FindPolysAroundShape(m_startRef, m_spos, m_epos, m_filter, ref refs, ref parentRefs, out var queryPoly); if (status.Succeeded()) { + m_queryPoly = queryPoly; m_polys = refs; m_parent = parentRefs; } diff --git a/src/DotRecast.Recast.DemoTool/Tools/TestNavmeshToolImpl.cs b/src/DotRecast.Recast.DemoTool/Tools/TestNavmeshToolImpl.cs index a6c8d70..0c22204 100644 --- a/src/DotRecast.Recast.DemoTool/Tools/TestNavmeshToolImpl.cs +++ b/src/DotRecast.Recast.DemoTool/Tools/TestNavmeshToolImpl.cs @@ -251,5 +251,33 @@ namespace DotRecast.Recast.DemoTool.Tools return status; } + + public DtStatus FindPolysAroundShape(long startRef, RcVec3f m_spos, RcVec3f m_epos, IDtQueryFilter filter, ref List resultRef, ref List resultParent, out RcVec3f[] queryPoly) + { + float nx = (m_epos.z - m_spos.z) * 0.25f; + float nz = -(m_epos.x - m_spos.x) * 0.25f; + float agentHeight = GetSample() != null ? GetSample().GetSettings().agentHeight : 0; + + queryPoly = new RcVec3f[4]; + queryPoly[0].x = m_spos.x + nx * 1.2f; + queryPoly[0].y = m_spos.y + agentHeight / 2; + queryPoly[0].z = m_spos.z + nz * 1.2f; + + queryPoly[1].x = m_spos.x - nx * 1.3f; + queryPoly[1].y = m_spos.y + agentHeight / 2; + queryPoly[1].z = m_spos.z - nz * 1.3f; + + queryPoly[2].x = m_epos.x - nx * 0.8f; + queryPoly[2].y = m_epos.y + agentHeight / 2; + queryPoly[2].z = m_epos.z - nz * 0.8f; + + queryPoly[3].x = m_epos.x + nx; + queryPoly[3].y = m_epos.y + agentHeight / 2; + queryPoly[3].z = m_epos.z + nz; + + var costs = new List(); + var navQuery = _sample.GetNavMeshQuery(); + return navQuery.FindPolysAroundShape(startRef, queryPoly, filter, ref resultRef, ref resultParent, ref costs); + } } } \ No newline at end of file