@needle-tools/engine 4.13.1-next.9fc3e64 → 4.14.0-next.31f837e

package/lib/engine-components/RendererLightmap.d.ts

@@ -1,4 +1,4 @@
-import { Material, Texture, Vector4 } from "three";
+import { Texture, Vector4 } from "three";
 import { type Renderer } from "./Renderer.js";
 /**
  * This component is automatically added by the {@link Renderer} component if the object has lightmap uvs AND we have a lightmap.
@@ -12,22 +12,26 @@ export declare class RendererLightmap {
     private lightmapIndex;
     private lightmapScaleOffset;
     private readonly renderer;
-    private readonly clonedMaterials;
+    private _isApplied;
     private get context();
     private get gameObject();
     private lightmapTexture;
-    private lightmapScaleOffsetUniform;
-    private lightmapUniform;
     constructor(renderer: Renderer);
     init(lightmapIndex: number, lightmapScaleOffset: Vector4, lightmapTexture: Texture): void;
-    updateLightmapUniforms(material: Material): void;
+    updateLightmapUniforms(_material: any): void;
     /**
-     * Apply the lightmap to the object. This will clone the material and set the lightmap texture and scale/offset
+     * Apply the lightmap to the object using MaterialPropertyBlock instead of cloning materials.
+     * The lightmap texture and its per-object UV transform are set as overrides via PropertyBlock.
+     * Three.js reads material.lightMap to determine shader defines and upload uniforms,
+     * and uses texture.offset/repeat to compute lightMapTransform in the vertex shader.
      */
     applyLightmap(): void;
+    /** Update the lightMap override on all property blocks (e.g. after LOD swap) */
+    private updatePropertyBlockTexture;
+    /**
+     * Remove the lightmap from the object
+     */
+    onUnset(): void;
     private ensureLightmapUvs;
-    private ensureLightmapMaterial;
-    private assignLightmapTexture;
-    private onBeforeCompile;
     private setLightmapDebugMaterial;
 }

package/lib/engine-components/RendererLightmap.js

@@ -1,9 +1,9 @@
 import { NEEDLE_progressive } from "@needle-tools/gltf-progressive";
-import { Group, Mesh, MeshPhysicalMaterial, ShaderMaterial, Vector4 } from "three";
+import { Group, Mesh, ShaderMaterial, Vector2, Vector4 } from "three";
 import { getParam } from "../engine/engine_utils.js";
+import { MaterialPropertyBlock } from "../engine/engine_materialpropertyblock.js";
 const debug = getParam("debuglightmaps");
-let cloningCounter = 0;
-const $lightmapVersion = Symbol("lightmap-material-version");
+const $lightmapKey = Symbol("lightmapKey");
 /**
  * This component is automatically added by the {@link Renderer} component if the object has lightmap uvs AND we have a lightmap.
  *
@@ -18,10 +18,13 @@ export class RendererLightmap {
         if (tex !== this.lightmapTexture) {
             this.lightmapTexture = tex;
             this.applyLightmap();
+            this.updatePropertyBlockTexture();
             if (this.lightmapTexture) {
                 NEEDLE_progressive.assignTextureLOD(this.lightmapTexture, 0).then(res => {
-                    if (res?.isTexture)
+                    if (res?.isTexture) {
                         this.lightmapTexture = res;
+                        this.updatePropertyBlockTexture();
+                    }
                 });
             }
         }
@@ -29,12 +32,10 @@ export class RendererLightmap {
     lightmapIndex = -1;
     lightmapScaleOffset = new Vector4(1, 1, 0, 0);
     renderer;
-    clonedMaterials = new Array();
+    _isApplied = false;
     get context() { return this.renderer.context; }
     get gameObject() { return this.renderer.gameObject; }
     lightmapTexture = null;
-    lightmapScaleOffsetUniform = { value: new Vector4(1, 1, 0, 0) };
-    lightmapUniform = { value: null };
     constructor(renderer) {
         this.renderer = renderer;
     }
@@ -46,8 +47,10 @@ export class RendererLightmap {
         this.lightmapScaleOffset = lightmapScaleOffset;
         this.lightmapTexture = lightmapTexture;
         NEEDLE_progressive.assignTextureLOD(lightmapTexture, 0).then(res => {
-            if (res?.isTexture)
+            if (res?.isTexture) {
                 this.lightmapTexture = res;
+                this.updatePropertyBlockTexture();
+            }
         });
         if (debug == "show") {
             console.log("Lightmap:", this.gameObject.name, lightmapIndex, "\nScaleOffset:", lightmapScaleOffset, "\nTexture:", lightmapTexture);
@@ -57,17 +60,17 @@ export class RendererLightmap {
             console.log("Use debuglightmaps=show to render lightmaps only in the scene.");
         this.applyLightmap();
     }
-    updateLightmapUniforms(material) {
-        const uniforms = material["uniforms"];
-        if (uniforms && uniforms.lightmap) {
-            this.lightmapScaleOffsetUniform.value = this.lightmapScaleOffset;
-            uniforms.lightmapScaleOffset = this.lightmapScaleOffsetUniform;
-        }
+    updateLightmapUniforms(_material) {
     }
     /**
-     * Apply the lightmap to the object. This will clone the material and set the lightmap texture and scale/offset
+     * Apply the lightmap to the object using MaterialPropertyBlock instead of cloning materials.
+     * The lightmap texture and its per-object UV transform are set as overrides via PropertyBlock.
+     * Three.js reads material.lightMap to determine shader defines and upload uniforms,
+     * and uses texture.offset/repeat to compute lightMapTransform in the vertex shader.
      */
     applyLightmap() {
+        if (this._isApplied)
+            return;
         if (this.gameObject.type === "Object3D") {
             if (debug)
                 console.warn("Can not add lightmap. Is this object missing a renderer?", this.gameObject.name);
@@ -75,22 +78,57 @@ export class RendererLightmap {
         }
         const mesh = this.gameObject;
         this.ensureLightmapUvs(mesh);
+        if (this.lightmapIndex >= 0 && this.lightmapTexture) {
+            this.lightmapTexture.channel = 1;
+            const so = this.lightmapScaleOffset;
+            for (let i = 0; i < this.renderer.sharedMaterials.length; i++) {
+                const mat = this.renderer.sharedMaterials[i];
+                if (!mat)
+                    continue;
+                // If the material doesn't support lightmaps, skip it
+                if (mat["lightMap"] === undefined)
+                    continue;
+                if (debug)
+                    console.log("Setting lightmap on material", mat.name, "for renderer", this.renderer.name);
+                // Use property block to set lightMap with per-object UV transform.
+                // The texture transform differentiates cache keys per object and
+                // PropertyBlock handles save/restore of the shared texture's offset/repeat.
+                const propertyBlock = MaterialPropertyBlock.get(this.gameObject);
+                propertyBlock.setOverride("lightMap", this.lightmapTexture, {
+                    offset: new Vector2(so.z, 1 - so.y - so.w),
+                    repeat: new Vector2(so.x, so.y)
+                });
+                mat[$lightmapKey] = true;
+            }
+            this._isApplied = true;
+        }
+    }
+    /** Update the lightMap override on all property blocks (e.g. after LOD swap) */
+    updatePropertyBlockTexture() {
+        if (!this._isApplied || !this.lightmapTexture)
+            return;
+        this.lightmapTexture.channel = 1;
+        const so = this.lightmapScaleOffset;
+        const propertyBlock = MaterialPropertyBlock.get(this.gameObject);
+        propertyBlock.setOverride("lightMap", this.lightmapTexture, {
+            offset: new Vector2(so.z, 1 - so.y - so.w),
+            repeat: new Vector2(so.x, so.y)
+        });
+    }
+    /**
+     * Remove the lightmap from the object
+     */
+    onUnset() {
         for (let i = 0; i < this.renderer.sharedMaterials.length; i++) {
             const mat = this.renderer.sharedMaterials[i];
-            if (!mat)
-                continue;
-            const newMat = this.ensureLightmapMaterial(mat, i);
-            if (mat !== newMat) {
-                this.renderer.sharedMaterials[i] = newMat;
+            if (mat) {
+                delete mat[$lightmapKey];
             }
         }
-        if (this.lightmapIndex >= 0 && this.lightmapTexture) {
-            // always on channel 1 for now. We could optimize this by passing the correct lightmap index along
-            this.lightmapTexture.channel = 1;
-            for (const mat of this.renderer.sharedMaterials) {
-                if (mat)
-                    this.assignLightmapTexture(mat);
-            }
+        const block = MaterialPropertyBlock.get(this.gameObject);
+        if (block) {
+            block.clearOverride("lightMap");
+            block.clearOverride("lightMapIntensity");
         }
     }
     ensureLightmapUvs(object) {
@@ -105,58 +143,8 @@ export class RendererLightmap {
             }
         }
     }
-    ensureLightmapMaterial(material, index) {
-        if (!material.userData)
-            material.userData = {};
-        // if (material instanceof MeshPhysicalMaterial) {
-        //     return material;
-        // }
-        // check if the material version has changed and only then clone the material
-        if (this.clonedMaterials[index] !== material) {
-            if (debug) {
-                ++cloningCounter;
-                if (cloningCounter++ < 1000) {
-                    console.warn(`Cloning material for lightmap ${this.renderer.name}: '${material.name}'`);
-                }
-                else if (cloningCounter === 1000) {
-                    console.warn(`Further material cloning for lightmaps suppressed to avoid flooding the console.`);
-                }
-            }
-            const mat = material.clone();
-            if (!mat.name?.includes("(lightmap)"))
-                mat.name = material.name + " (lightmap)";
-            material = mat;
-            material.onBeforeCompile = this.onBeforeCompile;
-            this.clonedMaterials[index] = material;
-        }
-        return material;
-    }
-    assignLightmapTexture(material) {
-        if (!material)
-            return;
-        if (material instanceof MeshPhysicalMaterial && material.transmission > 0) {
-            return;
-        }
-        const hasChanged = material.lightMap !== this.lightmapTexture || material[$lightmapVersion] !== material.version;
-        if (!hasChanged) {
-            return;
-        }
-        if (debug)
-            console.log(`Assigning lightmap texture ${this.renderer.name}: '${material.name}' (${material.version} ${material[$lightmapVersion]})`);
-        // assign the lightmap
-        material.lightMap = this.lightmapTexture;
-        material.needsUpdate = true;
-        // store the version of the material
-        material[$lightmapVersion] = material.version;
-    }
-    onBeforeCompile = (shader, _) => {
-        if (debug === "verbose")
-            console.log("Lightmaps, before compile\n", shader);
-        this.lightmapScaleOffsetUniform.value = this.lightmapScaleOffset;
-        this.lightmapUniform.value = this.lightmapTexture;
-        shader.uniforms.lightmapScaleOffset = this.lightmapScaleOffsetUniform;
-    };
     setLightmapDebugMaterial() {
+        const so = this.lightmapScaleOffset;
         // debug lightmaps
         this.gameObject["material"] = new ShaderMaterial({
             vertexShader: `
@@ -170,7 +158,6 @@ export class RendererLightmap {
             fragmentShader: `
                 uniform sampler2D lightMap;
                 uniform float lightMapIntensity;
-                uniform vec4 lightmapScaleOffset;
                 varying vec2 vUv1;
 
                 // took from threejs 05fc79cd52b79e8c3e8dec1e7dca72c5c39983a4
@@ -179,8 +166,8 @@ export class RendererLightmap {
                 }
 
                 void main() {
-                    vec2 lUv = vUv1.xy * lightmapScaleOffset.xy + vec2(lightmapScaleOffset.z, (1. - (lightmapScaleOffset.y + lightmapScaleOffset.w)));
-                    
+                    vec2 lUv = vUv1.xy * vec2(${so.x.toFixed(6)}, ${so.y.toFixed(6)}) + vec2(${so.z.toFixed(6)}, ${(1 - so.y - so.w).toFixed(6)});
+
                     vec4 lightMapTexel = texture2D( lightMap, lUv);
                     gl_FragColor = lightMapTexel;
                     gl_FragColor.a = 1.;

package/lib/engine-components/RendererLightmap.js.map

@@ -1 +1 @@
-{"version":3,"file":"RendererLightmap.js","sourceRoot":"","sources":["../../src/engine-components/RendererLightmap.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"RendererLightmap.js","sourceRoot":"","sources":["../../src/engine-components/RendererLightmap.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@needle-tools/engine",
-  "version": "4.13.1-next.9fc3e64",
+  "version": "4.14.0-next.31f837e",
   "description": "Needle Engine is a web-based runtime for 3D apps. It runs on your machine for development with great integrations into editors like Unity or Blender - and can be deployed onto any device! It is flexible, extensible and networking and XR are built-in.",
   "main": "dist/needle-engine.min.js",
   "exports": {
@@ -111,7 +111,7 @@
     "scroll-timeline-polyfill": "^1.1.0",
     "simplex-noise": "^4.0.1",
     "stats.js": "^0.17.0",
-    "three": "npm:@needle-tools/three@0.169.16",
+    "three": "npm:@needle-tools/three@0.169.17",
     "three-mesh-bvh": "0.9.7",
     "three-mesh-ui": "npm:@needle-tools/three-mesh-ui@^7.1.5-alpha.5",
     "three.quarks": "0.15.6",

package/src/engine/api.ts

@@ -56,6 +56,7 @@ export * from "./engine_networking_peer.js";
 export * from "./engine_networking_streams.js";
 export * from "./engine_networking_types.js";
 export * from "./engine_networking_utils.js";
+export { MaterialPropertyBlock } from "./engine_materialpropertyblock.js"
 export * from "./engine_patcher.js";
 export * from "./engine_physics.js";
 export * from "./engine_physics.types.js";

package/src/engine/engine_lightdata.ts

@@ -1,4 +1,4 @@
-import { ShaderChunk, Texture, UniformsLib, Vector4 } from "three";
+import { ShaderChunk, Texture } from "three";
 
 import { setDisposable } from "./engine_assetdatabase.js";
 import type { Context } from "./engine_setup.js";
@@ -91,9 +91,10 @@ export class LightDataRegistry implements ILightDataRegistry {
 // all the chunks we can patch
 // console.log(ShaderChunk);
 // Unity: ambientOrLightmapUV.xy = v.uv1.xy * unity_LightmapST.xy + unity_LightmapST.zw; ambientOrLightmapUV.zw = 0;
+// Replace standard lightmap sampling with RGBM decode.
+// UV transform (scale/offset) is handled natively by three.js via texture.offset/repeat → lightMapTransform.
 ShaderChunk.lights_fragment_maps = ShaderChunk.lights_fragment_maps.replace("vec4 lightMapTexel = texture2D( lightMap, vLightMapUv );", `
-    vec2 lUv = vLightMapUv.xy * lightmapScaleOffset.xy + vec2(lightmapScaleOffset.z, (1. - (lightmapScaleOffset.y + lightmapScaleOffset.w)));
-    vec4 lightMapTexel = texture2D( lightMap, lUv);
+    vec4 lightMapTexel = texture2D( lightMap, vLightMapUv );
     // The range of RGBM lightmaps goes from 0 to 34.49 (5^2.2) in linear space, and from 0 to 5 in gamma space.
     lightMapTexel.rgb *= lightMapTexel.a * 8.; // no idea where that "8" comes from... heuristically derived
     lightMapTexel.a = 1.;
@@ -104,8 +105,7 @@ ShaderChunk.lightmap_pars_fragment = `
     #ifdef USE_LIGHTMAP
         uniform sampler2D lightMap;
         uniform float lightMapIntensity;
-        uniform vec4 lightmapScaleOffset;
-        
+
         // took from threejs 05fc79cd52b79e8c3e8dec1e7dca72c5c39983a4
         vec4 conv_sRGBToLinear( in vec4 value ) {
             return vec4( mix( pow( value.rgb * 0.9478672986 + vec3( 0.0521327014 ), vec3( 2.4 ) ), value.rgb * 0.0773993808, vec3( lessThanEqual( value.rgb, vec3( 0.04045 ) ) ) ), value.a );
@@ -125,4 +125,6 @@ irradiance += 0.;
 irradiance += getLightProbeIrradiance( lightProbe, geometry.normal );
 #endif`);
 
-UniformsLib.lightmap["lightmapScaleOffset"] = { value: new Vector4(1, 1, 0, 0) };
+// lightmapScaleOffset is no longer needed as a uniform -
+// UV transform is encoded in the lightMap texture's offset/repeat properties
+// and applied natively by three.js via lightMapTransform in the vertex shader.