Skip to content

Commit db5e9ef

Browse files
committed
ミスを修正し正常に生成できるようになった
1 parent 55e42ee commit db5e9ef

File tree

1 file changed

+14
-4
lines changed

1 file changed

+14
-4
lines changed

worldmap-generator.js

+14-4
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@ setInterval(() => {
2828
}, 1000)
2929

3030
filterValidImages(allImages).then(validImages => {
31+
console.log('Filtering valid images conpleted');
32+
console.log('Valid images are: ' + validImages)
3133
const gridSize = getGridSize(validImages);
3234
sharp.cache(false);
3335
sharp.concurrency(1);
@@ -36,19 +38,22 @@ filterValidImages(allImages).then(validImages => {
3638
});
3739

3840
async function filterValidImages(images) {
41+
console.log('Filtering Valid Images...')
3942
let validImages = [];
4043

4144
for (const image of images) {
42-
const isError = await isErrorImage(image);
45+
const isError = await isErrorImage(path.join(INPUT_DIR, image), 16, 1);
4346
if (!isError) {
4447
validImages.push(image); // エラー画像でなければ追加
48+
console.log('A valid image added!')
4549
}
4650
}
4751
console.log(validImages)
4852
return validImages;
4953
}
5054

5155
async function isErrorImage(image, headerHeight, transparencyThreshold) {
56+
console.log(`Checking image: ${image}`)
5257

5358
// 画像のピクセルデータと情報を取得
5459
// 返値の形式は
@@ -91,6 +96,7 @@ async function isErrorImage(image, headerHeight, transparencyThreshold) {
9196
}
9297

9398
function getGridSize(images) {
99+
console.log('Getting grid size...')
94100
let minX = Infinity,
95101
minY = Infinity,
96102
maxX = -Infinity,
@@ -128,18 +134,21 @@ async function createWorldMap(images, gridSize) {
128134
console.log(`Creating world map: ${output}`);
129135

130136
const tiles = images.map(image => {
131-
const [x, y] = parseFileName(image);
137+
const { x, y } = parseFileName(image);
132138
const top = y - gridSize.minY;
133139
const left = x - gridSize.minX;
134140

135141
return {
136-
input: `${OUTPUT_DIR}${INPUT_DIR}${image}`,
142+
input: path.join(INPUT_DIR, image),
137143
top: top * IMAGE_SIZE,
138144
left: left * IMAGE_SIZE
139145
};
140146
});
141147

148+
console.log('Generating tile data is completed');
149+
142150
try {
151+
console.log('Generating worldmap...')
143152
await sharp({
144153
create: {
145154
width: gridSize.sizeX * IMAGE_SIZE,
@@ -150,7 +159,7 @@ async function createWorldMap(images, gridSize) {
150159
limitInputPixels: false
151160
})
152161
.composite(tiles)
153-
.toFile(output);
162+
.toFile(path.join(OUTPUT_DIR, output));
154163

155164
console.log(`Created ${output}`);
156165
} catch (err) {
@@ -167,6 +176,7 @@ async function createWorldMap(images, gridSize) {
167176
* @returns {object} ext: 拡張子, name: 拡張子を含まないファイル名, x: X座標, y: Y座標
168177
*/
169178
function parseFileName(fileName) {
179+
console.log(`Parsing file name: ${fileName}`);
170180
const parsed = path.parse(fileName);
171181

172182
const ext = parsed.ext;

0 commit comments

Comments
 (0)