@needle-tools/engine 4.3.0-alpha.4 → 4.3.0-alpha.6

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

@@ -75,6 +75,10 @@ export abstract class PostProcessingEffect extends Component implements IEffectP
 
     abstract get typeName(): string;
 
+    /** 
+     * Whether the effect is active or not. Prefer using `enabled` instead.
+     * @deprecated
+     */
     @serializable()
     active: boolean = true;
 
@@ -82,14 +86,16 @@ export abstract class PostProcessingEffect extends Component implements IEffectP
 
     onEnable(): void {
         super.onEnable();
-        this.onEffectEnabled();
+        if (debug) console.warn("onEnable effect", this, this.__internalDidAwakeAndStart)
         // Dont override the serialized value by enabling (we could also just disable this component / map enabled to active)
         if (this.__internalDidAwakeAndStart)
             this.active = true;
+        this.onEffectEnabled();
     }
 
     onDisable(): void {
         super.onDisable();
+        if (debug) console.warn("onDisable effect", this)
         this._manager?.removeEffect(this);
         this.active = false;
     }

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

@@ -219,12 +219,12 @@ export class PostProcessingHandler {
                     if (ef instanceof MODULES.POSTPROCESSING.MODULE.Effect)
                         effects.push(ef as Effect);
                     else if (ef instanceof MODULES.POSTPROCESSING.MODULE.Pass) {
-                        const pass = new MODULES.POSTPROCESSING.MODULE.EffectPass(cam, ...effects);
-                        pass.mainScene = scene;
-                        pass.name = effects.map(e => e.constructor.name).join(", ");
-                        pass.enabled = true;
+                        // const pass = new MODULES.POSTPROCESSING.MODULE.EffectPass(cam, ...effects);
+                        // pass.mainScene = scene;
+                        // pass.name = effects.map(e => e.constructor.name).join(", ");
+                        // pass.enabled = true;
                         // composer.addPass(pass);
-                        effects.length = 0;
+                        // effects.length = 0;
                         composer.addPass(ef as Pass);
                     }
                     else {
@@ -262,7 +262,7 @@ export class PostProcessingHandler {
         }
 
         if (debug)
-            console.log("PostProcessing Passes", effectsOrPasses, "->", composer.passes);
+            console.log("[PostProcessing] Passes →", composer.passes);
     }
 
     private orderEffects() {

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

@@ -62,11 +62,11 @@ export class Volume extends Behaviour implements IEditorModificationReceiver, IP
      * Add a post processing effect to the stack and schedules the effect stack to be re-created.  
      */
     addEffect<T extends PostProcessingEffect | Effect>(effect: T): T {
-
         let entry = effect as PostProcessingEffect;
         if (!(entry instanceof PostProcessingEffect)) {
             entry = new EffectWrapper(entry);
         }
+        if(entry.gameObject === undefined) this.gameObject.addComponent(entry);
         if (this._effects.includes(entry)) return effect;
         this._effects.push(entry);
         this._isDirty = true;
@@ -125,7 +125,7 @@ export class Volume extends Behaviour implements IEditorModificationReceiver, IP
         }
 
         // ensure the profile is initialized
-        this.sharedProfile?.init();
+        this.sharedProfile?.__init(this);
     }
 
     onEnable(): void {
@@ -190,7 +190,7 @@ export class Volume extends Behaviour implements IEditorModificationReceiver, IP
     private _isDirty: boolean = false;
 
     private apply() {
-        if (debug) console.log("Apply PostProcessing " + this.name);
+        if (debug) console.log(`Apply PostProcessing "${this.name}"`);
 
         if (isDevEnvironment()) {
             if (this._lastApplyTime !== undefined && Date.now() - this._lastApplyTime < 100) {
@@ -209,18 +209,16 @@ export class Volume extends Behaviour implements IEditorModificationReceiver, IP
         if (this.sharedProfile?.components) {
             const comps = this.sharedProfile.components;
             for (const effect of comps) {
-                if (effect.active && !this._activeEffects.includes(effect))
+                if (effect.active && effect.enabled && !this._activeEffects.includes(effect))
                     this._activeEffects.push(effect);
             }
         }
         // add effects registered via code
         for (const effect of this._effects) {
-            if (effect.active && !this._activeEffects.includes(effect))
+            if (effect.active && effect.enabled && !this._activeEffects.includes(effect))
                 this._activeEffects.push(effect);
         }
 
-        if (debug) console.log("Apply PostProcessing", this._activeEffects);
-
         if (this._activeEffects.length > 0) {
             if (!this._postprocessing)
                 this._postprocessing = new PostProcessingHandler(this.context);

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

@@ -1,6 +1,8 @@
 import { serializeable } from "../../engine/engine_serialization_decorator.js";
 import { getParam } from "../../engine/engine_utils.js";
+import { Component } from "../Component.js";
 import { PostProcessingEffect } from "./PostProcessingEffect.js";
+import type { Volume } from "./Volume.js";
 
 const debug = getParam("debugpost");
 
@@ -38,8 +40,14 @@ export class VolumeProfile {
      * call init on all components 
      * @hidden
      **/
-    init() {
-        this.components?.forEach(c => c.init());
+    __init(owner: Component) {
+        this.components?.forEach(c => {
+            // Make sure all components are added to the gameobject (this is not the case when e.g. effects are serialized from Unity)
+            if (c.gameObject === undefined) {
+                owner.gameObject.addComponent(c);
+            }
+            c.init()
+        });
     }
 
     addEffect(effect: PostProcessingEffect) {