From 8640e554155ba975e8a307146d9f362efdc6e7e1 Mon Sep 17 00:00:00 2001 From: Vanic Date: Mon, 12 Jan 2026 18:31:06 +0300 Subject: [PATCH] MapGen: move ff2luat.lua Api->MapGen --- mods/API/ApiLoader/src/Api.lua | 1 - mods/CORE/MapGen/src/MapGen.lua | 8 +++----- .../Api/ff2lua.lua => CORE/MapGen/src/MapGen/ff2luat.lua} | 4 +++- mods/ENVIRONMENT/mapGenerator/src/asyncInit.lua | 2 -- 4 files changed, 6 insertions(+), 9 deletions(-) rename mods/{API/ApiLoader/src/Api/ff2lua.lua => CORE/MapGen/src/MapGen/ff2luat.lua} (98%) diff --git a/mods/API/ApiLoader/src/Api.lua b/mods/API/ApiLoader/src/Api.lua index 21e2ad4..ec56362 100644 --- a/mods/API/ApiLoader/src/Api.lua +++ b/mods/API/ApiLoader/src/Api.lua @@ -3,5 +3,4 @@ Api = {} local modInfo = Mod.getInfo('smc__api__api_loader') local require = modInfo.require -require('Api.ff2lua') require('Api.globalStep') diff --git a/mods/CORE/MapGen/src/MapGen.lua b/mods/CORE/MapGen/src/MapGen.lua index 87c6566..d92d60c 100644 --- a/mods/CORE/MapGen/src/MapGen.lua +++ b/mods/CORE/MapGen/src/MapGen.lua @@ -41,6 +41,8 @@ local Triangulation = require('MapGen.Triangulation') ---@type MapGen.Cavern local Cavern = require('MapGen.Cavern') +local ff2luat = require('MapGen.ff2luat') + ---@class MapGen ---@field layersByName table ---@field layersList MapGen.Layer[] @@ -250,7 +252,7 @@ end ---@param groups? table function MapGen:register2DPeaksFromFile(layerName, map, scale,zeroPos, category, groups) local modPath = core.get_modpath(core.get_current_modname()) - local peaks = Api.ff2luat(modPath .. '/textures/maps/' .. map) + local peaks = ff2luat(modPath .. '/textures/maps/' .. map) local mapSize = peaks.size peaks.size = nil @@ -901,10 +903,6 @@ function MapGen:run() self:initLayersTriangultaion() MapGen.isRunning = true - - for _, peak in ipairs(self.layersList[1].peaksList["landscape"]) do - print(tostring(peak)) - end end return MapGen diff --git a/mods/API/ApiLoader/src/Api/ff2lua.lua b/mods/CORE/MapGen/src/MapGen/ff2luat.lua similarity index 98% rename from mods/API/ApiLoader/src/Api/ff2lua.lua rename to mods/CORE/MapGen/src/MapGen/ff2luat.lua index 74a16b1..a2a58fd 100644 --- a/mods/API/ApiLoader/src/Api/ff2lua.lua +++ b/mods/CORE/MapGen/src/MapGen/ff2luat.lua @@ -53,7 +53,7 @@ end ---@param filepath string image in farbfeld format ---@param backgroundColor string? ColorString, will be ignored while processing image. Default: `#000000FF` ---@return ColoredDotsTable -function Api.ff2luat(filepath, backgroundColor) +local function ff2luat(filepath, backgroundColor) local file = io.open(filepath, 'rb') if not file then error('Can\'t open farbfeld image: ' .. dump(filepath)) end local ff = file:read('*a') -- binary! @@ -97,3 +97,5 @@ function Api.ff2luat(filepath, backgroundColor) return dots end + +return ff2luat diff --git a/mods/ENVIRONMENT/mapGenerator/src/asyncInit.lua b/mods/ENVIRONMENT/mapGenerator/src/asyncInit.lua index bafa56b..71f6d26 100644 --- a/mods/ENVIRONMENT/mapGenerator/src/asyncInit.lua +++ b/mods/ENVIRONMENT/mapGenerator/src/asyncInit.lua @@ -37,8 +37,6 @@ dofile(core.get_modpath('smc__api__table')..'/init.lua') -- TODO: пока что закоментировано, поскольку вызывает ошибку из-за global_step -- Api loader -- dofile(core.get_modpath('smc__api__api_loader')..'/init.lua') -Api = {} -dofile(core.get_modpath('smc__api__api_loader')..'/src/Api/ff2lua.lua') ---@type MapGen local mapGenerator = dofile(core.get_modpath('smc__core__map_generator')..'/src/mapGenerator.lua')