minecraft-renderer 0.1.77 → 0.1.79

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "minecraft-renderer",
-  "version": "0.1.77",
+  "version": "0.1.79",
   "description": "The most Modular Minecraft world renderer with Three.js WebGL backend",
   "type": "module",
   "main": "./dist/index.js",

package/src/three/chunkMeshManager.ts

@@ -4,7 +4,7 @@ import * as nbt from 'prismarine-nbt'
 import { Vec3 } from 'vec3'
 import { MesherGeometryOutput } from '../mesher-shared/shared'
 import { getShaderCubeResources, SHADER_CUBES_WORDS_PER_FACE } from '../wasm-mesher/bridge/shaderCubeBridge'
-import { createCubeBlockMaterial, computeSectionOriginRel, setCubeSkyLevel, setCubeLightmapParams, type BlockLightmapParams } from './shaders/cubeBlockShader'
+import { createCubeBlockMaterial, computeSectionOriginRel, setCubeSkyLevel, setCubeShadingTheme, setCubeLightmapParams, type BlockLightmapParams } from './shaders/cubeBlockShader'
 import { computeCameraRelativeUniforms, createGlobalLegacyBlendMaterial, createGlobalLegacyBlockMaterial, createLegacyBlockMaterial, setLegacyCameraOrigin, setLegacySkyLevel, setLegacyLightmapParams, type RenderOrigin } from './shaders/legacyBlockShader'
 import { LEGACY_SECTION_HALF_EXTENT, sectionIntersectsFrustum, setupLegacySectionMatrix, updateLegacySectionCullState } from './legacySectionCull'
 import { createShaderCubeMesh, disposeShaderCubeMesh } from './shaderCubeMesh'
@@ -140,6 +140,9 @@ export class ChunkMeshManager {
   private readonly _legacyCullBoxMin = new THREE.Vector3()
   private readonly _legacyCullBoxMax = new THREE.Vector3()
   private readonly _visibleSectionSpans: Array<{ key: string, distSq: number }> = []
+  /** Sections with geometry in global legacy opaque and/or blend buffers — cull/raycast scan only these. */
+  private readonly legacyCullSections = new Map<string, { worldX: number, worldY: number, worldZ: number }>()
+  private _lastCullFingerprint = ''
   /** Drives per-frame cull + span rebuild; cleared after updateSectionCullAndSort. */
   cullDirty = true
   private readonly _lastCullCamPos = new THREE.Vector3()
@@ -266,6 +269,11 @@ export class ChunkMeshManager {
     this.blockEntityLightRegistry.setSkyLevel(value)
   }
 
+  setShadingTheme (theme: 'vanilla' | 'high-contrast', cardinalLight: string): void {
+    const cube = this.cubeShaderMaterial ?? (this.isShaderCubesGpuEnabled() ? this.getCubeShaderMaterial() : null)
+    if (cube) setCubeShadingTheme(cube, theme, cardinalLight)
+  }
+
   /** Vanilla-like lightmap curve params (live tuning via window.setBlockLightmap). */
   setBlockLightmapParams (params: BlockLightmapParams): void {
     const cube = this.cubeShaderMaterial ?? (this.isShaderCubesGpuEnabled() ? this.getCubeShaderMaterial() : null)
@@ -379,6 +387,45 @@ export class ChunkMeshManager {
     return this.activeSections.has(sectionKey)
   }
 
+  private registerLegacyCullSection (sectionKey: string, worldX: number, worldY: number, worldZ: number): void {
+    this.legacyCullSections.set(sectionKey, { worldX, worldY, worldZ })
+  }
+
+  private maybeUnregisterLegacyCullSection (sectionKey: string): void {
+    const inOpaque = this.globalLegacyBuffer?.hasSection(sectionKey) ?? false
+    const inBlend = this.globalLegacyBlendBuffer?.hasSection(sectionKey) ?? false
+    if (!inOpaque && !inBlend) {
+      this.legacyCullSections.delete(sectionKey)
+    }
+  }
+
+  private updatePooledLegacyCullState (
+    cameraWorldX: number,
+    cameraWorldY: number,
+    cameraWorldZ: number,
+  ): void {
+    for (const poolEntry of this.activeSections.values()) {
+      const sectionKey = poolEntry.sectionKey
+      if (!sectionKey) continue
+      const sectionObject = this.sectionObjects[sectionKey]
+      if (!sectionObject) continue
+
+      updateLegacySectionCullState(
+        poolEntry.mesh,
+        sectionObject.worldX ?? 0,
+        sectionObject.worldY ?? 0,
+        sectionObject.worldZ ?? 0,
+        cameraWorldX,
+        cameraWorldY,
+        cameraWorldZ,
+        this._legacyCullFrustum,
+        this._legacyCullBox,
+        this._legacyCullBoxMin,
+        this._legacyCullBoxMax,
+      )
+    }
+  }
+
   /**
    * Shared section visibility + span groups for global legacy and cube buffers.
    */
@@ -389,8 +436,9 @@ export class ChunkMeshManager {
     const visible = this._visibleSectionSpans
     visible.length = 0
 
-    for (const [sectionKey, sectionObject] of Object.entries(this.sectionObjects)) {
-      if (sectionObject.worldX === undefined || !sectionObject.visible) continue
+    for (const [sectionKey] of this.legacyCullSections) {
+      const sectionObject = this.sectionObjects[sectionKey]
+      if (!sectionObject?.visible || sectionObject.worldX === undefined) continue
       const { visible: inFrustum, distSq } = sectionIntersectsFrustum(
         sectionObject.worldX,
         sectionObject.worldY ?? 0,
@@ -408,13 +456,27 @@ export class ChunkMeshManager {
       }
     }
 
-    this.globalLegacyBuffer?.updateDrawSpans(visible, 'opaque')
-    this.globalLegacyBlendBuffer?.updateDrawSpans(visible, 'sortedBlend')
-
+    const opaqueBuf = this.globalLegacyBuffer
+    const blendBuf = this.globalLegacyBlendBuffer
     const gb = this.globalBlockBuffer
+
+    const opaqueKeys: string[] = []
+    for (const entry of visible) {
+      if (opaqueBuf?.hasSection(entry.key)) opaqueKeys.push(entry.key)
+    }
+    opaqueKeys.sort()
+
+    const blendVisible = visible.filter(v => blendBuf?.hasSection(v.key))
+    blendVisible.sort((a, b) => b.distSq - a.distSq)
+    const blendKeys = blendVisible.map(v => v.key)
+
+    const cubeVisibleKeys: string[] = []
+    const visibleSlots: Array<{ start: number, count: number }> = []
     if (gb) {
-      const visibleSlots: Array<{ start: number, count: number }> = []
       gb.forEachSectionSlot((key, slot) => {
+        const sectionObject = this.sectionObjects[key]
+        // Keep in sync with legacy gate (line 440).
+        if (!sectionObject?.visible) return
         const entry = this.shaderSectionRaycastBoxes.get(key)
         if (!entry) {
           return
@@ -434,35 +496,39 @@ export class ChunkMeshManager {
         if (!inFrustum) {
           return
         }
+        cubeVisibleKeys.push(key)
         const drawStart = gb.getSectionDrawStart(key)
         if (drawStart !== undefined) {
           visibleSlots.push({ start: drawStart, count: slot.count })
         }
       })
-      const spans = buildVisibleCubeSpans(visibleSlots, gb.getHighWatermark())
-      gb.setVisibleSpans(spans)
     }
+    cubeVisibleKeys.sort()
 
-    for (const poolEntry of this.activeSections.values()) {
-      const sectionKey = poolEntry.sectionKey
-      if (!sectionKey) continue
-      const sectionObject = this.sectionObjects[sectionKey]
-      if (!sectionObject) continue
+    const fingerprint = [
+      opaqueKeys.join(','),
+      blendKeys.join(','),
+      cubeVisibleKeys.join(','),
+      opaqueBuf?.getLayoutVersion() ?? 0,
+      blendBuf?.getLayoutVersion() ?? 0,
+      gb?.getLayoutVersion() ?? 0,
+    ].join('|')
 
-      updateLegacySectionCullState(
-        poolEntry.mesh,
-        sectionObject.worldX ?? 0,
-        sectionObject.worldY ?? 0,
-        sectionObject.worldZ ?? 0,
-        cameraWorldX,
-        cameraWorldY,
-        cameraWorldZ,
-        this._legacyCullFrustum,
-        this._legacyCullBox,
-        this._legacyCullBoxMin,
-        this._legacyCullBoxMax,
-      )
+    if (fingerprint === this._lastCullFingerprint) {
+      this.updatePooledLegacyCullState(cameraWorldX, cameraWorldY, cameraWorldZ)
+      return
+    }
+    this._lastCullFingerprint = fingerprint
+
+    opaqueBuf?.updateDrawSpans(visible, 'opaque')
+    blendBuf?.updateDrawSpans(visible, 'sortedBlend')
+
+    if (gb) {
+      const spans = buildVisibleCubeSpans(visibleSlots, gb.getHighWatermark())
+      gb.setVisibleSpans(spans)
     }
+
+    this.updatePooledLegacyCullState(cameraWorldX, cameraWorldY, cameraWorldZ)
   }
 
   markCullDirty (): void {
@@ -531,6 +597,8 @@ export class ChunkMeshManager {
     if (!this.cubeShaderMaterial) {
       this.cubeShaderMaterial = createCubeBlockMaterial()
       this.syncCubeShaderUniforms()
+      const cfg = this.worldRenderer.worldRendererConfig
+      setCubeShadingTheme(this.cubeShaderMaterial, cfg.shadingTheme, cfg.cardinalLight)
     }
     return this.cubeShaderMaterial
   }
@@ -602,13 +670,16 @@ export class ChunkMeshManager {
       const wy = section.worldY
       const wz = section.worldZ
       if (wx !== undefined && wy !== undefined && wz !== undefined) {
-        this.getGlobalLegacyBuffer().addSection(
+        const added = this.getGlobalLegacyBuffer().addSection(
           sectionKey,
           { positions, colors, skyLights, blockLights, uvs, indices },
           wx,
           wy,
           wz,
         )
+        if (added) {
+          this.registerLegacyCullSection(sectionKey, wx, wy, wz)
+        }
       }
       delete section.deferredLegacyOpaque
     }
@@ -619,13 +690,16 @@ export class ChunkMeshManager {
       const wy = section.worldY
       const wz = section.worldZ
       if (wx !== undefined && wy !== undefined && wz !== undefined) {
-        this.getGlobalLegacyBlendBuffer().addSection(
+        const added = this.getGlobalLegacyBlendBuffer().addSection(
           sectionKey,
           { positions, colors, skyLights, blockLights, uvs, indices },
           wx,
           wy,
           wz,
         )
+        if (added) {
+          this.registerLegacyCullSection(sectionKey, wx, wy, wz)
+        }
       }
       delete section.deferredLegacyBlend
       section.hasBlendMesh = false
@@ -653,15 +727,13 @@ export class ChunkMeshManager {
     const far = raycaster.far
     const halfExtent = LEGACY_SECTION_HALF_EXTENT + 0.01
     const candidates: string[] = []
-    for (const [key, section] of Object.entries(this.sectionObjects)) {
-      if (section.worldX === undefined) continue
+    for (const [key] of this.legacyCullSections) {
+      const section = this.sectionObjects[key]
+      if (!section || section.worldX === undefined) continue
       const dx = section.worldX - origin.x
       const dy = (section.worldY ?? 0) - origin.y
       const dz = (section.worldZ ?? 0) - origin.z
       if (dx * dx + dy * dy + dz * dz > maxDistSq) continue
-      const inOpaque = this.globalLegacyBuffer?.hasSection(key) ?? false
-      const inBlend = this.globalLegacyBlendBuffer?.hasSection(key) ?? false
-      if (!inOpaque && !inBlend) continue
       if (!sectionAabbIntersectsRay(
         section.worldX,
         section.worldY ?? 0,
@@ -905,7 +977,9 @@ export class ChunkMeshManager {
           geometryData.sy,
           geometryData.sz,
         )
-        if (!added) {
+        if (added) {
+          this.registerLegacyCullSection(sectionKey, geometryData.sx, geometryData.sy, geometryData.sz)
+        } else {
           const poolEntry = this.acquirePooledSectionMesh(sectionKey)
           if (!poolEntry) return null
           legacyMesh = this.uploadLegacyPooledMesh(poolEntry, geometryData, geometryData.sx, geometryData.sy, geometryData.sz)
@@ -953,7 +1027,9 @@ export class ChunkMeshManager {
           geometryData.sy,
           geometryData.sz,
         )
-        if (!added) {
+        if (added) {
+          this.registerLegacyCullSection(sectionKey, geometryData.sx, geometryData.sy, geometryData.sz)
+        } else {
           console.warn(`ChunkMeshManager: blend invariant violation for section ${sectionKey}, using pooled mesh fallback`)
           const poolEntry = this.acquirePooledSectionMesh(sectionKey)
           if (!poolEntry) return null
@@ -1190,6 +1266,7 @@ export class ChunkMeshManager {
       sectionObject.visible = true
     }
     delete this.waitingChunksToDisplay[chunkKey]
+    this.markCullDirty()
   }
 
   // Re-check every parked entry; each has its own grace window via `ageMs`.
@@ -1352,6 +1429,7 @@ export class ChunkMeshManager {
       this.globalBlockBuffer?.removeSection(sectionKey)
       this.globalLegacyBuffer?.removeSection(sectionKey)
       this.globalLegacyBlendBuffer?.removeSection(sectionKey)
+      this.maybeUnregisterLegacyCullSection(sectionKey)
       this.unregisterShaderSectionRaycastBox(sectionKey)
       this.markCullDirty()
       delete sectionObject.deferredLegacyOpaque

package/src/three/globalBlockBuffer.ts

@@ -69,6 +69,7 @@ export class GlobalBlockBuffer {
   private tierCAttrs: TierCAttrState | null = null
   private tierCGl: WebGL2RenderingContext | null = null
   private debugOverlay = false
+  private layoutVersion = 0
 
   constructor (
     material: THREE.ShaderMaterial,
@@ -225,6 +226,11 @@ export class GlobalBlockBuffer {
     this.sectionSlots.set(sectionKey, slot)
     this.markDirty(slot.start, slot.start + faceCount - 1)
     this.mesh.geometry.instanceCount = this.highWatermark
+    this.layoutVersion++
+  }
+
+  getLayoutVersion (): number {
+    return this.layoutVersion
   }
 
   hasSection (sectionKey: string): boolean {
@@ -288,6 +294,7 @@ export class GlobalBlockBuffer {
     this.insertFreeSlot(slot)
     this.shrinkHighWatermark()
     this.mesh.geometry.instanceCount = this.highWatermark
+    this.layoutVersion++
   }
 
   /** One interior-hole move per frame when fragmentation exceeds threshold; deferred shrink. */
@@ -318,6 +325,7 @@ export class GlobalBlockBuffer {
     this.sectionSlots.set(section.key, { start: newStart, count: section.count })
     this.markDirty(newStart, newStart + section.count - 1)
     this.pendingMove = { key: section.key, oldStart, newStart, count: section.count }
+    this.layoutVersion++
   }
 
   uploadDirtyRange (): void {