zhangyuheng/ObjToSchematic
1
0
Fork 0
forked from mirror/ObjToSchematic
Code Pull Requests 1 Activity

Optimise palette to atlas block conversion

Browse Source
This commit is contained in:
Lucas Dower 2022-04-14 20:07:59 +01:00
parent 5eb07190b2
commit 8f969a8431
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/block_atlas.ts
View File

@ -106,9 +106,12 @@ export class BlockAtlas {
const missingBlocks: string[] = [];
for (let paletteBlockIndex = palette.blocks.length - 1; paletteBlockIndex >= 0; --paletteBlockIndex) {
const paletteBlockName = palette.blocks[paletteBlockIndex];
if (this._atlasBlocks.findIndex((x) => x.name === paletteBlockName) === -1) {
const atlasBlockIndex = this._atlasBlocks.findIndex((x) => x.name === paletteBlockName);
if (atlasBlockIndex === -1) {
missingBlocks.push(paletteBlockName);
palette.blocks.splice(paletteBlockIndex, 1);
} else {
this._paletteBlockToBlockInfoIndex.set(paletteBlockName, atlasBlockIndex);
}
}
if (missingBlocks.length > 0) {
@ -135,8 +138,9 @@ export class BlockAtlas {
for (const paletteBlockName of this._palette) {
// TODO: Optimise Use hash map for blockIndex instead of linear search
const blockIndex: number = this._atlasBlocks.findIndex((x) => x.name === paletteBlockName);
if (blockIndex !== -1) {
const blockIndex: (number | undefined) = this._paletteBlockToBlockInfoIndex.get(paletteBlockName);
ASSERT(blockIndex !== undefined);
const block: BlockInfo = this._atlasBlocks[blockIndex];
const blockAvgColour = block.colour as RGB;
const distance = RGB.distance(blockAvgColour, voxelColour, colourSpace);
@ -146,7 +150,6 @@ export class BlockAtlas {
blockChoiceIndex = blockIndex;
}
}
}
if (blockChoiceIndex === undefined) {
throw new AppError('The chosen palette does not have suitable blocks');