From 4c8c596450294d4ba49d1c9593b54b14218b6b99 Mon Sep 17 00:00:00 2001
From: ikpil <ikpil@naver.com>
Date: Fri, 12 Jan 2024 01:46:00 +0900
Subject: [PATCH] bugfix: creating convex volume with two points(#34)

- Issue reporter @adambennett55
- https://github.com/ikpil/DotRecast/issues/34
---
 .../Tools/ConvexVolumeSampleTool.cs           |  8 +--
 .../Tools/RcConvexVolumeTool.cs               | 53 +++++++++++++++----
 2 files changed, 44 insertions(+), 17 deletions(-)

diff --git a/src/DotRecast.Recast.Demo/Tools/ConvexVolumeSampleTool.cs b/src/DotRecast.Recast.Demo/Tools/ConvexVolumeSampleTool.cs
index ea5eb5e..48d7317 100644
--- a/src/DotRecast.Recast.Demo/Tools/ConvexVolumeSampleTool.cs
+++ b/src/DotRecast.Recast.Demo/Tools/ConvexVolumeSampleTool.cs
@@ -160,15 +160,11 @@ public class ConvexVolumeSampleTool : ISampleTool
         var geom = _sample.GetInputGeom();
         if (shift)
         {
-            _tool.RemoveByPos(geom, p);
+            _tool.TryRemove(geom, p, out var volume);
         }
         else
         {
-            if (_tool.PlottingShape(p, out var pts, out var hull))
-            {
-                var vol = RcConvexVolumeTool.CreateConvexVolume(pts, hull, _areaType, _boxDescent, _boxHeight, _polyOffset);
-                _tool.Add(geom, vol);
-            }
+            _tool.TryAdd(geom, p, _areaType, _boxDescent, _boxHeight, _polyOffset, out var volume);
         }
     }
 
diff --git a/src/DotRecast.Recast.Toolset/Tools/RcConvexVolumeTool.cs b/src/DotRecast.Recast.Toolset/Tools/RcConvexVolumeTool.cs
index 69974bf..21e131c 100644
--- a/src/DotRecast.Recast.Toolset/Tools/RcConvexVolumeTool.cs
+++ b/src/DotRecast.Recast.Toolset/Tools/RcConvexVolumeTool.cs
@@ -74,7 +74,7 @@ namespace DotRecast.Recast.Toolset.Tools
         }
 
 
-        public RcConvexVolume RemoveByPos(IInputGeomProvider geom, RcVec3f pos)
+        public bool TryRemove(IInputGeomProvider geom, RcVec3f pos, out RcConvexVolume volume)
         {
             // Delete
             int nearestIndex = -1;
@@ -90,26 +90,57 @@ namespace DotRecast.Recast.Toolset.Tools
 
             // If end point close enough, delete it.
             if (nearestIndex == -1)
-                return null;
+            {
+                volume = null;
+                return false;
+            }
 
             var removal = geom.ConvexVolumes()[nearestIndex];
             geom.ConvexVolumes().RemoveAt(nearestIndex);
-            return removal;
+            volume = removal;
+            return null != volume;
         }
 
-        public void Add(IInputGeomProvider geom, RcConvexVolume volume)
+        public bool TryAdd(IInputGeomProvider geom, RcVec3f p, RcAreaModification areaType, float boxDescent, float boxHeight, float polyOffset, out RcConvexVolume volume)
         {
-            geom.AddConvexVolume(volume);
+            // Create
+
+            // If clicked on that last pt, create the shape.
+            if (_pts.Count > 0 && RcVec3f.DistanceSquared(p, _pts[^1]) < 0.2f * 0.2f)
+            {
+                // 
+                if (_hull.Count > 2)
+                {
+                    volume = CreateConvexVolume(_pts, _hull, areaType, boxDescent, boxHeight, polyOffset);
+                    geom.AddConvexVolume(volume);
+                }
+
+                _pts.Clear();
+                _hull.Clear();
+            }
+            else
+            {
+                // Add new point
+                _pts.Add(p);
+
+                // Update hull.
+                if (_pts.Count > 1)
+                {
+                    _hull.Clear();
+                    _hull.AddRange(RcConvexUtils.Convexhull(_pts));
+                }
+                else
+                {
+                    _hull.Clear();
+                }
+            }
+
+            volume = null;
+            return false;
         }
 
         public static RcConvexVolume CreateConvexVolume(List<RcVec3f> pts, List<int> hull, RcAreaModification areaType, float boxDescent, float boxHeight, float polyOffset)
         {
-            // 
-            if (hull.Count <= 2)
-            {
-                return null;
-            }
-
             // Create shape.
             float[] verts = new float[hull.Count * 3];
             for (int i = 0; i < hull.Count; ++i)