Gittes-archive/LucasDower_ObjToSchematic
2
0
Fork 0
mirror of https://github.com/LucasDower/ObjToSchematic.git synced 2025-12-11 20:15:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Reimplement colour resolution to OtS_BlockMesh_Converter

Browse Source
This commit is contained in:
Lucas Dower 2023-10-26 19:04:54 +01:00
parent 30848dc02a
commit 1d051dbcc8
1 changed files with 29 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
Core/src/ots_block_mesh_converter.ts
View File

@ -71,7 +71,6 @@ export class OtS_BlockMesh_Converter {
// TODO: Fallable // TODO: Fallable
// TODO: Smoothness // TODO: Smoothness
// TODO: Resolution
// TODO: Dithering // TODO: Dithering
let neighbourhood: OtS_VoxelMesh_Neighbourhood | undefined; let neighbourhood: OtS_VoxelMesh_Neighbourhood | undefined;
@ -80,7 +79,33 @@ export class OtS_BlockMesh_Converter {
neighbourhood.process(voxelMesh, 'cardinal'); neighbourhood.process(voxelMesh, 'cardinal');
} }
let caches: Array<Map<number, string>>;
if (this._config.mode.type === 'per-face') {
caches = new Array<Map<number, string>>(64);
for (let i = 0; i < caches.length; ++i) {
caches[i] = new Map();
}
} else {
caches = new Array(1);
caches[0] = new Map();
}
for (const { position, colour } of voxelMesh.getVoxels()) { for (const { position, colour } of voxelMesh.getVoxels()) {
const binnedColour = RGBAUtil.bin(colour, this._config.resolution ?? 255);
const binnedHash = RGBAUtil.hash255(binnedColour);
let cache = caches[0];
if (neighbourhood) {
const visibility = neighbourhood.getFaceVisibility(position.x, position.y, position.z);
ASSERT(visibility !== null);
cache = caches[visibility];
}
const cachedBlock = cache.get(binnedHash);
if (cachedBlock !== undefined) {
blockMesh.addBlock(position.x, position.y, position.z, cachedBlock, true);
continue;
}
let block: (string | null) = null; let block: (string | null) = null;
if (this._config.mode.type === 'per-block') { if (this._config.mode.type === 'per-block') {
block = this._findClosestBlock_PerBlock(colour); block = this._findClosestBlock_PerBlock(colour);
@ -92,6 +117,8 @@ export class OtS_BlockMesh_Converter {
continue; continue;
} }
cache.set(binnedHash, block);
blockMesh.addBlock(position.x, position.y, position.z, block, true); blockMesh.addBlock(position.x, position.y, position.z, block, true);
} }