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

Merge pull request #98 from 0-zen/0.7

Browse Source 
Added grass-like blocks replacement when an opaque block is on top
This commit is contained in:
Lucas Dower 2023-01-22 14:18:03 +00:00 committed by GitHub
commit 9ebb5f8493
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 49 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
res/grass_like_blocks.json Normal file
View File

@ -0,0 +1,11 @@
{
"grass_like_blocks": [
"minecraft:grass_block",
"minecraft:grass_path",
"minecraft:podzol",
"minecraft:crimson_nylium",
"minecraft:warped_nylium",
"minecraft:mycelium",
"minecraft:farmland"
]
}

39
src/block_mesh.ts
View File

@ -1,7 +1,7 @@
import fs from 'fs';
import { Atlas, TAtlasBlock } from './atlas';
import { AtlasPalette } from './block_assigner';
import { AtlasPalette, EFaceVisibility } from './block_assigner';
import { BlockInfo } from './block_atlas';
import { ChunkedBufferGenerator, TBlockMeshBufferDescription } from './buffer';
import { RGBA_255, RGBAUtil } from './colour';
@ -23,6 +23,13 @@ interface Block {
blockInfo: BlockInfo;
}
interface GrassLikeBlock {
id: number;
voxelColour: RGBA_255;
errWeight: number;
faceVisibility: EFaceVisibility;
}
export type FallableBehaviour = 'replace-falling' | 'replace-fallable' | 'place-string' | 'do-nothing';
export interface BlockMeshParams {
@ -38,6 +45,7 @@ export class BlockMesh {
private _voxelMesh: VoxelMesh;
private _fallableBlocks: string[];
private _transparentBlocks: string[];
private _grassLikeBlocks: string[];
private _emissiveBlocks: string[];
private _atlas: Atlas;
private _lighting: BlockMeshLighting;
@ -75,6 +83,9 @@ export class BlockMesh {
const emissivelocksString = fs.readFileSync(PathUtil.join(AppPaths.Get.resources, 'emissive_blocks.json'), 'utf-8');
this._emissiveBlocks = JSON.parse(emissivelocksString).emissive_blocks;
const grassLikeBlocksString = fs.readFileSync(PathUtil.join(AppPaths.Get.resources, 'grass_like_blocks.json'), 'utf-8');
this._grassLikeBlocks = JSON.parse(grassLikeBlocksString).grass_like_blocks;
}
/**
@ -115,6 +126,7 @@ export class BlockMesh {
const atlasPalette = new AtlasPalette(atlas, palette);
const allBlockCollection = atlasPalette.createBlockCollection([]);
const nonFallableBlockCollection = atlasPalette.createBlockCollection(this._fallableBlocks);
const grassLikeBlocksBuffer: GrassLikeBlock[] = [];
let countFalling = 0;
const taskHandle = ProgressManager.Get.start('Assigning');
@ -147,12 +159,37 @@ export class BlockMesh {
block = atlasPalette.getBlock(voxelColour, nonFallableBlockCollection, faceVisibility, blockMeshParams.errorWeight);
}
if (this._grassLikeBlocks.includes(block.name)) {
grassLikeBlocksBuffer.push({
id: this._blocks.length,
voxelColour: voxelColour,
errWeight: blockMeshParams.errorWeight,
faceVisibility: faceVisibility,
});
}
this._blocks.push({
voxel: voxel,
blockInfo: block,
});
this._blocksUsed.add(block.name);
}
if (grassLikeBlocksBuffer.length > 0) {
const nonGrassLikeBlockCollection = atlasPalette.createBlockCollection(this._grassLikeBlocks);
for (let index=0; index < grassLikeBlocksBuffer.length; index++) {
ProgressManager.Get.progress(taskHandle, index / grassLikeBlocksBuffer.length);
const examined = grassLikeBlocksBuffer[index];
const examinedBlock = this._blocks[examined.id];
const topBlockId = this._blocks.findIndex((b) => b.voxel.position.equals(Vector3.add(examinedBlock.voxel.position, new Vector3(0, 1, 0))));
if (topBlockId > -1 && !this._transparentBlocks.includes(this._blocks[topBlockId].blockInfo.name)) {
const block = atlasPalette.getBlock(examined.voxelColour, nonGrassLikeBlockCollection, examined.faceVisibility, examined.errWeight);
examinedBlock.blockInfo = block;
this._blocks[examined.id] = examinedBlock;
this._blocksUsed.add(block.name);
};
}
}
ProgressManager.Get.end(taskHandle);
if (blockMeshParams.fallable === 'do-nothing' && countFalling > 0) {