@needle-tools/engine 4.5.8 → 4.6.0-next.3088402

package/src/engine-components/Skybox.ts

@@ -124,11 +124,17 @@ function registerLoadedTexture(src: string, texture: Promise<Texture>) {
  *    evt.detail.apply(url);
  * });
  * ```
+ * 
+ * @example update skybox url
+ * ```ts
+ * skybox.setSkybox("https://example.com/skybox.hdr");
+ * ```
  */
 export class RemoteSkybox extends Behaviour {
 
     /**
-     * URL to a remote skybox. This value can also use a magic skybox name. Options are "quicklook", "quicklook-ar", "studio", "blurred-skybox".
+     * URL to a remote skybox. This value can also use a magic skybox name. Options are "quicklook", "quicklook-ar", "studio", "blurred-skybox".  
+     * To update the skybox/environment map use `setSkybox(url)`
      * @example
      * ```ts
      * skybox.url = "https://example.com/skybox.hdr";
@@ -197,6 +203,9 @@ export class RemoteSkybox extends Behaviour {
             if (this.isRemoteTexture(this.url)) {
                 this.setSkybox(this.url);
             }
+            else if (debug) {
+                console.warn(`RemoteSkybox: Not setting skybox: ${this.url} is not a remote texture. If you want to set a local texture, set allowNetworking to false.`);
+            }
         }
     }
 
@@ -222,7 +231,7 @@ export class RemoteSkybox extends Behaviour {
         if (debug) console.log("Set remote skybox url: " + url);
 
         if (this._prevUrl === url && this._prevLoadedEnvironment) {
-            this.applySkybox();
+            this.apply();
             return true;
         }
         else {
@@ -231,19 +240,30 @@ export class RemoteSkybox extends Behaviour {
         }
         this._prevUrl = url;
 
-        const envMap = await this.loadTexture(url, name);
-        if (!envMap) return false;
+        const texture = await this.loadTexture(url, name);
+        if (!texture) {
+            if (debug) console.warn("RemoteSkybox: Failed to load texture from url", url);
+            return false;
+        }
         // Check if we're still enabled
-        if (!this.enabled) return false;
+        if (!this.enabled) {
+            if (debug) console.warn("RemoteSkybox: Component is not enabled, aborting setSkybox");
+            return false;
+        }
+        // Check if the url has changed while loading
+        if (this._prevUrl !== url) {
+            if (debug) console.warn("RemoteSkybox: URL changed while loading texture, aborting setSkybox");
+            return false; // URL changed while loading
+        }
         // Update the current url
         this.url = url;
         const nameIndex = url.lastIndexOf("/");
-        envMap.name = url.substring(nameIndex >= 0 ? nameIndex + 1 : 0);
+        texture.name = url.substring(nameIndex >= 0 ? nameIndex + 1 : 0);
         if (this._loader instanceof TextureLoader) {
-            envMap.colorSpace = SRGBColorSpace;
+            texture.colorSpace = SRGBColorSpace;
         }
-        this._prevLoadedEnvironment = envMap;
-        this.applySkybox();
+        this._prevLoadedEnvironment = texture;
+        this.apply();
         return true;
     }
 
@@ -284,7 +304,7 @@ export class RemoteSkybox extends Behaviour {
         return envMap;
     }
 
-    private applySkybox() {
+    private apply() {
         const envMap = this._prevLoadedEnvironment;
         if (!envMap) return;
 

package/src/engine-components/postprocessing/Effects/Tonemapping.ts

@@ -1,5 +1,5 @@
 import type { ToneMappingEffect as _TonemappingEffect, ToneMappingMode } from "postprocessing";
-import { ACESFilmicToneMapping, AgXToneMapping, LinearToneMapping, NeutralToneMapping, NoToneMapping, ReinhardToneMapping } from "three";
+import { ACESFilmicToneMapping, AgXToneMapping, LinearToneMapping, NeutralToneMapping, NoToneMapping, ReinhardToneMapping, WebGLRenderer } from "three";
 
 import { MODULES } from "../../../engine/engine_modules.js";
 import { serializable } from "../../../engine/engine_serialization.js";
@@ -36,6 +36,7 @@ function toThreeToneMapping(mode: NEToneMappingMode | undefined) {
         case NEToneMappingMode.KhronosNeutral:
             return NeutralToneMapping;
         default:
+            if(debug) console.warn("[Postprocessing] Unknown tone mapping mode", mode);
             return NeutralToneMapping;
     }
 }
@@ -84,7 +85,7 @@ export class ToneMappingEffect extends PostProcessingEffect {
     setMode(mode: NEToneMappingModeNames) {
         const enumValue = NEToneMappingMode[mode as NEToneMappingModeNames];
         if (enumValue === undefined) {
-            console.error("Invalid ToneMapping mode", mode);
+            console.error("[PostProcessing] Invalid ToneMapping mode", mode);
             return this;
         }
         this.mode.value = enumValue;
@@ -110,7 +111,7 @@ export class ToneMappingEffect extends PostProcessingEffect {
                 if (other === this) break;
                 // If another tonemapping effect is found, warn the user
                 if (other != this && other instanceof ToneMappingEffect) {
-                    console.warn("Multiple tonemapping effects found in the same postprocessing stack: Please check your scene setup.", { activeEffect: other, ignoredEffect: this });
+                    console.warn("[PostProcessing] Multiple tonemapping effects found in the same postprocessing stack: Please check your scene setup.", { activeEffect: other, ignoredEffect: this });
                     return undefined;
                 }
             }
@@ -119,8 +120,9 @@ export class ToneMappingEffect extends PostProcessingEffect {
 
         // ensure the effect tonemapping value is initialized
         if (this.mode.isInitialized == false) {
-            const init = threeToNeToneMapping(this.context.renderer.toneMapping);
-            this.mode.initialize(init);
+            const mode = threeToNeToneMapping(this.context.renderer.toneMapping);
+            if(debug) console.log("[PostProcessing] Initializing ToneMapping mode to renderer.toneMapping", this.context.renderer.toneMapping + " → " + mode);
+            this.mode.initialize(mode);
         }
 
         const threeMode = toThreeToneMapping(this.mode.value);
@@ -130,9 +132,9 @@ export class ToneMappingEffect extends PostProcessingEffect {
         this.mode.onValueChanged = (newValue) => {
             const threeMode = toThreeToneMapping(newValue);
             tonemapping.mode = threeToneMappingToEffectMode(threeMode);
-            if (debug) console.log("ToneMapping mode changed to", NEToneMappingMode[newValue], threeMode, tonemapping.mode);
+            if (debug) console.log("[PostProcessing] ToneMapping mode changed to", NEToneMappingMode[newValue], threeMode, tonemapping.mode);
         };
-        if (debug) console.log("Use ToneMapping", NEToneMappingMode[this.mode.value], threeMode, tonemapping.mode, "renderer.tonemapping: " + this.context.renderer.toneMapping);
+        if (debug) console.log("[PostProcessing] Use ToneMapping", NEToneMappingMode[this.mode.value], threeMode, tonemapping.mode, "renderer.tonemapping: " + this.context.renderer.toneMapping);
 
 
         this.exposure.onValueChanged = (newValue) => {