@needle-tools/engine 3.2.5-alpha → 3.2.6-alpha

package/src/engine-components/SceneSwitcher.ts

@@ -1,5 +1,4 @@
 import { AssetReference } from "../engine/engine_addressables";
-import { NeedleEngineHTMLElement } from "../engine/engine_element";
 import { InputEvents } from "../engine/engine_input";
 import { isLocalNetwork } from "../engine/engine_networking_utils";
 import { ContextEvent, ContextRegistry } from "../engine/engine_context_registry";
@@ -11,9 +10,14 @@ const debug = getParam("debugsceneswitcher");
 
 const ENGINE_ELEMENT_SCENE_ATTRIBUTE_NAME = "scene";
 
-ContextRegistry.registerCallback(ContextEvent.ContextRegistered, _ => {
-    if (!NeedleEngineHTMLElement.observedAttributes.includes(ENGINE_ELEMENT_SCENE_ATTRIBUTE_NAME))
-        NeedleEngineHTMLElement.observedAttributes.push(ENGINE_ELEMENT_SCENE_ATTRIBUTE_NAME);
+ContextRegistry.registerCallback(ContextEvent.ContextRegistered, async _ => {
+    // We need to defer import to not get issues with circular dependencies
+    import("../engine/engine_element").then(res => {
+        const webcomponent = res.NeedleEngineHTMLElement;
+        if(debug) console.log("SceneSwitcher: registering scene attribute", webcomponent.observedAttributes);
+        if (!webcomponent.observedAttributes.includes(ENGINE_ELEMENT_SCENE_ATTRIBUTE_NAME))
+            webcomponent.observedAttributes.push(ENGINE_ELEMENT_SCENE_ATTRIBUTE_NAME);
+    });
 });
 
 const couldNotLoadScenePromise = Promise.resolve(false);
@@ -42,6 +46,10 @@ export class SceneSwitcher extends Behaviour {
     @serializable()
     useSwipe: boolean = true;
 
+    /** when enabled will automatically apply the environment scene lights */
+    @serializable()
+    useSceneLighting: boolean = true;
+
 
     private _currentIndex: number = -1;
     private _currentScene: AssetReference | undefined = undefined;
@@ -191,6 +199,8 @@ export class SceneSwitcher extends Behaviour {
             }
             if (this._currentIndex === index) {
                 GameObject.add(scene.asset, this.gameObject);
+                if (this.useSceneLighting)
+                    this.context.sceneLighting.enable(scene)
                 // save the loaded scene as an url parameter
                 if (this.queryParameterName?.length)
                     setParamWithoutReload(this.queryParameterName, index.toString(), this.useHistory);

package/src/engine-components/api.ts

@@ -4,6 +4,7 @@ export * from "./codegen/components";
 // We dont want to export everything in the extensions
 export * from "./js-extensions/RGBAColor";
 export * from "./js-extensions/Object3D";
+export * from "./XRFlag"
 
 export * from "./export"
 export * from "./postprocessing"

package/src/engine-components/postprocessing/PostProcessingHandler.ts

@@ -5,7 +5,7 @@ import { BloomEffect, BrightnessContrastEffect, ChromaticAberrationEffect, Depth
 import { showBalloonWarning } from "../../engine/debug/debug";
 import { Camera } from "../Camera";
 import { PostProcessingEffect } from "./PostProcessingEffect";
-import { Constructor } from "../../engine/engine_serialization_core";
+import { Constructor } from "../../engine/engine_types";
 
 const debug = getParam("debugpost");
 

package/src/engine-components/postprocessing/VolumeParameter.ts

@@ -17,7 +17,7 @@ export class VolumeParameter {
     set overrideState(val: boolean) {
         if (this._active === val) return;
         this._active = val;
-        const value = val ? this._lastActiveSetValue : this._defaultValue;
+        const value = val ? this._valueRaw : this._defaultValue;
         this.processValue(value, true);
     }
     private _active: boolean = true;
@@ -26,13 +26,13 @@ export class VolumeParameter {
 
     @serializable()
     get value() {
-        return this._value;
+        return this._valueRaw;
     }
     set value(val: any) {
         this.processValue(val, false);
     }
     private _value: any;
-    private _lastActiveSetValue?: any;
+    private _valueRaw?: any;
 
 
     set defaultValue(val: any) {
@@ -43,7 +43,7 @@ export class VolumeParameter {
 
     /** enforce the value to be set and onValueChanged to be called if assigned */
     __init() {
-        this.processValue(this._lastActiveSetValue, true);
+        this.processValue(this._valueRaw, true);
     }
 
     /** called to modify a changing value before it is saved */
@@ -65,9 +65,10 @@ export class VolumeParameter {
             // with the value that is expected to received when the parameter is disabled)
             this._value = this._defaultValue;
             val = this._defaultValue;
+            this._valueRaw = val;
         }
         else {
-            this._lastActiveSetValue = val;
+            this._valueRaw = val;
             if (this._active && this.valueProcessor)
                 val = this.valueProcessor(val);
             this._value = val;
@@ -80,7 +81,7 @@ export class VolumeParameter {
 
     private testIfValueChanged(newValue: any): boolean {
 
-        if (this._lastActiveSetValue === newValue)
+        if (this._valueRaw === newValue)
             return false;
 
         // TODO: may need checks for colors or vectors (check by xyz,rgb because they might come in as anonymous objects via editor modifications)

package/src/engine-components/webxr/index.ts

@@ -1,2 +1,4 @@
 export * from "./WebXR";
-export * from "./WebXRPlaneTracking";
+export * from "./WebXRPlaneTracking";
+export * from "./WebXRImageTracking";
+export * from "./WebXRController";

package/lib/engine/engine_rendererdata.d.ts

@@ -1,49 +0,0 @@
-import { Vector4, Texture, LightProbe } from "three";
-import { Context } from "./engine_setup";
-import { SceneLightSettings } from "./extensions/NEEDLE_lighting_settings";
-import { SourceIdentifier } from "./engine_types";
-export declare type SphericalHarmonicsData = {
-    array: number[];
-    texture: THREE.WebGLCubeRenderTarget | THREE.Texture;
-    lightProbe?: LightProbe;
-};
-export declare enum AmbientMode {
-    Skybox = 0,
-    Trilight = 1,
-    Flat = 3,
-    Custom = 4
-}
-export declare enum DefaultReflectionMode {
-    Skybox = 0,
-    Custom = 1
-}
-export declare class RendererData {
-    private context;
-    constructor(context: Context);
-    private _currentReflectionId?;
-    private sceneLightSettings?;
-    private preUpdate;
-    private _timevec4;
-    get timeVec4(): Vector4;
-    get environmentIntensity(): number;
-    registerSceneLightSettings(sceneLightSettings: SceneLightSettings): void;
-    registerReflection(sourceId: SourceIdentifier, reflectionTexture: Texture): void;
-    getReflection(sourceId: SourceIdentifier): LightData | null | undefined;
-    enableReflection(sourceId: SourceIdentifier): void;
-    disableReflection(sourceId?: SourceIdentifier): void;
-    getSceneLightingData(sourceId: SourceIdentifier): Promise<SphericalHarmonicsData>;
-    private _waitPromise?;
-    private _lighting;
-}
-export declare class LightData {
-    get Source(): Texture;
-    get Array(): number[] | undefined;
-    private _context;
-    private _source;
-    private _sphericalHarmonics;
-    private _sphericalHarmonicsArray?;
-    private _ambientScale;
-    private _lightProbe?;
-    constructor(context: Context, tex: THREE.Texture, ambientScale?: number);
-    getSphericalHarmonicsArray(intensityFactor?: number): SphericalHarmonicsData | null;
-}

package/lib/engine/engine_rendererdata.js.map

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