minecraft-renderer 0.1.53 → 0.1.55

package/src/three/menuBackground/assetUrl.ts

@@ -0,0 +1,15 @@
+//@ts-nocheck
+export function menuBackgroundAssetUrl (...segments: string[]): string {
+  const relative = segments.filter(s => s.length > 0).join('/')
+  const base =
+    typeof globalThis.location !== 'undefined' && globalThis.location.href
+      ? globalThis.location.href
+      : typeof import.meta !== 'undefined' && import.meta.url
+        ? import.meta.url
+        : `/${relative}`
+  try {
+    return new URL(relative, base).href
+  } catch {
+    return `/${relative}`
+  }
+}

package/src/three/menuBackground/classic.ts

@@ -1,11 +1,12 @@
 //@ts-nocheck
-import { join } from 'path'
 import * as THREE from 'three'
 import { EntityMesh } from '../entity/EntityMesh'
+import { loadImageFromUrl } from '../../lib/utils'
 import type { DocumentRenderer } from '../documentRenderer'
-import { loadThreeJsTextureFromUrl, loadThreeJsTextureFromUrlSync } from '../threeJsUtils'
+import { loadThreeJsTextureFromBitmap } from '../threeJsUtils'
 import type { MenuBackgroundView } from './activeView'
 import { resizeMenuBackgroundCamera } from './activeView'
+import { menuBackgroundAssetUrl } from './assetUrl'
 
 const date = new Date()
 const isChristmas = date.getMonth() === 11 && date.getDate() >= 24 && date.getDate() <= 26
@@ -75,7 +76,9 @@ export class ClassicMenuBackground implements MenuBackgroundView {
 
     for (const file of panoramaFiles) {
       const load = async () => {
-        const { texture } = loadThreeJsTextureFromUrlSync(join('background', isChristmas ? 'christmas' : '', file))
+        const url = menuBackgroundAssetUrl('background', isChristmas ? 'christmas' : '', file)
+        const bitmap = await loadImageFromUrl(url)
+        const texture = loadThreeJsTextureFromBitmap(bitmap)
 
         texture.matrixAutoUpdate = false
         texture.matrix.set(-1, 0, 1, 0, 1, 0, 0, 0, 1)
@@ -96,7 +99,9 @@ export class ClassicMenuBackground implements MenuBackgroundView {
         panorMaterials.push(material)
       }
 
-      void load()
+      void load().catch(err => {
+        console.warn('[ClassicMenuBackground] Failed to load panorama face:', file, err)
+      })
     }
 
     const panoramaBox = new THREE.Mesh(panorGeo, panorMaterials)
@@ -137,7 +142,8 @@ export class ClassicMenuBackground implements MenuBackgroundView {
 
   /** Debug helper: flat cubemap face in front of the camera. */
   async debugImageInFrontOfCamera() {
-    const image = await loadThreeJsTextureFromUrl(join('background', 'panorama_0.webp'))
+    const bitmap = await loadImageFromUrl(menuBackgroundAssetUrl('background', 'panorama_0.webp'))
+    const image = loadThreeJsTextureFromBitmap(bitmap)
     const mesh = new THREE.Mesh(
       new THREE.PlaneGeometry(1000, 1000),
       new THREE.MeshBasicMaterial({ map: image })

package/src/three/menuBackground/futuristic.ts

@@ -632,6 +632,9 @@ export class FuturisticMenuBackground implements MenuBackgroundView {
     const resourcesManager = this.resourcesManager ?? new ResourcesManager()
     const needsAssetUpdate = !resourcesManager.currentResources?.blocksAtlasImage
     if (needsAssetUpdate) {
+      if (typeof document === 'undefined') {
+        throw new Error('Menu atlas missing in worker; pass resourcesManager from main thread')
+      }
       resourcesManager.currentConfig = {
         ...resourcesManager.currentConfig,
         version: MENU_BACKGROUND_MC_VERSION,

package/src/three/threeWorker.ts

@@ -1,30 +1,31 @@
 //@ts-nocheck
-// Three.js Worker Entry Point
-// This worker handles three.js rendering in an offscreen canvas
+import { augmentWorkerMcData } from '../lib/buildWorkerMcDataIndexes'
 
 globalThis.structuredClone ??= (value) => JSON.parse(JSON.stringify(value))
 
-// Handle mcData messages - needed for esbuild plugin to access globalThis.mcData
-// Use addEventListener to coexist with worker proxy's message handler
+const applyWorkerMcData = (raw: Record<string, unknown>) => {
+  augmentWorkerMcData(raw)
+  const globalVar: any = globalThis
+  globalVar.mcData = raw
+  globalVar.loadedData = raw
+  // eslint-disable-next-line no-restricted-globals
+  self.postMessage({ type: 'mcDataApplied' })
+}
+
 // eslint-disable-next-line no-restricted-globals
 self.addEventListener('message', (event: MessageEvent) => {
   const data = event.data
-  const globalVar: any = globalThis
-
   if (data.type === 'mcData') {
-    globalVar.mcData = data.mcData
-    globalVar.loadedData = data.mcData
+    applyWorkerMcData(data.mcData)
     console.log('data loaded')
     return
   }
 
-  // Handle array of messages (batch mode)
   if (Array.isArray(data)) {
     // eslint-disable-next-line unicorn/no-array-for-each
     data.forEach((msg) => {
       if (msg.type === 'mcData') {
-        globalVar.mcData = msg.mcData
-        globalVar.loadedData = msg.mcData
+        applyWorkerMcData(msg.mcData)
       }
     })
   }

package/src/three/worldGeometryExport.ts

@@ -123,7 +123,9 @@ function shaderMaterialForExport(legacyMaterial: THREE.Material): THREE.ShaderMa
   if (!atlas) return null
   const shaderMat = createCubeBlockMaterial()
   shaderMat.uniforms.u_atlas.value = atlas
-  const { tintPalette } = getShaderCubeResources()
+  const resources = getShaderCubeResources()
+  if (!resources) return null
+  const { tintPalette } = resources
   if (!tintPalette.isReady()) tintPalette.createTexture()
   shaderMat.uniforms.u_tintPalette.value = tintPalette.getTexture()
   return shaderMat

package/src/three/worldRendererThree.ts

@@ -1510,6 +1510,13 @@ export class WorldRendererThree extends WorldRendererCommon {
     this.chunkMeshManager.onChunkRemovedFromGate(`${x},${z}`)
   }
 
+  updateViewerPosition(pos: Vec3) {
+    super.updateViewerPosition(pos)
+    if (this.chunkMeshManager.pendingNearReveal.size > 0) {
+      this.chunkMeshManager.tryRevealPending()
+    }
+  }
+
   protected onViewerChunkPositionChanged(): void {
     this.chunkMeshManager.tryRevealPending()
   }

package/src/wasm-mesher/bridge/shaderCubeBridge.ts

@@ -81,6 +81,7 @@ export interface ShaderCubeModelInput {
 
 let tintPalette: TintPalette | null = null
 let textureIndexMapping: TextureIndexMapping | null = null
+let tintsMissingWarned = false
 
 /** Convert mc-assets texture scales (normalized or negative) to pixel tile size for index lookup. */
 function normalizeTextureEntryForTileIndex(
@@ -122,10 +123,14 @@ export function resolveFaceTileIndex(
 }
 
 /** Main thread + worker: use `loadedData` set by the app / mesher (see mesherWasm). */
-function getTintsJson(): Record<string, any> {
+function getTintsJson(): Record<string, any> | null {
   const tints = (globalThis as any).loadedData?.tints
   if (!tints) {
-    throw new Error('shaderCubeBridge: globalThis.loadedData.tints is not available yet')
+    if (!tintsMissingWarned) {
+      tintsMissingWarned = true
+      console.warn('[shaderCubeBridge] loadedData.tints missing; shader cubes use legacy path')
+    }
+    return null
   }
   return tints
 }
@@ -133,9 +138,13 @@ function getTintsJson(): Record<string, any> {
 export function getShaderCubeResources(): {
   tintPalette: TintPalette
   textureIndexMapping: TextureIndexMapping
-} {
+} | null {
+  const tintsData = getTintsJson()
+  if (!tintsData) {
+    return null
+  }
   if (!tintPalette) {
-    tintPalette = TintPalette.fromTintsData(getTintsJson())
+    tintPalette = TintPalette.fromTintsData(tintsData)
     tintPalette.createTexture()
   }
   if (!textureIndexMapping) {
@@ -155,6 +164,7 @@ export function getShaderCubeResources(): {
 export function resetShaderCubeResources(): void {
   tintPalette = null
   textureIndexMapping = null
+  tintsMissingWarned = false
 }
 
 /**

package/src/wasm-mesher/tests/shaderCubeInstances.test.ts

@@ -358,3 +358,12 @@ test('GlobalBlockBuffer: free-list reuses slot with EMPTY sentinel', () => {
   buffer.dispose()
   mat.dispose()
 })
+
+test('getShaderCubeResources: returns null without loadedData.tints (no throw)', () => {
+  const prev = (globalThis as any).loadedData
+  ;(globalThis as any).loadedData = {}
+  resetShaderCubeResources()
+  expect(getShaderCubeResources()).toBeNull()
+  ;(globalThis as any).loadedData = prev
+  resetShaderCubeResources()
+})