Needle Engine 3.6.2

Files changed (5) hide show

src/engine-components/AnimationUtils.ts +2 -2
src/engine-components/ui/Graphic.ts +3 -1
src/engine-components/ParticleSystem.ts +14 -3
src/engine-components/ParticleSystemModules.ts +6 -8
src/engine-components/ui/RectTransform.ts +3 -7

src/engine-components/AnimationUtils.ts CHANGED Viewed

@@ -1,6 +1,6 @@
 import { GLTF } from "three/examples/jsm/loaders/GLTFLoader.js";
-import { ContextEvent, ContextRegistry } from "../engine/engine_context_registry.js";
-import { findAnimations } from "../engine/engine_scenetools.js";
+import { ContextEvent, ContextRegistry } from "../engine/engine_context_registry";
+import { findAnimations } from "../engine/engine_scenetools";
 ContextRegistry.registerCallback(ContextEvent.ContextCreated, args => {

src/engine-components/ui/Graphic.ts CHANGED Viewed

@@ -150,10 +150,12 @@
         if (this._currentlyCreatingPanel) return;
         this._currentlyCreatingPanel = true;
+        let offset = .015;
+        // if (this.Root) offset = .02 * (1 / this.Root.gameObject.scale.z);
         const opts = {
             backgroundColor: this.color,
             backgroundOpacity: this.color.alpha,
-            offset: 1, // without a tiny offset we get z fighting
+            offset: offset, // without a tiny offset we get z fighting
         };
         this.onBeforeCreate(opts);
         this.applyEffects(opts);

src/engine-components/ParticleSystem.ts CHANGED Viewed

@@ -343,6 +343,7 @@
 export const $particleLife = Symbol("particleLife");
 const $trailLifetime = Symbol("trailLifetime");
 const $trailStartLength = Symbol("trailStartLength");
+const $trailWidthRandom = Symbol("trailWidthRandom");
 class TrailBehaviour extends ParticleSystemBaseBehaviour {
     type: string = "NeedleTrail";
@@ -355,6 +356,7 @@
                 particle.life += particle[$trailLifetime];
             }
             particle[$trailStartLength] = particle.length;
+            particle[$trailWidthRandom] = Math.random();
         }
     }
@@ -370,7 +372,12 @@
                 const cur = iter.next();
                 const state = cur.value as RecordState;
                 const pos01 = 1 - (i / (length - 1));
-                state.size = this.system.trails.getWidth(particle.size, age01, pos01);
+                let size = particle.size;
+                if (size <= 0 && !this.system.trails.sizeAffectsWidth) {
+                    // Not sure where we get to 100* from, tested in SOC trong com
+                    size = 100 * this.system.trails.widthOverTrail.evaluate(.5, trailParticle[$trailWidthRandom]);
+                }
+                state.size = this.system.trails.getWidth(size, age01, pos01, trailParticle[$trailWidthRandom]);
                 state.color.copy(particle.color);
                 this.system.trails.getColor(state.color, age01, pos01);
             }
@@ -663,8 +670,12 @@
         }
     }
-    @serializable()
-    playOnAwake: boolean = true;
+    get playOnAwake(): boolean {
+        return this.main.playOnAwake;
+    }
+    set playOnAwake(val: boolean) {
+        this.main.playOnAwake = val;
+    }
     @serializable(ColorOverLifetimeModule)
     readonly colorOverLifetime!: ColorOverLifetimeModule;

src/engine-components/ParticleSystemModules.ts CHANGED Viewed

@@ -362,7 +362,6 @@
     }
     run(time: number): number {
         if (time <= this.time) {
-            this.reset();
             return 0;
         }
         let amount = 0;
@@ -429,7 +428,7 @@
         if (this.burstCount > 0) {
             for (let i = 0; i < this.burstCount; i++) {
                 const burst = this.bursts[i];
-                if (burst.time >= this.system.time) {
+                if (this.system.main.loop && burst.time >= this.system.time) {
                     burst.reset();
                 }
                 amount += Math.round(burst.run(this.system.time));
@@ -973,9 +972,8 @@
     @serializable()
     worldSpace: boolean = false;
-    getWidth(size: number, _life01: number, pos01: number) {
-        let res = this.widthOverTrail.evaluate(pos01);
-        if (pos01 === 0) res = size;
+    getWidth(size: number, _life01: number, pos01: number, t : number) {
+        let res = this.widthOverTrail.evaluate(pos01, t);
         size *= res;
         return size;
     }
@@ -1072,9 +1070,9 @@
             // if (this.space === ParticleSystemSimulationSpace.World) {
             //     this._temp.applyQuaternion(this._system.worldQuaternionInverted);
             // }
-            // if (this._system.main.simulationSpace === ParticleSystemSimulationSpace.World) {
-            //     this._temp.applyQuaternion(this._system.worldQuaternion);
-            // }
+            if (this._system.main.simulationSpace === ParticleSystemSimulationSpace.World) {
+                this._temp.applyQuaternion(this._system.worldQuaternion);
+            }
         }
         if (this._hasOrbital) {

src/engine-components/ui/RectTransform.ts CHANGED Viewed

@@ -33,7 +33,6 @@
     get parent() {
         return this._parentRectTransform;
     }
-    offset: number = .01;
     // @serializable(Object3D)
     // root? : Object3D;
@@ -108,8 +107,6 @@
         this.lastMatrix = new Matrix4();
         this.rectBlock = new Object3D();
-        // Is this legacy? Not sure if this is still needed
-        this.rectBlock.position.z = .1;
         this.rectBlock.name = this.name;
         // TODO: get rid of the initial position
@@ -213,9 +210,8 @@
             // calc anchors and offset and apply
             tempVec.set(0, 0, 0);
             this.applyAnchoring(tempVec);
-            tempVec.z += this.offset;
-            // tempVec.z -= this.gameObject.position.z;
+            if(this.Canvas?.screenspace) tempVec.z += .1;
+            else tempVec.z += .01;
             tempMatrix.identity();
             tempMatrix.setPosition(tempVec.x, tempVec.y, tempVec.z);
             uiobject.matrix.premultiply(tempMatrix);
@@ -307,7 +303,7 @@
         const opts = {
             width: this.sizeDelta!.x,
             height: this.sizeDelta!.y,// * this.context.mainCameraComponent!.aspect,
-            offset: this.offset,
+            offset: 0,
             backgroundOpacity: 0,
             borderWidth: 0, // if we dont specify width here a border will automatically propagated to child blocks
             borderRadius: 0,