Bump changes
This commit is contained in:
@@ -280,12 +280,14 @@ function Triangle:getCircumCircle2D()
|
||||
return c, r
|
||||
end
|
||||
|
||||
---@alias MapGen.Triangle.CircumCircleEnum 'IN'|'BEHIND'|'ON'
|
||||
|
||||
---Checks if a given point lies into the triangle circumcircle.
|
||||
---
|
||||
---Note: This function does not take into account the Y-coordinate,
|
||||
---that is, the calculation is performed on the projection of the triangle XZ.
|
||||
---@param p MapGen.Peak
|
||||
---@return boolean
|
||||
---@return MapGen.Triangle.CircumCircleEnum
|
||||
function Triangle:inCircumCircle2D(p)
|
||||
local pos = p:getPeakPos()
|
||||
|
||||
@@ -293,7 +295,14 @@ function Triangle:inCircumCircle2D(p)
|
||||
|
||||
local distance = (c - pos):length()
|
||||
|
||||
return distance <= r
|
||||
|
||||
if distance - r < 1e-10 then
|
||||
return 'ON'
|
||||
elseif distance < r then
|
||||
return 'IN'
|
||||
else
|
||||
return 'BEHIND'
|
||||
end
|
||||
end
|
||||
|
||||
return Triangle
|
||||
|
||||
@@ -119,7 +119,7 @@ function Triangulation.triangulate( vertices )
|
||||
for j = #triangles, 1, -1 do
|
||||
local curTriangle = triangles[j]
|
||||
|
||||
if curTriangle:inCircumCircle2D(vertices[i]) then
|
||||
if curTriangle:inCircumCircle2D(vertices[i]) == 'IN' then
|
||||
edges[#edges + 1] = curTriangle.e1
|
||||
edges[#edges + 1] = curTriangle.e2
|
||||
edges[#edges + 1] = curTriangle.e3
|
||||
|
||||
Reference in New Issue
Block a user