#34 add support for waterlogged blocks (#35)

* #34 add support for waterlogged * Small stylistic changes * Remove the need for SpecialRenderers.has --------- Co-authored-by: Misode <[email protected]>
misode · Sep 5, 2024 · fb783d6 · fb783d6
1 parent 0cef5d6
commit fb783d6
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 11 deletions.
diff --git a/demo/main.ts b/demo/main.ts
@@ -158,6 +158,7 @@ Promise.all([
 	structure.addBlock([1, 0, 0], 'minecraft:stone')
 	structure.addBlock([2, 0, 0], 'minecraft:grass_block', { snowy: 'false' })
 	structure.addBlock([1, 1, 0], 'minecraft:cake', { bites: '3' })
+	structure.addBlock([2, 1, 0], 'minecraft:acacia_fence', { waterlogged: 'true' })
 	structure.addBlock([0, 0, 0], 'minecraft:wall_torch', { facing: 'west' })
 
 	const structureCanvas = document.getElementById('structure-display') as HTMLCanvasElement

diff --git a/src/core/BlockState.ts b/src/core/BlockState.ts
@@ -32,6 +32,10 @@ export class BlockState {
 		return this.is(BlockState.WATER) || this.is(BlockState.LAVA)
 	}
 
+	public isWaterlogged() {
+		return this.is(BlockState.WATER) || this.is(BlockState.LAVA) || this.properties['waterlogged'] === 'true'
+	}
+
 	public equals(other: BlockState) {
 		if (!this.name.equals(other.name)) {
 			return false

diff --git a/src/render/ChunkBuilder.ts b/src/render/ChunkBuilder.ts
@@ -2,7 +2,7 @@ import { mat4, vec3 } from 'gl-matrix'
 import type { PlacedBlock, Resources, StructureProvider } from '../index.js'
 import { BlockPos, Direction, Vector } from '../index.js'
 import { Mesh } from './Mesh.js'
-import { SpecialRenderer, SpecialRenderers } from './SpecialRenderer.js'
+import { SpecialRenderers } from './SpecialRenderer.js'
 
 export class ChunkBuilder {
 	private chunks: {mesh: Mesh, transparentMesh: Mesh}[][][] = []
@@ -69,8 +69,9 @@ export class ChunkBuilder {
 				if (blockDefinition) {
 					mesh.merge(blockDefinition.getMesh(blockName, blockProps, this.resources, this.resources, cull))
 				}
-				if (SpecialRenderers.has(blockName.toString())) {
-					mesh.merge(SpecialRenderer[blockName.toString()](blockProps, this.resources, cull))
+				const specialMesh = SpecialRenderers.getMesh(blockName.toString(), blockProps, this.resources, cull)
+				if (!specialMesh.isEmpty()) {
+					mesh.merge(specialMesh)
 				}
 				if (!mesh.isEmpty()) {	
 					this.finishChunkMesh(mesh, b.pos)
@@ -114,9 +115,9 @@ export class ChunkBuilder {
 		}
 
 		if (neighborFlags?.opaque) {
-			return !(dir === Direction.UP && block.state.isFluid())
+			return !(dir === Direction.UP && block.state.isWaterlogged())
 		} else {
-			return block.state.isFluid() && neighbor.isFluid()
+			return block.state.isWaterlogged() && neighbor.isWaterlogged()
 		}
 	}
 

diff --git a/src/render/ItemRenderer.ts b/src/render/ItemRenderer.ts
@@ -1,7 +1,7 @@
 import { mat4 } from 'gl-matrix'
 import { Identifier } from '../core/index.js'
 import { ItemStack } from '../core/ItemStack.js'
-import { Cull, SpecialRenderer, SpecialRenderers, type Color } from '../index.js'
+import { Cull, SpecialRenderers, type Color } from '../index.js'
 import type { BlockModelProvider } from './BlockModel.js'
 import { getItemColor } from './ItemColors.js'
 import type { Mesh } from './Mesh.js'
@@ -49,8 +49,8 @@ export class ItemRenderer extends Renderer {
 			tint = getItemColor(this.item)
 		}
 		const mesh = model.getMesh(this.resources, Cull.none(), tint)
-		if (SpecialRenderers.has(this.item.id.toString())){
-			const specialMesh = SpecialRenderer[this.item.id.toString()]({}, this.resources, Cull.none())
+		const specialMesh = SpecialRenderers.getMesh(this.item.id.toString(), {}, this.resources, Cull.none())
+		if (!specialMesh.isEmpty()) {
 			// undo the scaling done by the special renderer
 			const t = mat4.create()
 			mat4.identity(t)

diff --git a/src/render/SpecialRenderer.ts b/src/render/SpecialRenderer.ts
@@ -3,7 +3,7 @@ import { Direction, Identifier } from '../core/index.js'
 import { BlockDefinition } from './BlockDefinition.js'
 import { BlockModel } from './BlockModel.js'
 import type { Cull } from './Cull.js'
-import type { Mesh } from './Mesh.js'
+import { Mesh } from './Mesh.js'
 import type { TextureAtlasProvider } from './TextureAtlas.js'
 
 function dummy(id: Identifier, uvProvider: TextureAtlasProvider, cull: Cull, model: BlockModel) {
@@ -124,7 +124,7 @@ function decoratedPotRenderer(uvProvider: TextureAtlasProvider){
 	]))
 }
 
-export const SpecialRenderer: {
+const RENDERERS: {
 	[key: string]: (props: { [key: string]: string }, uvProvider: TextureAtlasProvider, cull: Cull) => Mesh,
 } = {
 	'minecraft:water': (props, uvProvider, cull) =>
@@ -137,4 +137,15 @@ export const SpecialRenderer: {
 		decoratedPotRenderer(uvProvider),
 }
 
-export const SpecialRenderers = new Set(Object.keys(SpecialRenderer))
+export namespace SpecialRenderers {
+	export function getMesh(id: string, props: { [key: string]: string }, uvProvider: TextureAtlasProvider, cull: Cull): Mesh {
+		const mesh = new Mesh()
+		if (id in RENDERERS) {
+			mesh.merge(RENDERERS[id](props, uvProvider, cull))
+		}
+		if (props['waterlogged'] === 'true') {
+			mesh.merge(liquidRenderer('water', 0, uvProvider, cull, 0))
+		}
+		return mesh
+	}
+}