Needle Engine 3.2.7-alpha

Files changed (4) hide show

src/engine/codegen/register_types.js +2 -2
src/engine-components/Component.ts +13 -0
src/engine/engine_physics.ts +20 -1
src/engine/extensions/NEEDLE_lighting_settings.ts +15 -3

src/engine/codegen/register_types.js CHANGED Viewed

@@ -1,5 +1,5 @@
 import { TypeStore } from "./../engine_typestore"
 // Import types
 import { __Ignore } from "../../engine-components/codegen/components";
 import { AlignmentConstraint } from "../../engine-components/AlignmentConstraint";
@@ -187,7 +187,7 @@
 import { XRGrabRendering } from "../../engine-components/webxr/WebXRGrabRendering";
 import { XRRig } from "../../engine-components/webxr/WebXRRig";
 import { XRState } from "../../engine-components/XRFlag";
 // Register types
 TypeStore.add("__Ignore", __Ignore);
 TypeStore.add("AlignmentConstraint", AlignmentConstraint);

src/engine-components/Component.ts CHANGED Viewed

@@ -9,6 +9,7 @@
 import { findByGuid, destroy, InstantiateOptions, instantiate, HideFlags, foreachComponent, markAsInstancedRendered, isActiveInHierarchy, isActiveSelf, isUsingInstancing, setActive, isDestroyed } from "../engine/engine_gameobject";
 import { Euler, Object3D, Quaternion, Scene, Vector3 } from "three";
+import { showBalloonWarning, isDevEnvironment } from "../engine/debug";
 // export interface ISerializationCallbackReceiver {
 //     onBeforeSerialize?(): object | void;
@@ -470,6 +471,12 @@
     /** @internal */
     __internalEnable(): boolean {
+        if (this.__destroyed) {
+            if (isDevEnvironment()) {
+                console.warn("[Needle Engine Dev] Trying to enable destroyed component");
+            }
+            return false;
+        }
         // Don't change enable before awake
         // But a user can change enable during awake
         if (!this.__didAwake) return false;
@@ -511,6 +518,12 @@
         return typeof this.__isEnabled === "boolean" ? this.__isEnabled : true; // if it has no enabled field it is always enabled
     }
     set enabled(val: boolean) {
+        if (this.__destroyed) {
+            if (isDevEnvironment()) {
+                console.warn(`[Needle Engine Dev] Trying to ${val ? "enable" : "disable"} destroyed component`);
+            }
+            return;
+        }
         // when called from animationclip we receive numbers
         // due to interpolation they can be anything between 0 and 1
         if (typeof val === "number") {

src/engine/engine_physics.ts CHANGED Viewed

@@ -1082,7 +1082,7 @@
         // if one is a trigger we dont get collisions but want to raise the trigger events
         if (self.isTrigger || other.isTrigger) {
             foreachComponent(self.gameObject, (c: IComponent) => {
-                if (c.onTriggerEnter) {
+                if (c.onTriggerEnter && !c.destroyed) {
                     c.onTriggerEnter(other);
                 }
                 this.activeTriggers.push({ collider: self, component: c, otherCollider: other });
@@ -1093,6 +1093,7 @@
             // TODO: we dont respect the flip value here!
             this.world.contactPair(selfBody, otherBody, (manifold, _flipped) => {
                 foreachComponent(object, (c: IComponent) => {
+                    if(c.destroyed) return;
                     const hasDeclaredEventMethod = c.onCollisionEnter || c.onCollisionStay || c.onCollisionExit;
                     if (hasDeclaredEventMethod || debugCollisions) {
                         if (!collision) {
@@ -1137,6 +1138,7 @@
     private onHandleCollisionStay() {
         for (const active of this.activeCollisionsStay) {
             const c = active.component;
+            if(c.destroyed) continue;
             if (c.activeAndEnabled && c.onCollisionStay) {
                 const arg = active.collision;
                 c.onCollisionStay(arg);
@@ -1144,6 +1146,7 @@
         }
         for (const active of this.activeTriggers) {
             const c = active.component;
+            if(c.destroyed) continue;
             if (c.activeAndEnabled && c.onTriggerStay) {
                 const arg = active.otherCollider;
                 c.onTriggerStay(arg);
@@ -1152,9 +1155,15 @@
     }
     private onCollisionEnded(self: ICollider, other: ICollider) {
+        if(self.destroyed || other.destroyed) return;
         for (let i = 0; i < this.activeCollisions.length; i++) {
             const active = this.activeCollisions[i];
             const collider = active.collider;
+            if(collider.destroyed) {
+                this.activeCollisions.splice(i, 1);
+                i--;
+                continue;
+            }
             if (collider === self && active.collision.collider === other) {
                 const c = active.component;
                 this.activeCollisions.splice(i, 1);
@@ -1168,6 +1177,11 @@
         for (let i = 0; i < this.activeCollisionsStay.length; i++) {
             const active = this.activeCollisionsStay[i];
             const collider = active.collider;
+            if(collider.destroyed) {
+                this.activeCollisionsStay.splice(i, 1);
+                i--;
+                continue;
+            }
             if (collider === self && active.collision.collider === other) {
                 const c = active.component;
                 this.activeCollisionsStay.splice(i, 1);
@@ -1181,6 +1195,11 @@
         for (let i = 0; i < this.activeTriggers.length; i++) {
             const active = this.activeTriggers[i];
             const collider = active.collider;
+            if(collider.destroyed) {
+                this.activeTriggers.splice(i, 1);
+                i--;
+                continue;
+            }
             if (collider === self && active.otherCollider === other) {
                 const c = active.component;
                 this.activeTriggers.splice(i, 1);

src/engine/extensions/NEEDLE_lighting_settings.ts CHANGED Viewed

@@ -8,6 +8,7 @@
 import { Context } from "../engine_setup";
 import { LightProbe } from "three";
 import { ContextEvent, ContextRegistry } from "../engine_context_registry";
+import { Mathf } from "../engine_math";
 export const EXTENSION_NAME = "NEEDLE_lighting_settings";
 const debug = getParam("debugenvlight");
@@ -122,13 +123,22 @@
         this.context.sceneLighting.internalUnregisterSceneLightSettings(this);
     }
+    private calculateIntensityFactor(col:Color){
+        const intensity = Math.max(col.r, col.g, col.b);// * 0.2126 + col.g * 0.7152 + col.b * 0.0722;
+        const factor = 2.2 * Mathf.lerp(0, 1.33, intensity); // scale based on intensity
+        return factor;
+    }
     onEnable(): void {
         if (debug) console.warn("💡🟡 >>> Enable lighting", this.sourceId, this);
         if (this.ambientMode == AmbientMode.Flat) {
             if (this.ambientLight && !this._ambientLightObj) {
-                this._ambientLightObj = new AmbientLight(this.ambientLight, this.ambientIntensity);
-                if (debug) console.log("Created ambient light", this.sourceId, this._ambientLightObj)
+                // TODO: currently ambient intensity is always exported as 1? The exported values are not correct in threejs
+                // the following calculation is a workaround to get the correct intensity
+                const factor = this.calculateIntensityFactor(this.ambientLight);
+                this._ambientLightObj = new AmbientLight(this.ambientLight, this.ambientIntensity * factor);
+                if (debug) console.log("Created ambient light", this.sourceId, this._ambientLightObj, this.ambientIntensity, factor)
             }
             if (this._ambientLightObj) {
                 this.gameObject.add(this._ambientLightObj)
@@ -139,8 +149,10 @@
             if (this.ambientTrilight) {
                 const ground = this.ambientTrilight[0];
                 const sky = this.ambientTrilight[this.ambientTrilight.length - 1];
-                this._hemisphereLightObj = new HemisphereLight(sky, ground, this.ambientIntensity);
+                const factor = this.calculateIntensityFactor(sky);
+                this._hemisphereLightObj = new HemisphereLight(sky, ground, this.ambientIntensity * factor);
                 this.gameObject.add(this._hemisphereLightObj)
+                if (debug) console.log("Created hemisphere ambient light", this.sourceId, this._hemisphereLightObj, this.ambientIntensity, factor)
             }
         }
         else {