minecraft-renderer 0.1.54 → 0.1.56

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/threeJsMedia.ts

@@ -2,6 +2,8 @@
 import * as THREE from 'three'
 import { WorldRendererThree } from './worldRendererThree'
 import { ThreeJsSound } from './threeJsSound'
+import { isWebWorker } from './documentRenderer'
+import { loadThreeJsTextureFromUrlSync } from './threeJsUtils'
 
 type ControlModeConfig = {
   mouseButton: 'both' | 'left' | 'right'
@@ -187,7 +189,11 @@ export class ThreeJsMedia {
 
     let video: HTMLVideoElement | undefined
     let positionalAudio: THREE.PositionalAudio | undefined
-    if (!isImage) {
+    const workerVideoUnsupported = isWebWorker && !isImage
+    if (workerVideoUnsupported) {
+      console.warn(`[addMedia] Video "${id}" skipped in off-thread renderer (no HTMLVideoElement)`)
+    }
+    if (!isImage && !workerVideoUnsupported) {
       video = document.createElement('video')
       video.src = props.src.endsWith('.gif') ? props.src.replace('.gif', '.mp4') : props.src
       video.loop = props.loop ?? true
@@ -268,14 +274,35 @@ export class ThreeJsMedia {
       alphaTest: 0.1
     })
 
-    const texture = video
-      ? new THREE.VideoTexture(video)
-      : new THREE.TextureLoader().load(props.src, () => {
+    let texture: THREE.Texture
+    if (video) {
+      texture = new THREE.VideoTexture(video)
+    } else if (workerVideoUnsupported) {
+      texture = this.createErrorTexture(
+        props.size.width,
+        props.size.height,
+        props.background,
+        'Video unavailable (multi-thread)',
+      )
+    } else if (isWebWorker) {
+      const loaded = loadThreeJsTextureFromUrlSync(props.src)
+      texture = loaded.texture
+      texture.minFilter = THREE.NearestFilter
+      texture.magFilter = THREE.NearestFilter
+      void loaded.promise.then(() => {
+        if (this.customMedia.get(id)?.texture === texture) {
+          material.map = texture
+          material.needsUpdate = true
+        }
+      }).catch(() => handleError())
+    } else {
+      texture = new THREE.TextureLoader().load(props.src, () => {
         if (this.customMedia.get(id)?.texture === texture) {
           material.map = texture
           material.needsUpdate = true
         }
       }, undefined, () => handleError()) // todo cache
+    }
     texture.minFilter = THREE.NearestFilter
     texture.magFilter = THREE.NearestFilter
     // texture.format = THREE.RGBAFormat

package/src/three/threeJsUtils.ts

@@ -69,6 +69,17 @@ export const loadThreeJsTextureFromBitmap = (image: ImageBitmap) => {
   return texture
 }
 
+/** Worker-safe sync handle; image loads via fetch + OffscreenCanvas (not TextureLoader). */
+export function loadNearestFilterTexture (imageUrl: string): THREE.Texture {
+  const { texture, promise } = loadThreeJsTextureFromUrlSync(imageUrl)
+  texture.magFilter = THREE.NearestFilter
+  texture.minFilter = THREE.NearestFilter
+  void promise.catch((err) => {
+    console.error('[texture] failed to load', imageUrl, err)
+  })
+  return texture
+}
+
 export async function loadTexture (texture: string, cb: (texture: THREE.Texture) => void, onLoad?: () => void): Promise<void> {
   const cached = textureCache[texture]
   if (!cached) {

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/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/worldView/worldView.ts

@@ -11,6 +11,7 @@ import { Vec3 } from 'vec3'
 import TypedEmitter from 'typed-emitter'
 import type { WorldViewEvents, ChunkPosKey, WorldSizeParams } from './types'
 import { generateSpiralMatrix } from '../lib/spiral'
+import { sanitizeWorkerEventArgs } from '../lib/workerMessageSanitize'
 
 /**
  * Helper to calculate chunk position from absolute position.
@@ -131,7 +132,7 @@ export class WorldView extends (EventEmitter as new () => TypedEmitter<WorldView
           class: WorldViewWorker.restorerName,
           type: 'event',
           eventName,
-          args,
+          args: sanitizeWorkerEventArgs(args),
         })
       }) as any
     }