minecraft-renderer 0.1.55 → 0.1.57

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/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
     }