Dadido3/noita-mapcap
1
0
Fork 0
mirror of https://github.com/Dadido3/noita-mapcap.git synced 2024-11-18 17:17:31 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Improve capturing

Browse Source 
- Center viewport to grid cells, not chunks
- Check window size when taking screenshot
This commit is contained in:
David Vogel 2022-07-29 22:48:42 +02:00
parent 3fa95de8e6
commit eb552537c2
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
files/capture.lua
View File

@ -60,6 +60,11 @@ end
local function captureScreenshot(pos, ensureLoaded, dontOverwrite, ctx, outputPixelScale) local function captureScreenshot(pos, ensureLoaded, dontOverwrite, ctx, outputPixelScale)
outputPixelScale = outputPixelScale or 0 outputPixelScale = outputPixelScale or 0
local rectTopLeft, rectBottomRight = ScreenCapture.GetRect()
if Coords.WindowResolution ~= rectBottomRight - rectTopLeft then
error(string.format("window size seems to have changed from %s to %s", Coords.WindowResolution, rectBottomRight - rectTopLeft))
end
local topLeftCapture, bottomRightCapture, topLeftWorld, bottomRightWorld = calculateCaptureRectangle(pos) local topLeftCapture, bottomRightCapture, topLeftWorld, bottomRightWorld = calculateCaptureRectangle(pos)
---Top left in output coordinates. ---Top left in output coordinates.
@ -131,7 +136,7 @@ end
---@param err string ---@param err string
---@param scope "init"|"do"|"end" ---@param scope "init"|"do"|"end"
local function mapCapturingCtxErrHandler(err, scope) local function mapCapturingCtxErrHandler(err, scope)
print(string.format("Failed to capture map: %s", err)) print(string.format("Failed to capture map: %s.", err))
Message:ShowRuntimeError("MapCaptureError", "Failed to capture map:", tostring(err)) Message:ShowRuntimeError("MapCaptureError", "Failed to capture map:", tostring(err))
end end
@ -151,9 +156,9 @@ function Capture:StartCapturingSpiral(origin, captureGridSize, outputPixelScale)
local origin = (origin / captureGridSize):Rounded("floor") * captureGridSize local origin = (origin / captureGridSize):Rounded("floor") * captureGridSize
---The position in world coordinates. ---The position in world coordinates.
---Centered to chunks. ---Centered to the grid.
---@type Vec2 ---@type Vec2
local pos = origin + Vec2(256, 256) -- TODO: Align chunks with top left pixel local pos = origin + Vec2(captureGridSize/2, captureGridSize/2)
---Process main callback. ---Process main callback.
---@param ctx ProcessRunnerCtx ---@param ctx ProcessRunnerCtx
@ -246,7 +251,7 @@ function Capture:StartCapturingArea(topLeft, bottomRight, captureGridSize, outpu
---Position in world coordinates. ---Position in world coordinates.
---@type Vec2 ---@type Vec2
local pos = (hilbertPos + gridTopLeft) * captureGridSize local pos = (hilbertPos + gridTopLeft) * captureGridSize
pos:Add(Vec2(256, 256)) -- Move to chunk center -- TODO: Align chunks with top left pixel pos:Add(Vec2(captureGridSize/2, captureGridSize/2)) -- Move to center of grid cell.
captureScreenshot(pos, true, true, ctx, outputPixelScale) captureScreenshot(pos, true, true, ctx, outputPixelScale)
ctx.state.Current = ctx.state.Current + 1 ctx.state.Current = ctx.state.Current + 1
end end