@needle-tools/engine 3.2.10-alpha → 3.2.12-alpha

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@needle-tools/engine",
-    "version": "3.2.10-alpha",
+    "version": "3.2.12-alpha",
     "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.umd.cjs",
     "type": "module",

package/src/engine/engine_context.ts

@@ -34,6 +34,7 @@ const debug = utils.getParam("debugSetup");
 const stats = utils.getParam("stats");
 const debugActive = utils.getParam("debugactive");
 const debugframerate = utils.getParam("debugframerate");
+const debugCoroutine = utils.getParam("debugcoroutine");
 
 // this is where functions that setup unity scenes will be pushed into
 // those will be accessed from our custom html element to load them into their context
@@ -859,6 +860,7 @@ export class Context implements IContext {
 					// TODO we might want to keep coroutines playing even if the component is disabled or inactive
 					const remove = !evt.comp || evt.comp.destroyed || !evt.main || evt.comp["enabled"] === false;
 					if (remove) {
+						if (debugCoroutine) console.log("Removing coroutine", evt.comp, evt.comp["enabled"])
 						evts.splice(i, 1);
 						--i;
 						continue;

package/src/engine/engine_mainloop_utils.ts

@@ -150,7 +150,7 @@ export function processNewScripts(context: IContext) {
 
 export function processRemoveFromScene(script: IComponent) {
     if (!script) return;
-    script.__internalDisable();
+    script.__internalDisable(true);
     removeScriptFromContext(script, script.context);
 }
 
@@ -167,11 +167,14 @@ export function processStart(context: IContext, object?: Object3D) {
             // keep them in queue until script has started
             // call awake if the script was inactive before
             utils.safeInvoke(script.__internalAwake.bind(script));
-            utils.safeInvoke(script.__internalEnable.bind(script));
-            // now call start
-            utils.safeInvoke(script.__internalStart.bind(script));
-            context.new_script_start.splice(i, 1);
-            i--;
+            if(script.enabled)
+            {
+                utils.safeInvoke(script.__internalEnable.bind(script));
+                // now call start
+                utils.safeInvoke(script.__internalStart.bind(script));
+                context.new_script_start.splice(i, 1);
+                i--;
+            }
         }
         catch (err) {
             console.error(err);
@@ -274,7 +277,7 @@ function updateIsActiveInHierarchyRecursiveRuntime(go: Object3D, activeInHierarc
                     }
                 }
                 else {
-                    if (comp["__didAwake"]) {
+                    if (comp["__didAwake"] && comp.enabled) {
                         comp["__didEnable"] = false;
                         comp.onDisable();
                     }

package/src/engine/engine_types.ts

@@ -123,9 +123,9 @@ export interface IComponent {
     /** @internal */
     __internalStart();
     /** @internal */
-    __internalEnable();
+    __internalEnable(isAddingOrRemovingFromScene?: boolean);
     /** @internal */
-    __internalDisable();
+    __internalDisable(isAddingOrRemovingFromScene?: boolean);
     /** @internal */
     __internalDestroy();
     /** @internal */

package/src/engine/extensions/NEEDLE_lighting_settings.ts

@@ -75,7 +75,7 @@ export class NEEDLE_lighting_settings implements GLTFLoaderPlugin {
 ContextRegistry.registerCallback(ContextEvent.ContextCreated, e => {
     const ctx = e.context as Context;
     const lightingSettings = GameObject.findObjectOfType(SceneLightSettings, ctx as Context);
-    if (lightingSettings?.sourceId) ctx.sceneLighting.enable(lightingSettings.sourceId);
+    if (lightingSettings?.sourceId) lightingSettings.enabled = true;
 })
 
 // exists once per gltf scene root (if it contains reflection)
@@ -130,7 +130,7 @@ export class SceneLightSettings extends Behaviour {
     }
 
     onEnable(): void {
-        if (debug) console.warn("💡🟡 >>> Enable lighting", this.sourceId, this);
+        if (debug) console.warn("💡🟡 >>> Enable lighting", this.sourceId, this.enabled, this);
 
         if (this.ambientMode == AmbientMode.Flat) {
             if (this.ambientLight && !this._ambientLightObj) {

package/src/engine-components/Component.ts

@@ -470,7 +470,7 @@ export class Component implements IComponent, EventTarget {
 
 
     /** @internal */
-    __internalEnable(): boolean {
+    __internalEnable(isAddingToScene?: boolean): boolean {
         if (this.__destroyed) {
             if (isDevEnvironment()) {
                 console.warn("[Needle Engine Dev] Trying to enable destroyed component");
@@ -481,7 +481,10 @@ export class Component implements IComponent, EventTarget {
         // But a user can change enable during awake
         if (!this.__didAwake) return false;
         if (this.__didEnable) {
-            this.__isEnabled = true;
+            // We dont want to change the enable state if we are adding to scene
+            // But we want to change the state when e.g. a user changes the enable state during awake
+            if (isAddingToScene !== true)
+                this.__isEnabled = true;
             return false;
         }
         // console.trace("INTERNAL ENABLE");
@@ -492,12 +495,14 @@ export class Component implements IComponent, EventTarget {
     }
 
     /** @internal */
-    __internalDisable() {
+    __internalDisable(isRemovingFromScene?: boolean) {
         // Don't change enable before awake
         // But a user can change enable during awake
         if (!this.__didAwake) return;
         if (!this.__didEnable) {
-            this.__isEnabled = false;
+            // We dont want to change the enable state if we are removing from a scene
+            if (isRemovingFromScene !== true)
+                this.__isEnabled = false;
             return;
         }
         this.__didEnable = false;