From a5e5cd9e4f59b69b0ce0e99ff12b6305625c5946 Mon Sep 17 00:00:00 2001 From: xSparfuchs Date: Wed, 17 Jun 2020 19:44:53 +0200 Subject: [PATCH 1/7] fix large screenshots --- src/js/game/hud/parts/screenshot_exporter.js | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/src/js/game/hud/parts/screenshot_exporter.js b/src/js/game/hud/parts/screenshot_exporter.js index dfdd8224..fe1a52df 100644 --- a/src/js/game/hud/parts/screenshot_exporter.js +++ b/src/js/game/hud/parts/screenshot_exporter.js @@ -55,8 +55,18 @@ export class HUDScreenshotExporter extends BaseHUDPart { const dimensions = maxChunk.sub(minChunk); logger.log("Dimensions:", dimensions); - - const chunkSizePixels = 128; + + let chunkSizePixels = 128; + + if (dimensions.x + dimensions.y > 256) { + if (dimensions.x > dimensions.y) { + chunkSizePixels = Math.floor(128 * (128 / dimensions.x)); + }else{ + chunkSizePixels = Math.floor(128 * (128 / dimensions.y)); + } + logger.log("ChunkSizePixels:", chunkSizePixels); + } + const chunkScale = chunkSizePixels / (globalConfig.mapChunkSize * globalConfig.tileSize); logger.log("Scale:", chunkScale); From c1ef4e85af41d15d43f309c5454f1e42026d7fce Mon Sep 17 00:00:00 2001 From: xSparfuchs Date: Wed, 17 Jun 2020 20:11:55 +0200 Subject: [PATCH 2/7] whitespaces --- src/js/game/hud/parts/screenshot_exporter.js | 24 ++++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/js/game/hud/parts/screenshot_exporter.js b/src/js/game/hud/parts/screenshot_exporter.js index fe1a52df..4bd4865e 100644 --- a/src/js/game/hud/parts/screenshot_exporter.js +++ b/src/js/game/hud/parts/screenshot_exporter.js @@ -55,18 +55,18 @@ export class HUDScreenshotExporter extends BaseHUDPart { const dimensions = maxChunk.sub(minChunk); logger.log("Dimensions:", dimensions); - - let chunkSizePixels = 128; - - if (dimensions.x + dimensions.y > 256) { - if (dimensions.x > dimensions.y) { - chunkSizePixels = Math.floor(128 * (128 / dimensions.x)); - }else{ - chunkSizePixels = Math.floor(128 * (128 / dimensions.y)); - } - logger.log("ChunkSizePixels:", chunkSizePixels); - } - + + let chunkSizePixels = 128; + + if (dimensions.x + dimensions.y > 256) { + if (dimensions.x > dimensions.y) { + chunkSizePixels = Math.floor(128 * (128 / dimensions.x)); + }else{ + chunkSizePixels = Math.floor(128 * (128 / dimensions.y)); + } + logger.log("ChunkSizePixels:", chunkSizePixels); + } + const chunkScale = chunkSizePixels / (globalConfig.mapChunkSize * globalConfig.tileSize); logger.log("Scale:", chunkScale); From 8372293d5d653800ab7dd20198932e5432b7be78 Mon Sep 17 00:00:00 2001 From: xSparfuchs Date: Wed, 17 Jun 2020 20:16:37 +0200 Subject: [PATCH 3/7] Update screenshot_exporter.js --- src/js/game/hud/parts/screenshot_exporter.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/js/game/hud/parts/screenshot_exporter.js b/src/js/game/hud/parts/screenshot_exporter.js index 4bd4865e..41f506a1 100644 --- a/src/js/game/hud/parts/screenshot_exporter.js +++ b/src/js/game/hud/parts/screenshot_exporter.js @@ -61,7 +61,7 @@ export class HUDScreenshotExporter extends BaseHUDPart { if (dimensions.x + dimensions.y > 256) { if (dimensions.x > dimensions.y) { chunkSizePixels = Math.floor(128 * (128 / dimensions.x)); - }else{ + } else { chunkSizePixels = Math.floor(128 * (128 / dimensions.y)); } logger.log("ChunkSizePixels:", chunkSizePixels); From e63638f364f2d4173c76f71a5d4965f61a44a647 Mon Sep 17 00:00:00 2001 From: xSparfuchs Date: Wed, 17 Jun 2020 20:17:23 +0200 Subject: [PATCH 4/7] Update screenshot_exporter.js --- src/js/game/hud/parts/screenshot_exporter.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/js/game/hud/parts/screenshot_exporter.js b/src/js/game/hud/parts/screenshot_exporter.js index 41f506a1..528bc485 100644 --- a/src/js/game/hud/parts/screenshot_exporter.js +++ b/src/js/game/hud/parts/screenshot_exporter.js @@ -64,7 +64,7 @@ export class HUDScreenshotExporter extends BaseHUDPart { } else { chunkSizePixels = Math.floor(128 * (128 / dimensions.y)); } - logger.log("ChunkSizePixels:", chunkSizePixels); + logger.log("ChunkSizePixels:", chunkSizePixels); } const chunkScale = chunkSizePixels / (globalConfig.mapChunkSize * globalConfig.tileSize); From 1b85c32b3b8e1d3efbc1df1d1caeb17147039d31 Mon Sep 17 00:00:00 2001 From: xSparfuchs Date: Wed, 17 Jun 2020 20:31:39 +0200 Subject: [PATCH 5/7] prettier --- src/js/game/hud/parts/screenshot_exporter.js | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/src/js/game/hud/parts/screenshot_exporter.js b/src/js/game/hud/parts/screenshot_exporter.js index 528bc485..2b72dd7b 100644 --- a/src/js/game/hud/parts/screenshot_exporter.js +++ b/src/js/game/hud/parts/screenshot_exporter.js @@ -57,15 +57,12 @@ export class HUDScreenshotExporter extends BaseHUDPart { logger.log("Dimensions:", dimensions); let chunkSizePixels = 128; - - if (dimensions.x + dimensions.y > 256) { - if (dimensions.x > dimensions.y) { - chunkSizePixels = Math.floor(128 * (128 / dimensions.x)); - } else { - chunkSizePixels = Math.floor(128 * (128 / dimensions.y)); - } - logger.log("ChunkSizePixels:", chunkSizePixels); + const maxDimensions = Math.max(dimensions.x, dimensions.y); + + if (maxDimensions > 128) { + chunkSizePixels = Math.floor(128 * (128 / Math.max(dimensions.x, dimensions.y))); } + logger.log("ChunkSizePixels:", chunkSizePixels); const chunkScale = chunkSizePixels / (globalConfig.mapChunkSize * globalConfig.tileSize); logger.log("Scale:", chunkScale); From 889e22ea69942b31040d816f0cb57270f0353ff9 Mon Sep 17 00:00:00 2001 From: xSparfuchs Date: Wed, 17 Jun 2020 20:33:20 +0200 Subject: [PATCH 6/7] Update screenshot_exporter.js --- src/js/game/hud/parts/screenshot_exporter.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/js/game/hud/parts/screenshot_exporter.js b/src/js/game/hud/parts/screenshot_exporter.js index 2b72dd7b..7d388087 100644 --- a/src/js/game/hud/parts/screenshot_exporter.js +++ b/src/js/game/hud/parts/screenshot_exporter.js @@ -58,9 +58,9 @@ export class HUDScreenshotExporter extends BaseHUDPart { let chunkSizePixels = 128; const maxDimensions = Math.max(dimensions.x, dimensions.y); - + if (maxDimensions > 128) { - chunkSizePixels = Math.floor(128 * (128 / Math.max(dimensions.x, dimensions.y))); + chunkSizePixels = Math.floor(128 * (128 / maxDimensions)); } logger.log("ChunkSizePixels:", chunkSizePixels); From 8d21c1dfafde61d622e2c3ce9e8ad7d59acbacee Mon Sep 17 00:00:00 2001 From: xSparfuchs Date: Wed, 17 Jun 2020 20:38:11 +0200 Subject: [PATCH 7/7] fine --- src/js/game/hud/parts/screenshot_exporter.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/js/game/hud/parts/screenshot_exporter.js b/src/js/game/hud/parts/screenshot_exporter.js index 7d388087..6b1ad67b 100644 --- a/src/js/game/hud/parts/screenshot_exporter.js +++ b/src/js/game/hud/parts/screenshot_exporter.js @@ -60,7 +60,7 @@ export class HUDScreenshotExporter extends BaseHUDPart { const maxDimensions = Math.max(dimensions.x, dimensions.y); if (maxDimensions > 128) { - chunkSizePixels = Math.floor(128 * (128 / maxDimensions)); + chunkSizePixels = Math.floor(128 * (128 / maxDimensions)); } logger.log("ChunkSizePixels:", chunkSizePixels);