Revert "Add some more shitcoding to MapGen"

This reverts commit cf88ccf67f.
This commit is contained in:
Van
2025-10-29 18:49:18 +03:00
parent 3b8aed464d
commit 91e5067aa9
3 changed files with 431 additions and 481 deletions

View File

@@ -10,6 +10,20 @@ local mathRound, mathHuge
= math.round, math.huge = math.round, math.huge
-- --- MapGen default noises --- -- --- MapGen default noises ---
---@type ValueNoise
local oceanNoise
---@type NoiseParams
local oceanNoiseParams = {
offset = -30,
scale = 10,
spread = vector.new(100, 100, 100),
seed = 47,
octaves = 8,
persistence = 0.4,
lacunarity = 2,
}
---@type ValueNoise ---@type ValueNoise
local rocksNoise local rocksNoise
@@ -23,6 +37,37 @@ local rocksNoiseParams ={
persistence = 0.5, persistence = 0.5,
lacunarity = 4, lacunarity = 4,
} }
---DEBUG NOISES
--- TODO удалить, после реализации климата от регионов
---@type ValueNoise
local humidityNoise
---@type NoiseParams
humidityNoiseParams = {
offset = 50,
scale = 25,
spread = {x = 10, y = 10, z = 10},
seed = 47,
octaves = 2,
persistence = 0.6,
lacunarity = 2,
}
---@type ValueNoise
local tempNoise
---@type NoiseParams
tempNoiseParams = {
offset = 50,
scale = 25,
spread = {x = 10, y = 10, z = 10},
seed = 12,
octaves = 2,
persistence = 0.6,
lacunarity = 2,
}
-- --- End of default noises --- -- --- End of default noises ---
@@ -31,19 +76,19 @@ local rocksNoiseParams ={
---@field layersList table ---@field layersList table
---@field biomesList table ---@field biomesList table
---@field biomesDiagram table ---@field biomesDiagram table
---@field isMultinoiseInitialized boolean Is the fractal noise of the regions initialized? This is necessary for a one-time noise initialization. ---@field multinoiseInitialized boolean Is the fractal noise of the regions initialized? This is necessary for a one-time noise initialization.
---@field isRunning boolean A static field that guarantees that only one instance of the `MapGen` class will work. ---@field isRunning boolean A static field that guarantees that only one instance of the `MapGen` class will work.
---@field nodeIDs table<string, number> ---@field nodeIDs table<string, string>
local MapGen = { local MapGen = {
layersByName = {}, layersByName = {},
layersList = {}, layersList = {},
biomesList = {}, biomesList = {},
biomesDiagram = {}, biomesDiagram = {},
isMultinoiseInitialized = false, multinoiseInitialized = false,
isRunning = false, isRunning = false,
} }
---@param nodeIDs table<string, number> ---@param nodeIDs table<string, string>
---@return MapGen ---@return MapGen
function MapGen:new(nodeIDs) function MapGen:new(nodeIDs)
---@type MapGen ---@type MapGen
@@ -54,13 +99,23 @@ function MapGen:new(nodeIDs)
return instance return instance
end end
---Determines which layer a node belongs to based on its height coordinate.
---@param yPos number
---@return MapGen.Layer?
function MapGen:getLayerByHeight(yPos) function MapGen:getLayerByHeight(yPos)
--- TODO: возможно здесь получится сделать более оптимизированный алгоритм
--- учитывая тот факт, что эта функция вызывается для каждой ноды в on_generated
--- и может быть даже не один раз
--- Можно подумать над тем, чтобы использовать сортированный список
---@param layer MapGen.Layer
for _, layer in ipairs(self.layersList) do for _, layer in ipairs(self.layersList) do
if yPos >= layer.minY and yPos <= layer.maxY then if yPos >= layer.minY and yPos <= layer.maxY then
return layer return layer
end end
end end
return nil
end end
---Mark the world area between two heights as a `MapGen.Layer`. ---Mark the world area between two heights as a `MapGen.Layer`.
@@ -71,7 +126,7 @@ end
---@param maxY number ---@param maxY number
function MapGen:RegisterLayer(name, minY, maxY) function MapGen:RegisterLayer(name, minY, maxY)
---Checking if layers overlap ---Checking if layers overlap
if self:getLayerByHeight(minY) ~= nil or self:getLayerByHeight(maxY) ~= nil then if self:getLayerByHeight(minY) ~= nil and self:getLayerByHeight(maxY) ~= nil then
error('Registered layers must not overlap!') error('Registered layers must not overlap!')
end end
@@ -113,33 +168,17 @@ end
---Initialize region noise. This should be called after the map object is loaded. ---Initialize region noise. This should be called after the map object is loaded.
function MapGen:initRegionsMultinoise() function MapGen:initRegionsMultinoise()
-- Generate rocks noise once ---@param layer MapGen.Layer
rocksNoise = core.get_value_noise(rocksNoiseParams)
for _, layer in ipairs(self.layersList) do for _, layer in ipairs(self.layersList) do
print("INIT DEFAULT NOISES")
layer.defaultRegion:initMultinoise()
---@param region MapGen.Region
for _, region in ipairs(layer.regionsList) do for _, region in ipairs(layer.regionsList) do
region:initMultinoise() region:initMultinoise()
end end
end
self.isMultinoiseInitialized = true
end
-- Precompute noise for entire chunk
local function precomputeNoiseForChunk(noise, minPos, maxPos)
local noiseMap = {}
local index = 1
for z = minPos.z, maxPos.z do
for y = minPos.y, maxPos.y do
for x = minPos.x, maxPos.x do
noiseMap[index] = mathRound(noise:get_3d(vector.new(x, y, z)))
index = index + 1
end end
end
end self.multinoiseInitialized = true
return noiseMap
end end
---@param name string ---@param name string
@@ -153,13 +192,6 @@ function MapGen:RegisterBiome(name, tempPoint, humidityPoint, groundNodes, soilH
table.insert(self.biomesList, biome) table.insert(self.biomesList, biome)
end end
function MapGen:precomputeNodeIDs()
for _, biome in ipairs(self.biomesList) do
biome.groundNodes.turf = self.nodeIDs[biome.groundNodes.turf] or biome.groundNodes.turf
biome.groundNodes.soil = self.nodeIDs[biome.groundNodes.soil] or biome.groundNodes.soil
end
end
function MapGen:initBiomesDiagram() function MapGen:initBiomesDiagram()
local diagram = self.biomesDiagram local diagram = self.biomesDiagram
@@ -185,17 +217,17 @@ function MapGen:initBiomesDiagram()
end end
end end
local function generateSoil(biome, data, index, pos) local function generateSoil(biome, data, index, x, y, z)
data[index] = biome.groundNodes.turf data[index] = core.get_content_id(biome.groundNodes.turf) -- TODO: убрать тут get_content_id(), переместить его куда-то "выше"
end end
local function generateRock(ids, data, index, pos) local function generateRock(ids, data, index, x, y, z)
if rocksNoise == nil then if rocksNoise == nil then
rocksNoise = core.get_value_noise(rocksNoiseParams) rocksNoise = core.get_value_noise(rocksNoiseParams)
end end
local noiseRocksValue = mathRound(rocksNoise:get_3d(pos)) local noiseRocksValue = mathRound(rocksNoise:get_3d({x = x, y = y, z = z}))
if noiseRocksValue == 1 then if noiseRocksValue == 1 then
data[index] = ids.malachite data[index] = ids.malachite
elseif noiseRocksValue == 2 then elseif noiseRocksValue == 2 then
@@ -215,160 +247,108 @@ local function generateRock(ids, data, index, pos)
end end
end end
function MapGen:generateNode(self, hight, temp, humidity, data, index, pos) local function generateNode(mapGenerator, hight, temp, humidity, data, index, x, y, z)
local ids = self.nodeIDs local ids = mapGenerator.nodeIDs
local biome = self.biomesDiagram[temp][humidity] local biome = mapGenerator.biomesDiagram[temp][humidity]
if pos.y > hight and pos.y > 0 then if y > hight and y > 0 then
data[index] = ids.air data[index] = ids.air
elseif pos.y == hight and pos.y > 0 then elseif y == hight and y > 0 then
generateSoil(biome, data, index, pos) generateSoil(biome, data, index, x, y, z)
elseif pos.y < hight then elseif y < hight then
generateRock(ids, data, index, pos) generateRock(ids, data, index, x, y, z)
else else
data[index] = ids.water data[index] = ids.water
end end
end end
---@param mapGenerator MapGen
local function generatorHandler3D(mapGenerator, data, index, x, y, z)
local layer = mapGenerator:getLayerByHeight(y)
if layer == nil then
data[index] = mapGenerator.nodeIDs.air
return
end
-- КАРОЧИ. Надо оптимизировать вот это говно. Оно срабатывает для каждого блока и поэтому все так лагаетю -- Initialize base noises if needed
function MapGen:generateVoxelOptimized(data, index, pos, layer, rocksNoiseMap, area, minPos, maxPos) if oceanNoise == nil then oceanNoise = core.get_value_noise(oceanNoiseParams) end
-- Fast region lookup with spatial partitioning if tempNoise == nil then tempNoise = core.get_value_noise(tempNoiseParams) end
local region = layer:getRegionByPos(pos) if humidityNoise == nil then humidityNoise = core.get_value_noise(humidityNoiseParams) end
-- Get base values from default region -- Base values (outside any region)
local defaultRegion = layer:getDefaultRegion() local baseHeight = oceanNoise:get_3d({x = x, y = y, z = z})
local defaultNoises = defaultRegion:getMultinoise() local baseTemp = tempNoise:get_3d({x = x, y = y, z = z})
local baseHumidity = humidityNoise:get_3d({x = x, y = y, z = z})
local baseHeight = defaultNoises.landscapeNoise:get_3d(pos)
local baseTemp = defaultNoises.tempNoise:get_3d(pos)
local baseHumidity = defaultNoises.humidityNoise:get_3d(pos)
local finalHeight = baseHeight local finalHeight = baseHeight
local finalTemp = baseTemp local finalTemp = baseTemp
local finalHumidity = baseHumidity local finalHumidity = baseHumidity
-- Apply region-specific noises if needed local region = layer:getRegionByPos(x, y, z)
if region ~= defaultRegion then
local polyhedron = region:getPolyhedron() local polyhedron = region:getPolyhedron()
local distance = polyhedron:distanceToSurface(pos) local distance = polyhedron:distanceToSurface(vector.new(x, y, z))
local bufferZone = region:getBufferZone() local bufferZone = region:getBufferZone()
if distance <= bufferZone.thickness then if distance <= bufferZone.thickness then
local regionNoises = region:getMultinoise() local regionNoises = region:getMultinoise()
local blendFactor = InterpolationPresets[region:getInterpolationPreset()](distance, bufferZone.thickness) local blendFactor = InterpolationPresets[region:getInterpolationPreset()](distance, bufferZone.thickness)
-- 3D noise interpolation
if regionNoises.landscapeNoise then if regionNoises.landscapeNoise then
local regionHeight = regionNoises.landscapeNoise:get_3d(pos) local regionHeight = regionNoises.landscapeNoise:get_3d({x = x, y = y, z = z})
finalHeight = baseHeight + (regionHeight - baseHeight) * blendFactor finalHeight = baseHeight + (regionHeight - baseHeight) * blendFactor
end end
if regionNoises.tempNoise then if regionNoises.tempNoise then
local regionTemp = regionNoises.tempNoise:get_3d(pos) local regionTemp = regionNoises.tempNoise:get_3d({x = x, y = y, z = z})
finalTemp = baseTemp + (regionTemp - baseTemp) * blendFactor finalTemp = baseTemp + (regionTemp - baseTemp) * blendFactor
end end
if regionNoises.humidityNoise then if regionNoises.humidityNoise then
local regionHumidity = regionNoises.humidityNoise:get_3d(pos) local regionHumidity = regionNoises.humidityNoise:get_3d({x = x, y = y, z = z})
finalHumidity = baseHumidity + (regionHumidity - baseHumidity) * blendFactor finalHumidity = baseHumidity + (regionHumidity - baseHumidity) * blendFactor
end end
end end
end
-- Generate the actual node generateNode(mapGenerator, mathRound(finalHeight), mathRound(finalTemp),
self:generateNodeOptimized(mathRound(finalHeight), mathRound(finalTemp), mathRound(finalHumidity), data, index, x, y, z)
mathRound(finalHumidity), data, index, pos, rocksNoiseMap, minPos, maxPos)
end
function MapGen:generateNodeOptimized(height, temp, humidity, data, index, pos, rocksNoiseMap, minPos, maxPos)
local ids = self.nodeIDs
local biome = self.biomesDiagram[temp][humidity]
if pos.y > height and pos.y > 0 then
data[index] = ids.air
elseif pos.y == height and pos.y > 0 then
data[index] = biome.groundNodes.turf
elseif pos.y < height then
-- Calculate index without creating vectors
local noiseIndex = ((pos.z - minPos.z) * (maxPos.y - minPos.y + 1) * (maxPos.x - minPos.x + 1) +
(pos.y - minPos.y) * (maxPos.x - minPos.x + 1) +
(pos.x - minPos.x)) + 1
local noiseValue = rocksNoiseMap[noiseIndex]
-- Use lookup table for rock types
local rockTypes = {
[1] = ids.malachite, [2] = ids.hapcoryte, [3] = ids.iyellite,
[4] = ids.sylite, [5] = ids.tauitite, [6] = ids.falmyte,
[7] = ids.burcite, [8] = ids.felhor
}
data[index] = rockTypes[noiseValue] or ids.stone
else
data[index] = ids.water
end
end end
---@param minPos table ---@param minPos table
---@param maxPos table ---@param maxPos table
---@param blockseed number ---@param blockseed number
function MapGen:onMapGenerated(minPos, maxPos, blockseed) function MapGen:onMapGenerated(minPos, maxPos, blockseed)
print("Stage 1: entering loop") -- We obtain a generation area for further manipulations
local voxelManip, eMin, eMax = core.get_mapgen_object("voxelmanip") local voxelManip, eMin, eMax = core.get_mapgen_object("voxelmanip")
if not self.multinoiseInitialized then
self:initRegionsMultinoise()
end
local data = voxelManip:get_data() local data = voxelManip:get_data()
-- local param2_data = voxelManip:get_param2_data() -- local param2_data = voxelManip:get_param2_data()
local area = VoxelArea:new({MinEdge = eMin, MaxEdge = eMax}) local area = VoxelArea:new({MinEdge = eMin, MaxEdge = eMax})
-- Initial generation: landscape
print("Stage 2: generating initial landscape")
-- Cache frequently accessed values
local nodeIDs = self.nodeIDs
local biomesDiagram = self.biomesDiagram
-- Precompute rocks noise for entire chunk
local rocksNoiseMap = precomputeNoiseForChunk(rocksNoise, minPos, maxPos)
local vec = vector.zero()
local areaIndex = area.index
-- Process by layers to minimize context switching
local a, b, c, d = 0, 0, 0, 0
for _, layer in ipairs(self.layersList) do
a = a+1
b, c, d = 0, 0, 0
local layerMinY = math.max(minPos.y, layer.minY)
local layerMaxY = math.min(maxPos.y, layer.maxY)
if layerMinY <= layerMaxY then
for z = minPos.z, maxPos.z do for z = minPos.z, maxPos.z do
b = b+1 for y = minPos.y, maxPos.y do
c, d = 0, 0 local index = area:index(minPos.x, y, z)
vec.z = z
for y = layerMinY, layerMaxY do
c = c+1
d = 0
vec.y = y
local index = areaIndex(area, minPos.x, y, z)
for x = minPos.x, maxPos.x do for x = minPos.x, maxPos.x do
d = d+1 generatorHandler3D(self, data, index, x, y, z)
vec.x = x
self:generateVoxelOptimized(data, index, vec, layer, rocksNoiseMap, area, minPos, maxPos)
index = index + 1 index = index + 1
print(a..":"..b..":"..c..":"..d)
end
end
end end
end end
end end
print("Stage 3: applying changes") -- We make changes back to LVM and recalculate light & liquids
voxelManip:set_data(data) voxelManip:set_data(data)
-- voxelManip:set_param2_data(param2_data) -- voxelManip:set_param2_data(param2_data)
voxelManip:update_liquids() voxelManip:update_liquids()
voxelManip:calc_lighting() voxelManip:calc_lighting()
voxelManip:write_to_map() voxelManip:write_to_map()
end end
@@ -380,18 +360,12 @@ function MapGen:run()
error('Only one instance of a `MapGen` class can be running.') error('Only one instance of a `MapGen` class can be running.')
end end
-- Initialize default systems
self:precomputeNodeIDs()
self:initBiomesDiagram()
core.register_on_generated(function(...) core.register_on_generated(function(...)
if not self.isMultinoiseInitialized then
self:initRegionsMultinoise()
end
self:onMapGenerated(...) self:onMapGenerated(...)
end) end)
self:initBiomesDiagram()
MapGen.isRunning = true MapGen.isRunning = true
end end

View File

@@ -39,9 +39,6 @@ function Region:new(polyhedron, multinoiseParams, bufferZone)
function instance:getInterpolationPreset() return _interpolationPreset end function instance:getInterpolationPreset() return _interpolationPreset end
function instance:initMultinoise() function instance:initMultinoise()
print("WTF:::")
print(type(_multinoise))
print(dump(_multinoise))
_multinoise = multinoiseParamsToMultinoise(_multinoiseParams) _multinoise = multinoiseParamsToMultinoise(_multinoiseParams)
end end

View File

@@ -4,8 +4,8 @@
---@field boundingBox {min: vector, max: vector} ---@field boundingBox {min: vector, max: vector}
local Polyhedron = {} local Polyhedron = {}
local mathMin, mathMax, mathHuge, mathAbs local mathMin, mathMax, mathHuge, mathSqrt, mathAbs
= math.min, math.max, math.huge, math.abs = math.min, math.max, math.huge, math.sqrt, math.abs
---Creates a new Polyhedron instance ---Creates a new Polyhedron instance
---@param vertices vector[] Array of 3D vertices that define the polyhedron ---@param vertices vector[] Array of 3D vertices that define the polyhedron
@@ -17,29 +17,9 @@ function Polyhedron:new(vertices, faces)
faces = faces, faces = faces,
boundingBox = self:calculateBoundingBox(vertices) boundingBox = self:calculateBoundingBox(vertices)
}, {__index = self}) }, {__index = self})
-- Precompute face data
instance.faceData = {}
for i, face in ipairs(faces) do
instance.faceData[i] = {
plane = instance:computePlane(face),
normal = instance:computeFaceNormal(face),
edges = instance:computeFaceEdges(face)
}
end
return instance return instance
end end
function Polyhedron:computeFaceEdges(face)
local edges = {}
for i = 1, #face do
local j = (i % #face) + 1
edges[i] = {face[i], face[j]}
end
return edges
end
---Calculates the axis-aligned bounding box for the polyhedron ---Calculates the axis-aligned bounding box for the polyhedron
---@param vertices vector[] Array of vertices to compute bounds for ---@param vertices vector[] Array of vertices to compute bounds for
---@return {min: vector, max: vector} Bounding box with min and max corners ---@return {min: vector, max: vector} Bounding box with min and max corners
@@ -67,27 +47,20 @@ function Polyhedron:computeFaceNormal(face)
error("Face must have at least 3 vertices") error("Face must have at least 3 vertices")
end end
local normal = vector.zero() -- Use Newell's method for more robust normal calculation with non-convex polygons
local normal = vector.new(0, 0, 0)
for i = 1, #face do for i = 1, #face do
local j = (i % #face) + 1 local j = (i % #face) + 1
local current = self.vertices[face[i]] local current = self.vertices[face[i]]
local next_vert = self.vertices[face[j]] local next = self.vertices[face[j]]
-- Newell's method components normal.x = normal.x + (current.y - next.y) * (current.z + next.z)
normal.x = normal.x + (current.y - next_vert.y) * (current.z + next_vert.z) normal.y = normal.y + (current.z - next.z) * (current.x + next.x)
normal.y = normal.y + (current.z - next_vert.z) * (current.x + next_vert.x) normal.z = normal.z + (current.x - next.x) * (current.y + next.y)
normal.z = normal.z + (current.x - next_vert.x) * (current.y + next_vert.y)
end end
-- Check for zero normal (degenerate face) return normal:normalize()
local magnitude = vector.length(normal)
if magnitude == 0 then
return vector.zero() -- Or handle degenerate case appropriately
end
-- Normalize the normal vector
return vector.normalize(normal)
end end
---Computes the plane equation for a face ---Computes the plane equation for a face
@@ -320,6 +293,20 @@ function Polyhedron:edgesIntersect(otherPolyhedron)
end end
end end
end end
-- Check each edge of the other polyhedron against each face of this
for _, face in ipairs(otherPolyhedron.faces) do
for i = 1, #face do
local j = (i % #face) + 1
local edgeStart = otherPolyhedron.vertices[face[i]]
local edgeEnd = otherPolyhedron.vertices[face[j]]
if self:edgeIntersectsPolyhedron(edgeStart, edgeEnd, otherPolyhedron) then
return true
end
end
end
return false return false
end end
@@ -353,25 +340,17 @@ end
---@param point vector The point to test ---@param point vector The point to test
---@return boolean True if point is inside the polyhedron, false otherwise ---@return boolean True if point is inside the polyhedron, false otherwise
function Polyhedron:containsPoint(point) function Polyhedron:containsPoint(point)
-- Fast AABB rejection first -- Ray-casting algorithm for point-in-polyhedron test
local bb = self.boundingBox local rayDir = vector.new(1, 0, 0) -- Simple X-direction ray
if point.x < bb.min.x or point.x > bb.max.x or
point.y < bb.min.y or point.y > bb.max.y or
point.z < bb.min.z or point.z > bb.max.z then
return false
end
-- Then do ray casting
local rayDir = vector.new(1, 0, 0)
local intersections = 0 local intersections = 0
for i, face in ipairs(self.faces) do for _, face in ipairs(self.faces) do
if self:rayIntersectsFace(point, rayDir, face) then if self:rayIntersectsFace(point, rayDir, face) then
intersections = intersections + 1 intersections = intersections + 1
end end
end end
return intersections % 2 == 1 return intersections % 2 == 1 -- Odd number of intersections = inside
end end
---Calculates the minimum distance from a point to the surface of the polyhedron ---Calculates the minimum distance from a point to the surface of the polyhedron