Minor fixes
This commit is contained in:
@@ -1,8 +1,8 @@
|
|||||||
---@class MapGen.Peak
|
---@class MapGen.Peak
|
||||||
---@field id number
|
---@field id number
|
||||||
---@field getPeakPos fun():vector
|
---@field getPeakPos fun(self):vector
|
||||||
---@field getColor fun():ColorString
|
---@field getColor fun(self):ColorString
|
||||||
---@field getGroups fun():table<string, number>
|
---@field getGroups fun(self):table<string, number>
|
||||||
local Peak = {
|
local Peak = {
|
||||||
id = 0,
|
id = 0,
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -64,8 +64,8 @@ end
|
|||||||
---@param vertices table<integer, MapGen.Peak>
|
---@param vertices table<integer, MapGen.Peak>
|
||||||
local function sortVerticesDeterministically(vertices)
|
local function sortVerticesDeterministically(vertices)
|
||||||
tableSort(vertices, function(a, b)
|
tableSort(vertices, function(a, b)
|
||||||
local posA = a.getPeakPos()
|
local posA = a:getPeakPos()
|
||||||
local posB = b.getPeakPos()
|
local posB = b:getPeakPos()
|
||||||
|
|
||||||
-- Sort by X first
|
-- Sort by X first
|
||||||
if posA.x ~= posB.x then
|
if posA.x ~= posB.x then
|
||||||
@@ -112,13 +112,13 @@ function Triangulation.triangulate(vertices)
|
|||||||
return {Triangle:new(vertices[1], vertices[2], vertices[3])}
|
return {Triangle:new(vertices[1], vertices[2], vertices[3])}
|
||||||
end
|
end
|
||||||
|
|
||||||
local minPos = vertices[1].getPeakPos()
|
local minPos = vertices[1]:getPeakPos()
|
||||||
local minX, minY = minPos.x, minPos.z
|
local minX, minY = minPos.x, minPos.z
|
||||||
local maxX, maxY = minX, minY
|
local maxX, maxY = minX, minY
|
||||||
|
|
||||||
for i = 1, nvertices do
|
for i = 1, nvertices do
|
||||||
local vertex = vertices[i]
|
local vertex = vertices[i]
|
||||||
local vertexPos = vertex.getPeakPos()
|
local vertexPos = vertex:getPeakPos()
|
||||||
vertex.id = i
|
vertex.id = i
|
||||||
|
|
||||||
if vertexPos.x < minX then
|
if vertexPos.x < minX then
|
||||||
@@ -223,13 +223,13 @@ function Triangulation.tetrahedralize(vertices)
|
|||||||
return {Tetrahedron:new(vertices[1], vertices[2], vertices[3], vertices[4])}
|
return {Tetrahedron:new(vertices[1], vertices[2], vertices[3], vertices[4])}
|
||||||
end
|
end
|
||||||
|
|
||||||
local minPos = vertices[1].getPeakPos()
|
local minPos = vertices[1]:getPeakPos()
|
||||||
local minX, minY, minZ = minPos.x, minPos.y, minPos.z
|
local minX, minY, minZ = minPos.x, minPos.y, minPos.z
|
||||||
local maxX, maxY, maxZ = minX, minY, minZ
|
local maxX, maxY, maxZ = minX, minY, minZ
|
||||||
|
|
||||||
for i = 1, nvertices do
|
for i = 1, nvertices do
|
||||||
local vertex = vertices[i]
|
local vertex = vertices[i]
|
||||||
local vertexPos = vertex.getPeakPos()
|
local vertexPos = vertex:getPeakPos()
|
||||||
vertex.id = i
|
vertex.id = i
|
||||||
|
|
||||||
if vertexPos.x < minX then
|
if vertexPos.x < minX then
|
||||||
|
|||||||
Reference in New Issue
Block a user