Bump changes
This commit is contained in:
@@ -280,12 +280,14 @@ function Triangle:getCircumCircle2D()
|
|||||||
return c, r
|
return c, r
|
||||||
end
|
end
|
||||||
|
|
||||||
|
---@alias MapGen.Triangle.CircumCircleEnum 'IN'|'BEHIND'|'ON'
|
||||||
|
|
||||||
---Checks if a given point lies into the triangle circumcircle.
|
---Checks if a given point lies into the triangle circumcircle.
|
||||||
---
|
---
|
||||||
---Note: This function does not take into account the Y-coordinate,
|
---Note: This function does not take into account the Y-coordinate,
|
||||||
---that is, the calculation is performed on the projection of the triangle XZ.
|
---that is, the calculation is performed on the projection of the triangle XZ.
|
||||||
---@param p MapGen.Peak
|
---@param p MapGen.Peak
|
||||||
---@return boolean
|
---@return MapGen.Triangle.CircumCircleEnum
|
||||||
function Triangle:inCircumCircle2D(p)
|
function Triangle:inCircumCircle2D(p)
|
||||||
local pos = p:getPeakPos()
|
local pos = p:getPeakPos()
|
||||||
|
|
||||||
@@ -293,7 +295,14 @@ function Triangle:inCircumCircle2D(p)
|
|||||||
|
|
||||||
local distance = (c - pos):length()
|
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
|
end
|
||||||
|
|
||||||
return Triangle
|
return Triangle
|
||||||
|
|||||||
@@ -119,7 +119,7 @@ function Triangulation.triangulate( vertices )
|
|||||||
for j = #triangles, 1, -1 do
|
for j = #triangles, 1, -1 do
|
||||||
local curTriangle = triangles[j]
|
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.e1
|
||||||
edges[#edges + 1] = curTriangle.e2
|
edges[#edges + 1] = curTriangle.e2
|
||||||
edges[#edges + 1] = curTriangle.e3
|
edges[#edges + 1] = curTriangle.e3
|
||||||
|
|||||||
@@ -137,32 +137,28 @@ mapGenerator:register2DPeaks('midgard',
|
|||||||
for _, c in ipairs({'landscape', 'temp', 'humidity'}) do
|
for _, c in ipairs({'landscape', 'temp', 'humidity'}) do
|
||||||
mapGenerator:registerLayerNoiseColor('midgard', c, '#4978c6', land1)
|
mapGenerator:registerLayerNoiseColor('midgard', c, '#4978c6', land1)
|
||||||
mapGenerator:registerLayerNoiseColor('midgard', c, '#77ea72', land2)
|
mapGenerator:registerLayerNoiseColor('midgard', c, '#77ea72', land2)
|
||||||
--[[
|
--[[
|
||||||
mapGenerator:register2DPeaks('midgard', c, {
|
mapGenerator:register2DPeaks('midgard', c, {
|
||||||
{
|
{
|
||||||
color = '#77ea72',
|
color = '#77ea72',
|
||||||
pos = vector.new(512, 0, 512)
|
pos = vector.new(512, 0, 512)
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
color = '#77ea72',
|
color = '#4978c6',
|
||||||
pos = vector.new(512, 0, -512)
|
pos = vector.new(512, 0, -512)
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
color = '#77ea72',
|
color = '#77ea72',
|
||||||
pos = vector.new(-512, 0, -512)
|
pos = vector.new(-512, 0, -512)
|
||||||
},
|
},
|
||||||
{
|
|
||||||
color = '#77ea72',
|
|
||||||
pos = vector.new(-512, 0, 512)
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
color = '#4978c6',
|
color = '#4978c6',
|
||||||
pos = vector.new(0, 0, 0)
|
pos = vector.new(-512, 0, 512)
|
||||||
},
|
},
|
||||||
})--]]
|
})--]]
|
||||||
end
|
end
|
||||||
|
|
||||||
mapGenerator:register2DPeaksFromFile('midgard', 'map.ff', 100,{x=0, y=0}, 'landscape')
|
mapGenerator:register2DPeaksFromFile('midgard', 'map.ff', 50,{x=0, y=0}, 'landscape')
|
||||||
mapGenerator:register2DPeaksFromFile('midgard', 'map.ff', 150,{x=0, y=0}, 'temp')
|
mapGenerator:register2DPeaksFromFile('midgard', 'map.ff', 150,{x=0, y=0}, 'temp')
|
||||||
mapGenerator:register2DPeaksFromFile('midgard', 'map.ff', 200,{x=0, y=0}, 'humidity')
|
mapGenerator:register2DPeaksFromFile('midgard', 'map.ff', 200,{x=0, y=0}, 'humidity')
|
||||||
|
|
||||||
|
|||||||
Binary file not shown.
Reference in New Issue
Block a user