minecraft-renderer 0.1.34 → 0.1.35

package/src/three/entities.ts

@@ -149,43 +149,49 @@ const addNametag = (entity, options: { fontFamily: string }, mesh, version: stri
       c.removeFromParent()
     }
   }
-  if (entity.username !== undefined && !entity.username.startsWith('EMPTY')) {
-    const canvas = getUsernameTexture(entity, options, version)
-    if (!canvas) return
-    const tex = new THREE.Texture(canvas)
-    tex.needsUpdate = true
-    let nameTag: THREE.Object3D
-    if (entity.nameTagFixed) {
-      const geometry = new THREE.PlaneGeometry()
-      const material = new THREE.MeshBasicMaterial({ map: tex })
-      material.transparent = true
-      nameTag = new THREE.Mesh(geometry, material)
-      nameTag.rotation.set(entity.pitch, THREE.MathUtils.degToRad(entity.yaw + 180), 0)
-      nameTag.position.y += entity.height + 0.3
-    } else {
-      const spriteMat = new THREE.SpriteMaterial({ map: tex })
-      nameTag = new THREE.Sprite(spriteMat)
-      nameTag.position.y += entity.height + 0.6
-    }
-    nameTag.renderOrder = 1000
-    nameTag.scale.set(canvas.width * 0.005, canvas.height * 0.005, 1)
-    if (entity.nameTagRotationRight) {
-      nameTag.applyQuaternion(entity.nameTagRotationRight)
-    }
-    if (entity.nameTagScale) {
-      nameTag.scale.multiply(entity.nameTagScale)
-    }
-    if (entity.nameTagRotationLeft) {
-      nameTag.applyQuaternion(entity.nameTagRotationLeft)
-    }
-    if (entity.nameTagTranslation) {
-      nameTag.position.add(entity.nameTagTranslation)
-    }
-    nameTag.name = 'nametag'
-
-    mesh.add(nameTag)
-    return nameTag
+  if (entity.username === undefined || entity.username === null) return
+
+  const plainUsername =
+    typeof entity.username === 'string'
+      ? entity.username
+      : new (PrismarineChatLoader(version))(entity.username).toString()
+  if (plainUsername.startsWith('EMPTY')) return
+
+  const canvas = getUsernameTexture(entity, options, version)
+  if (!canvas) return
+  const tex = new THREE.Texture(canvas)
+  tex.needsUpdate = true
+  let nameTag: THREE.Object3D
+  if (entity.nameTagFixed) {
+    const geometry = new THREE.PlaneGeometry()
+    const material = new THREE.MeshBasicMaterial({ map: tex })
+    material.transparent = true
+    nameTag = new THREE.Mesh(geometry, material)
+    nameTag.rotation.set(entity.pitch, THREE.MathUtils.degToRad(entity.yaw + 180), 0)
+    nameTag.position.y += entity.height + 0.3
+  } else {
+    const spriteMat = new THREE.SpriteMaterial({ map: tex })
+    nameTag = new THREE.Sprite(spriteMat)
+    nameTag.position.y += entity.height + 0.6
+  }
+  nameTag.renderOrder = 1000
+  nameTag.scale.set(canvas.width * 0.005, canvas.height * 0.005, 1)
+  if (entity.nameTagRotationRight) {
+    nameTag.applyQuaternion(entity.nameTagRotationRight)
+  }
+  if (entity.nameTagScale) {
+    nameTag.scale.multiply(entity.nameTagScale)
   }
+  if (entity.nameTagRotationLeft) {
+    nameTag.applyQuaternion(entity.nameTagRotationLeft)
+  }
+  if (entity.nameTagTranslation) {
+    nameTag.position.add(entity.nameTagTranslation)
+  }
+  nameTag.name = 'nametag'
+
+  mesh.add(nameTag)
+  return nameTag
 }
 
 // todo cleanup

package/src/three/graphicsBackendBase.ts

@@ -225,7 +225,7 @@ export const createGraphicsBackendBase = () => {
       },
       get left() {
         return {
-          'Geo Memory': worldRenderer?.worldBlockGeometry.getEstimatedMemoryUsage().readable ?? '-'
+          'Geo Memory': worldRenderer?.chunkMeshManager.getEstimatedMemoryUsage().total ?? '-'
         }
       },
     }),

package/src/three/modules/sciFiWorldReveal.ts

@@ -58,11 +58,9 @@ export class SciFiWorldRevealModule implements RendererModuleController {
   // Store original methods for patching
   private originalFinishChunk: ((chunkKey: string) => void) | null = null
   private originalDestroy: (() => void) | null = null
-  private originalSceneAdd: ((...object: THREE.Object3D[]) => THREE.Scene) | null = null
+  private originalSceneAdd: ((...object: THREE.Object3D[]) => THREE.Group) | null = null
   private originalHandleWorkerMessage: ((data: { geometry: MesherGeometryOutput; key: string; type: string }) => void) | null = null
 
-  private originalWbgHandle: ((data: any) => void) | null = null
-
   private configEnabled = true
 
   constructor(private readonly worldRenderer: WorldRendererThree) {
@@ -146,12 +144,10 @@ export class SciFiWorldRevealModule implements RendererModuleController {
       this.originalDestroy!()
     }
 
-    // Patch handleWorkerMessage
-    const wbg = wr.worldBlockGeometry
-    this.originalWbgHandle = wbg.handleWorkerGeometryMessage.bind(wbg)
-
-    wbg.handleWorkerGeometryMessage = (data: any) => {
-      const result = this.originalWbgHandle!(data)
+    // Patch handleWorkerMessage to intercept geometry
+    this.originalHandleWorkerMessage = wr.handleWorkerMessage.bind(wr)
+    wr.handleWorkerMessage = (data: any) => {
+      this.originalHandleWorkerMessage!(data)
 
       if (this.enabled && data?.type === 'geometry') {
         Promise.resolve().then(() => {
@@ -162,14 +158,12 @@ export class SciFiWorldRevealModule implements RendererModuleController {
           }
         })
       }
-
-      return result
     }
 
 
     // Patch scene.add to intercept mesh additions
     this.originalSceneAdd = wr.scene.add.bind(wr.scene)
-    wr.scene.add = (...objects: THREE.Object3D[]): THREE.Scene => {
+    wr.scene.add = (...objects: THREE.Object3D[]): THREE.Group => {
       // Call original add first
       const result = this.originalSceneAdd!(...objects)
 
@@ -208,11 +202,6 @@ export class SciFiWorldRevealModule implements RendererModuleController {
       this.originalSceneAdd = null
     }
 
-    if (this.originalWbgHandle) {
-      wr.worldBlockGeometry.handleWorkerGeometryMessage = this.originalWbgHandle as any
-      this.originalWbgHandle = null
-    }
-
     if (this.onWorldSwitchedCb) {
       const i = wr.onWorldSwitched.indexOf(this.onWorldSwitchedCb)
       if (i !== -1) wr.onWorldSwitched.splice(i, 1)
@@ -249,7 +238,7 @@ export class SciFiWorldRevealModule implements RendererModuleController {
     let current: THREE.Object3D | null = mesh
     while (current) {
       const { sectionKey } = (current as any)
-      if (sectionKey && this.worldRenderer.worldBlockGeometry.sectionObjects[sectionKey] === current) {
+      if (sectionKey && this.worldRenderer.chunkMeshManager.sectionObjects[sectionKey] === current) {
         return sectionKey
       }
       current = current.parent
@@ -270,7 +259,7 @@ export class SciFiWorldRevealModule implements RendererModuleController {
     const derivedKey = `${sectionX},${sectionY},${sectionZ}`
 
     // Verify this key exists in sectionObjects
-    if (this.worldRenderer.worldBlockGeometry.sectionObjects[derivedKey]) {
+    if (this.worldRenderer.chunkMeshManager.sectionObjects[derivedKey]) {
       return derivedKey
     }
 
@@ -281,7 +270,7 @@ export class SciFiWorldRevealModule implements RendererModuleController {
    * Get the scene from world renderer
    */
   private get scene(): THREE.Scene {
-    return this.worldRenderer.scene
+    return this.worldRenderer.realScene
   }
 
   /**
@@ -295,7 +284,7 @@ export class SciFiWorldRevealModule implements RendererModuleController {
    * Get original mesh for a section key
    */
   private getOriginalMesh(key: string): THREE.Mesh | null {
-    const sectionObject = this.worldRenderer.worldBlockGeometry.sectionObjects[key]
+    const sectionObject = this.worldRenderer.chunkMeshManager.sectionObjects[key]
     if (!sectionObject) return null
     return sectionObject.children.find(child => child.name === 'mesh') as THREE.Mesh | null
   }

package/src/three/panorama.ts

@@ -214,7 +214,7 @@ export class PanoramaRenderer {
       }
     )
     if (this.worldRenderer instanceof WorldRendererThree) {
-      this.scene = this.worldRenderer.scene
+      this.scene = this.worldRenderer.realScene
     }
     void worldView.init(initPos)
 

package/src/three/worldRendererThree.ts

@@ -13,7 +13,6 @@ import { addNewStat } from '../lib/ui/newStats'
 import { MesherGeometryOutput } from '../mesher/shared'
 import { ItemSpecificContextProperties } from '../playerState/types'
 import { setBlockPosition } from '../mesher/standaloneRenderer'
-import { getBannerTexture, createBannerMesh, releaseBannerTexture } from './bannerRenderer'
 import { getMyHand } from './hand'
 import { createHoldingBlock } from './holdingBlockFactory'
 import type { IHoldingBlock } from './holdingBlockTypes'
@@ -34,7 +33,7 @@ import { DEFAULT_TEMPERATURE, SkyboxRenderer } from './skyboxRenderer'
 import { FireworksManager } from './fireworks'
 import { SceneOrigin } from './sceneOrigin'
 import { downloadWorldGeometry } from './worldGeometryExport'
-import { WorldBlockGeometry } from './worldBlockGeometry'
+import { ChunkMeshManager } from './chunkMeshManager'
 import type { RendererModuleManifest, RegisteredModule, RendererModuleController } from './rendererModuleSystem'
 import { BUILTIN_MODULES } from './modules/index'
 
@@ -42,16 +41,17 @@ type SectionKey = string
 
 export class WorldRendererThree extends WorldRendererCommon {
   outputFormat = 'threeJs' as const
-  worldBlockGeometry: WorldBlockGeometry
+  chunkMeshManager: ChunkMeshManager
   get sectionObjects() {
-    return this.worldBlockGeometry.sectionObjects
+    return this.chunkMeshManager.sectionObjects
   }
   chunkTextures = new Map<string, { [pos: string]: THREE.Texture }>()
   signsCache = new Map<string, any>()
   cameraSectionPos: Vec3 = new Vec3(0, 0, 0)
   holdingBlock: IHoldingBlock
   holdingBlockLeft: IHoldingBlock
-  scene = new THREE.Scene()
+  realScene = new THREE.Scene()
+  scene = new THREE.Group()
   ambientLight = new THREE.AmbientLight(0xcc_cc_cc)
   directionalLight = new THREE.DirectionalLight(0xff_ff_ff, 0.5)
   entities = new Entities(this, (globalThis as any).mcData)
@@ -65,7 +65,7 @@ export class WorldRendererThree extends WorldRendererCommon {
   cameraContainer!: THREE.Object3D
   media: ThreeJsMedia
   get waitingChunksToDisplay() {
-    return this.worldBlockGeometry.waitingChunksToDisplay
+    return {} as { [chunkKey: string]: string[] }
   }
   waypoints: WaypointsRenderer
   cinimaticScript: CinimaticScriptRunner
@@ -81,7 +81,7 @@ export class WorldRendererThree extends WorldRendererCommon {
   renderTimeAvg = 0
   // Memory usage tracking (in bytes)
   get estimatedMemoryUsage() {
-    return this.worldBlockGeometry.estimatedMemoryUsage
+    return this.chunkMeshManager.getEstimatedMemoryUsage().total
   }
   // Module system
   private modules = {} as Record<string, RegisteredModule>
@@ -107,7 +107,7 @@ export class WorldRendererThree extends WorldRendererCommon {
   DEBUG_RAYCAST = false
   skyboxRenderer: SkyboxRenderer
   fireworks: FireworksManager
-  sceneOrigin = new SceneOrigin(this.scene)
+  sceneOrigin = new SceneOrigin(this.realScene)
   /** Camera world position stored in float64 (JS number) for precision */
   cameraWorldPos = { x: 0, y: 0, z: 0 }
 
@@ -131,11 +131,11 @@ export class WorldRendererThree extends WorldRendererCommon {
   private readonly _tpChunkWorldPos = new THREE.Vector3()
 
   get tilesRendered() {
-    return Object.values(this.sectionObjects).reduce((acc, obj) => acc + (obj as any).tilesCount, 0)
+    return this.chunkMeshManager.getTotalTiles()
   }
 
   get blocksRendered() {
-    return Object.values(this.sectionObjects).reduce((acc, obj) => acc + (obj as any).blocksCount, 0)
+    return this.chunkMeshManager.getTotalBlocks()
   }
 
   constructor(public renderer: THREE.WebGLRenderer, public initOptions: GraphicsInitOptions, public displayOptions: DisplayWorldOptions) {
@@ -145,8 +145,11 @@ export class WorldRendererThree extends WorldRendererCommon {
     this.renderer = renderer
     displayOptions.rendererState.renderer = WorldRendererThree.getRendererInfo(renderer) ?? '...'
 
-    // Initialize world block geometry handler
-    this.worldBlockGeometry = new WorldBlockGeometry(this, this.scene, this.material, displayOptions)
+    // Initialize chunk mesh manager
+    this.chunkMeshManager = new ChunkMeshManager(this, this.scene, this.material, this.worldSizeParams.worldHeight, this.viewDistance)
+    this.onRenderDistanceChanged = (viewDistance) => {
+      this.chunkMeshManager.updateViewDistance(viewDistance)
+    }
 
     this.cursorBlock = new CursorBlock(this)
     this.holdingBlock = createHoldingBlock(this)
@@ -158,7 +161,7 @@ export class WorldRendererThree extends WorldRendererCommon {
     }
 
     // Initialize skybox renderer
-    this.skyboxRenderer = new SkyboxRenderer(this.scene, false, null)
+    this.skyboxRenderer = new SkyboxRenderer(this.realScene, false, null)
     void this.skyboxRenderer.init()
 
     this.addDebugOverlay()
@@ -181,7 +184,7 @@ export class WorldRendererThree extends WorldRendererCommon {
         fov: this.camera.fov
       })
     )
-    this.fireworks = new FireworksManager(this.scene, this.sceneOrigin)
+    this.fireworks = new FireworksManager(this.realScene, this.sceneOrigin)
 
     // this.fountain = new Fountain(this.scene, this.scene, {
     //   position: new THREE.Vector3(0, 10, 0),
@@ -447,19 +450,20 @@ export class WorldRendererThree extends WorldRendererCommon {
     this.cameraWorldPos.y = 0
     this.cameraWorldPos.z = 0
 
-    this.scene.matrixAutoUpdate = false // for perf
-    this.scene.background = new THREE.Color(this.initOptions.config.sceneBackground)
-    this.scene.add(this.ambientLight)
+    this.realScene.matrixAutoUpdate = false // for perf
+    this.realScene.background = new THREE.Color(this.initOptions.config.sceneBackground)
+    this.realScene.add(this.ambientLight)
     this.directionalLight.position.set(1, 1, 0.5).normalize()
     this.directionalLight.castShadow = true
-    this.scene.add(this.directionalLight)
+    this.realScene.add(this.directionalLight)
 
     const size = this.renderer.getSize(new THREE.Vector2())
     this.camera = new THREE.PerspectiveCamera(75, size.x / size.y, 0.1, 1000)
     this._wrapCameraPositionWithWarning()
     this.cameraContainer = new THREE.Object3D()
     this.cameraContainer.add(this.camera)
-    this.scene.add(this.cameraContainer)
+    this.realScene.add(this.cameraContainer)
+    this.realScene.add(this.scene)
   }
 
   override watchReactivePlayerState() {
@@ -625,7 +629,7 @@ export class WorldRendererThree extends WorldRendererCommon {
   }
 
   changeBackgroundColor(color: [number, number, number]): void {
-    this.scene.background = new THREE.Color(color[0], color[1], color[2])
+    this.realScene.background = new THREE.Color(color[0], color[1], color[2])
   }
 
   timeUpdated(newTime: number): void {
@@ -662,7 +666,7 @@ export class WorldRendererThree extends WorldRendererCommon {
     setBlockPosition(mesh, pos)
     const helper = new THREE.BoxHelper(mesh, 0xff_ff_00)
     mesh.add(helper)
-    this.scene.add(mesh)
+    this.realScene.add(mesh)
   }
 
   demoItem() {
@@ -675,7 +679,7 @@ export class WorldRendererThree extends WorldRendererCommon {
     // mesh.scale.set(0.5, 0.5, 0.5)
     const helper = new THREE.BoxHelper(mesh, 0xff_ff_00)
     mesh.add(helper)
-    this.scene.add(mesh)
+    this.realScene.add(mesh)
   }
 
   debugOverlayAdded = false
@@ -695,7 +699,9 @@ export class WorldRendererThree extends WorldRendererCommon {
         text += `TE: ${formatBigNumber(this.renderer.info.memory.textures)} `
         text += `F: ${formatBigNumber(this.tilesRendered)} `
         text += `B: ${formatBigNumber(this.blocksRendered)} `
-        text += `MEM: ${this.worldBlockGeometry.getEstimatedMemoryUsage().readable}`
+        text += `MEM: ${this.chunkMeshManager.getEstimatedMemoryUsage().total} `
+        const poolStats = this.chunkMeshManager.getStats()
+        text += `POOL: ${poolStats.activeCount}/${poolStats.poolSize} HR: ${poolStats.hitRate}`
         pane.updateText(text)
         this.backendInfoReport = text
       }
@@ -709,7 +715,8 @@ export class WorldRendererThree extends WorldRendererCommon {
     const [x, y, z] = key.split(',').map(x => Math.floor(+x / 16))
     // sum of distances: x + y + z
     const chunkDistance = Math.abs(x - this.cameraSectionPos.x) + Math.abs(y - this.cameraSectionPos.y) + Math.abs(z - this.cameraSectionPos.z)
-    const section = this.sectionObjects[key].children.find(child => child.name === 'mesh')!
+    const sectionObj = this.sectionObjects[key]
+    const section = (sectionObj as any).mesh ?? sectionObj.children.find(child => child.name === 'mesh')!
     section.renderOrder = 500 - chunkDistance
   }
 
@@ -732,12 +739,15 @@ export class WorldRendererThree extends WorldRendererCommon {
   }
 
   finishChunk(chunkKey: string) {
-    this.worldBlockGeometry.finishChunk(chunkKey)
+    // ChunkMeshManager applies updates immediately, no buffering needed
   }
 
   handleWorkerMessage(data: { geometry: MesherGeometryOutput, key, type }): void {
     if (data.type === 'geometry') {
-      this.worldBlockGeometry.handleWorkerGeometryMessage(data)
+      const chunkCoords = data.key.split(',')
+      if (!this.loadedChunks[chunkCoords[0] + ',' + chunkCoords[2]] || !data.geometry.positions.length || !this.active) return
+      this.chunkMeshManager.updateSection(data.key, data.geometry)
+      this.updatePosDataChunk(data.key)
     }
   }
 
@@ -883,11 +893,11 @@ export class WorldRendererThree extends WorldRendererCommon {
   private debugRaycast(pos: THREE.Vector3, direction: THREE.Vector3, distance: number) {
     // Remove existing debug objects
     if (this.debugRaycastHelper) {
-      this.scene.remove(this.debugRaycastHelper)
+      this.realScene.remove(this.debugRaycastHelper)
       this.debugRaycastHelper = undefined
     }
     if (this.debugHitPoint) {
-      this.scene.remove(this.debugHitPoint)
+      this.realScene.remove(this.debugHitPoint)
       this.debugHitPoint = undefined
     }
 
@@ -907,14 +917,14 @@ export class WorldRendererThree extends WorldRendererCommon {
       distance * 0.1,
       distance * 0.05
     )
-    this.scene.add(this.debugRaycastHelper)
+    this.realScene.add(this.debugRaycastHelper)
 
     // Create hit point indicator
     const hitGeometry = new THREE.SphereGeometry(0.2, 8, 8)
     const hitMaterial = new THREE.MeshBasicMaterial({ color: 0x00_ff_00 })
     this.debugHitPoint = new THREE.Mesh(hitGeometry, hitMaterial)
     this.debugHitPoint.position.copy(scenePos).add(direction.clone().multiplyScalar(distance))
-    this.scene.add(this.debugHitPoint)
+    this.realScene.add(this.debugHitPoint)
   }
 
   prevFramePerspective = null as string | null
@@ -1012,11 +1022,11 @@ export class WorldRendererThree extends WorldRendererCommon {
 
         // remove any debug raycasting
         if (this.debugRaycastHelper) {
-          this.scene.remove(this.debugRaycastHelper)
+          this.realScene.remove(this.debugRaycastHelper)
           this.debugRaycastHelper = undefined
         }
         if (this.debugHitPoint) {
-          this.scene.remove(this.debugHitPoint)
+          this.realScene.remove(this.debugHitPoint)
           this.debugHitPoint = undefined
         }
       }
@@ -1087,9 +1097,8 @@ export class WorldRendererThree extends WorldRendererCommon {
 
     // eslint-disable-next-line @typescript-eslint/non-nullable-type-assertion-style
     const cam = this.cameraGroupVr instanceof THREE.Group ? this.cameraGroupVr.children.find(child => child instanceof THREE.PerspectiveCamera) as THREE.PerspectiveCamera : this.camera
-    // Flush buffered geometry updates atomically before rendering
-    this.worldBlockGeometry.applyPendingUpdates()
-    this.renderer.render(this.scene, cam)
+    // ChunkMeshManager applies updates immediately, no pending updates to flush
+    this.renderer.render(this.realScene, cam)
 
     if (
       this.displayOptions.inWorldRenderingConfig.showHand &&
@@ -1118,6 +1127,9 @@ export class WorldRendererThree extends WorldRendererCommon {
     }
     const end = performance.now()
     const totalTime = end - start
+    if (this.worldRendererConfig.autoLowerRenderDistance) {
+      this.chunkMeshManager.recordRenderTime(totalTime)
+    }
     this.renderTimeAvgCount++
     this.renderTimeAvg = ((this.renderTimeAvg * (this.renderTimeAvgCount - 1)) + totalTime) / this.renderTimeAvgCount
     this.renderTimeMax = Math.max(this.renderTimeMax, totalTime)
@@ -1233,15 +1245,16 @@ export class WorldRendererThree extends WorldRendererCommon {
   resetWorld() {
     super.resetWorld()
 
-    this.worldBlockGeometry.resetWorld()
+    this.chunkMeshManager.dispose()
+    this.chunkMeshManager = new ChunkMeshManager(this, this.scene, this.material, this.worldSizeParams.worldHeight, this.viewDistance)
 
     // Clean up debug objects
     if (this.debugRaycastHelper) {
-      this.scene.remove(this.debugRaycastHelper)
+      this.realScene.remove(this.debugRaycastHelper)
       this.debugRaycastHelper = undefined
     }
     if (this.debugHitPoint) {
-      this.scene.remove(this.debugHitPoint)
+      this.realScene.remove(this.debugHitPoint)
       this.debugHitPoint = undefined
     }
   }
@@ -1286,7 +1299,14 @@ export class WorldRendererThree extends WorldRendererCommon {
     super.removeColumn(x, z)
 
     this.cleanChunkTextures(x, z)
-    this.worldBlockGeometry.removeColumn(x, z)
+    const sectionHeight = this.getSectionHeight()
+    const worldMinY = this.worldMinYRender
+    for (let y = worldMinY; y < this.worldSizeParams.worldHeight; y += sectionHeight) {
+      const key = `${x},${y},${z}`
+      if (this.chunkMeshManager.sectionObjects[key]) {
+        this.chunkMeshManager.releaseSection(key)
+      }
+    }
   }
 
   setSectionDirty(...args: Parameters<WorldRendererCommon['setSectionDirty']>) {
@@ -1309,6 +1329,7 @@ export class WorldRendererThree extends WorldRendererCommon {
   }
 
   destroy(): void {
+    this.chunkMeshManager.dispose()
     this.disposeModules()
     this.fireworksLegacy.destroy()
     super.destroy()