@needle-tools/engine 2.65.0-pre.1 → 2.65.2-pre

package/lib/engine-components/Skybox.js

@@ -11,6 +11,8 @@ import { EXRLoader } from "three/examples/jsm/loaders/EXRLoader";
 import { EquirectangularRefractionMapping, sRGBEncoding, TextureLoader } from "three";
 import { syncField } from "../engine/engine_networking_auto";
 import { Camera } from "./Camera";
+import { getParam, getPath } from "../engine/engine_utils";
+const debug = getParam("debugskybox");
 export class RemoteSkybox extends Behaviour {
     url;
     allowDrop = true;
@@ -37,9 +39,16 @@ export class RemoteSkybox extends Behaviour {
     async setSkybox(url) {
         if (!url)
             return;
-        if (!url?.endsWith(".hdr") && !url.endsWith(".exr")) {
+        if (!url?.endsWith(".hdr") && !url.endsWith(".exr") && !url.endsWith(".jpg") && !url.endsWith(".png") && !url.endsWith(".jpeg")) {
             console.warn("Potentially invalid skybox url", this.url, "on", this.name);
         }
+        if (debug)
+            console.log("Remote skybox url?: " + url);
+        if (!url.startsWith("http") && !url.startsWith("www.") && !url.startsWith("data:")) {
+            url = getPath(this.sourceId, url);
+            if (debug)
+                console.log("Remote skybox resolved to " + url);
+        }
         if (this._prevUrl === url && this._prevLoadedEnvironment) {
             this.applySkybox();
             return;
@@ -63,7 +72,8 @@ export class RemoteSkybox extends Behaviour {
             if (!(this._loader instanceof TextureLoader))
                 this._loader = new TextureLoader();
         }
-        console.log("Loading skybox: " + url);
+        if (debug)
+            console.log("Loading skybox: " + url);
         const envMap = await this._loader.loadAsync(url);
         if (!envMap)
             return;
@@ -91,7 +101,8 @@ export class RemoteSkybox extends Behaviour {
             this._prevBackground = this.context.scene.background;
         if (this.context.scene.environment !== envMap)
             this._prevEnvironment = this.context.scene.environment;
-        console.log("Set remote skybox", this.url);
+        if (debug)
+            console.log("Set remote skybox", this.url);
         if (this.environment)
             this.context.scene.environment = envMap;
         if (this.background && !Camera.backgroundShouldBeTransparent(this.context))
@@ -128,12 +139,14 @@ export class RemoteSkybox extends Behaviour {
             for (const type of e.dataTransfer.types) {
                 if (type === "text/uri-list") {
                     const url = e.dataTransfer.getData(type);
-                    console.log(type, url);
+                    if (debug)
+                        console.log(type, url);
                     let name = new RegExp(/polyhaven.com\/asset_img\/.+?\/(?<name>.+)\.png/).exec(url)?.groups?.name;
                     if (!name) {
                         name = new RegExp(/polyhaven\.com\/a\/(?<name>.+)/).exec(url)?.groups?.name;
                     }
-                    console.log(name);
+                    if (debug)
+                        console.log(name);
                     if (name) {
                         const envurl = "https://dl.polyhaven.org/file/ph-assets/HDRIs/exr/1k/" + name + "_1k.exr";
                         this.setSkybox(envurl);

package/lib/engine-components/Skybox.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@needle-tools/engine",
-    "version": "2.65.0-pre.1",
+    "version": "2.65.2-pre",
     "description": "Needle Engine is a web-based runtime for 3D apps. It runs on your machine for development, and can be deployed anywhere. It is flexible, extensible, and collaboration and XR come naturally.",
     "main": "dist/needle-engine.umd.cjs",
     "module": "lib/needle-engine.js",

package/src/engine/engine_license.ts

@@ -86,14 +86,18 @@ function insertNonCommercialUseHint(ctx: IContext) {
 async function logNonCommercialUse(_logo?: string) {
     const logo = "data:image/webp;base64,UklGRrABAABXRUJQVlA4WAoAAAAQAAAAHwAAHwAAQUxQSKEAAAARN6CmbSM4WR7vdARON11EBDq3fLiNbVtVzpMCPlKAEzsx0Y/x+Ovuv4dn0EFE/ydAvz6YggXzgh5sVgXM/zOC/4sii7qgGvB5N7hmuQYwkvazWAu1JPW41FXSHq6pnaQWvqYH18Fc0j1hO/BFTtIeSBlJi5w6qIIO7IOrwhFsB2Yxukif0FTRLpXswHR8MxbslKe9VZsn/Ub5C7YFOpqSTABWUDgg6AAAAFAGAJ0BKiAAIAA+7VyoTqmkpCI3+qgBMB2JbACdMt69DwMIQBLhkTO6XwY00UEDK6cNIDnuNibPf0EgAP7Y1myuiQHLDsF/0h5unrGh6WAbv7aegg2ZMd3uRKfT/3SJztcaujYfTvMXspfCTmYcoO6a+vhC3ss4M8uM58t4siiu59I4aOl59e9Sr6xoxYlHf2v+NnBNpJYeJf8jABQAId/PXuBkLEFkiCucgSGEcfhvajql/j3reCGl0M5/9gQWy7ayNPs+wlvIxFnNfSlfuND4CZOCyxOHhRqOmHN4ULHo3tCSrUNvgAA=";
     const style = `
-        font-size:18px;
-        background-size: contain;
-        background-position: left center;
+        font-size: 18px;
+        background-size: 20px;
+        background-position: left top;
         background-repeat:no-repeat;
-        background-image:url('${logo}')
+        background-image:url('${logo}');
+        background-max-size: 40px;
+        padding-left: 30px;
+        margin-bottom: 2px;
+        margin-bottom: 5px;
     `;
     let licenseText = "Needle Engine — non commercial version";
-    console.log("%c   " + licenseText, style)
+    console.log("%c" + licenseText, style)
 }
 
 function createLicenseElement() {

package/src/engine/extensions/NEEDLE_techniques_webgl.ts

@@ -9,7 +9,7 @@ import { SourceIdentifier } from "../engine_types";
 import { ILight } from "../engine_types";
 import { getWorldPosition } from "../engine_three_utils";
 
-const debug = getParam("debugshaders");
+const debug = getParam("debugcustomshader");
 
 export const NEEDLE_TECHNIQUES_WEBGL_NAME = "NEEDLE_techniques_webgl";
 
@@ -524,8 +524,11 @@ export class NEEDLE_techniques_webgl implements GLTFLoaderPlugin {
                             console.warn("Missing/unassigned texture, fallback to white: " + uniformName)
                             break;
                         default:
+                            if (uniformName === "unity_OrthoParams") {
 
-                            console.warn("TODO: EXPECTED UNIFORM / fallback NOT SET: " + uniformName, techniqueUniforms[u]);
+                            }
+                            else
+                                console.warn("TODO: EXPECTED UNIFORM / fallback NOT SET: " + uniformName, techniqueUniforms[u]);
                             break;
                     }
                 }

package/src/engine-components/Animator.ts

@@ -50,55 +50,82 @@ export class Animator extends Behaviour {
         return this._animatorController;
     }
 
-    Play(name: string | number, layer: number = -1, normalizedTime: number = Number.NEGATIVE_INFINITY, transitionDurationInSec: number = 0) {
-        this.runtimeAnimatorController?.Play(name, layer, normalizedTime, transitionDurationInSec);
-    }
+    // NOTE: the uppercase events have been deprecated because UnityEvent methods are all exported with lowercase first letter
 
-    Reset() {
-        this._animatorController?.Reset();
+    /**@deprecated use play */
+    Play(name: string | number, layer: number = -1, normalizedTime: number = Number.NEGATIVE_INFINITY, transitionDurationInSec: number = 0) { this.play(name, layer, normalizedTime, transitionDurationInSec); }
+    play(name: string | number, layer: number = -1, normalizedTime: number = Number.NEGATIVE_INFINITY, transitionDurationInSec: number = 0) {
+        this.runtimeAnimatorController?.play(name, layer, normalizedTime, transitionDurationInSec);
     }
 
-    SetBool(name: string | number, value: boolean) {
-        this.runtimeAnimatorController?.SetBool(name, value);
+    /**@deprecated use reset */
+    Reset() { this.reset(); }
+    reset() {
+        this._animatorController?.reset();
     }
 
-    GetBool(name: string | number): boolean {
-        return this.runtimeAnimatorController?.GetBool(name) ?? false;
+    /**@deprecated use setBool */
+    SetBool(name: string | number, val: boolean) { this.setBool(name, val); }
+    setBool(name: string | number, value: boolean) {
+        this.runtimeAnimatorController?.setBool(name, value);
     }
 
-    SetFloat(name: string | number, val: number) {
-        this.runtimeAnimatorController?.SetFloat(name, val);
+    /**@deprecated use getBool */
+    GetBool(name: string | number) { return this.getBool(name); }
+    getBool(name: string | number): boolean {
+        console.log("name", name);
+        return this.runtimeAnimatorController?.getBool(name) ?? false;
     }
 
-    GetFloat(name: string | number): number {
-        return this.runtimeAnimatorController?.GetFloat(name) ?? -1;
+    /**@deprecated use setFloat */
+    SetFloat(name: string | number, val: number) { this.setFloat(name, val); }
+    setFloat(name: string | number, val: number) {
+        this.runtimeAnimatorController?.setFloat(name, val);
     }
 
-    SetInteger(name: string | number, val: number) {
-        this.runtimeAnimatorController?.SetInteger(name, val);
+    /**@deprecated use getFloat */
+    GetFloat(name: string | number) { return this.getFloat(name); }
+    getFloat(name: string | number): number {
+        return this.runtimeAnimatorController?.getFloat(name) ?? -1;
     }
 
-    GetInteger(name: string | number): number {
-        return this.runtimeAnimatorController?.GetInteger(name) ?? -1;
+    /**@deprecated use setInteger */
+    SetInteger(name: string | number, val: number) { this.setInteger(name, val); }
+    setInteger(name: string | number, val: number) {
+        this.runtimeAnimatorController?.setInteger(name, val);
     }
 
-    SetTrigger(name: string | number) {
-        this.runtimeAnimatorController?.SetTrigger(name);
+    /**@deprecated use getInteger */
+    GetInteger(name: string | number) { return this.getInteger(name); }
+    getInteger(name: string | number): number {
+        return this.runtimeAnimatorController?.getInteger(name) ?? -1;
     }
 
-    ResetTrigger(name: string | number) {
-        this.runtimeAnimatorController?.ResetTrigger(name);
+    /**@deprecated use setTrigger */
+    SetTrigger(name: string | number) { this.setTrigger(name); }
+    setTrigger(name: string | number) {
+        console.log("name", name);
+        this.runtimeAnimatorController?.setTrigger(name);
     }
 
-    IsInTransition(): boolean {
-        return this.runtimeAnimatorController?.IsInTransition() ?? false;
+    /**@deprecated use resetTrigger */
+    ResetTrigger(name: string | number) { this.resetTrigger(name); }
+    resetTrigger(name: string | number) {
+        this.runtimeAnimatorController?.resetTrigger(name);
     }
 
+    /**@deprecated use isInTransition */
+    IsInTransition() { return this.isInTransition(); }
+    isInTransition(): boolean {
+        return this.runtimeAnimatorController?.isInTransition() ?? false;
+    }
 
-    SetSpeed(speed: number) {
+    /**@deprecated use setSpeed */
+    SetSpeed(speed: number) { return this.setSpeed(speed); }
+    setSpeed(speed: number) {
         if (speed === this.speed) return;
         this.speed = speed;
-        this._animatorController?.SetSpeed(speed);
+        this._animatorController?.setSpeed(speed);
     }
 
     set minMaxSpeed(minMax: { x: number, y: number }) {
@@ -130,7 +157,7 @@ export class Animator extends Behaviour {
                 this.runtimeAnimatorController = clone;
                 console.assert(this.runtimeAnimatorController === clone);
                 this.runtimeAnimatorController.bind(this);
-                this.runtimeAnimatorController.SetSpeed(this.speed);
+                this.runtimeAnimatorController.setSpeed(this.speed);
                 this.runtimeAnimatorController.normalizedStartOffset = this.normalizedStartOffset;
             }
             else console.warn("Could not clone animator controller", this.runtimeAnimatorController);
@@ -139,7 +166,7 @@ export class Animator extends Behaviour {
 
     onDisable() {
         if (!this.keepAnimatorControllerStateOnDisable)
-            this._animatorController?.Reset();
+            this._animatorController?.reset();
     }
 
     onBeforeRender() {

package/src/engine-components/AnimatorController.ts

@@ -14,7 +14,7 @@ const debugRootMotion = getParam("debugrootmotion");
 
 export class AnimatorController {
 
-    Play(name: string | number, layerIndex: number = -1, normalizedTime: number = Number.NEGATIVE_INFINITY, durationInSec: number = 0) {
+    play(name: string | number, layerIndex: number = -1, normalizedTime: number = Number.NEGATIVE_INFINITY, durationInSec: number = 0) {
         if (layerIndex < 0) layerIndex = 0;
         else if (layerIndex >= this.model.layers.length) {
             console.warn("invalid layer");
@@ -33,61 +33,63 @@ export class AnimatorController {
         console.warn("Could not find " + name + " to play");
     }
 
-    Reset() {
+    reset() {
         this.setStartTransition();
     }
 
-    SetBool(name: string | number, value: boolean) {
+    setBool(name: string | number, value: boolean) {
         const key = typeof name === "string" ? "name" : "hash";
         return this.model?.parameters?.filter(p => p[key] === name).forEach(p => p.value = value);
     }
 
-    GetBool(name: string | number): boolean {
+    getBool(name: string | number): boolean {
         const key = typeof name === "string" ? "name" : "hash";
         return this.model?.parameters?.find(p => p[key] === name)?.value as boolean ?? false;
     }
 
-    SetFloat(name: string | number, val: number) {
+    setFloat(name: string | number, val: number) {
         const key = typeof name === "string" ? "name" : "hash";
         return this.model?.parameters?.filter(p => p[key] === name).forEach(p => p.value = val);
     }
 
-    GetFloat(name: string | number): number {
+    getFloat(name: string | number): number {
         const key = typeof name === "string" ? "name" : "hash";
         return this.model?.parameters?.find(p => p[key] === name)?.value as number ?? 0;
     }
 
-    SetInteger(name: string | number, val: number) {
+    setInteger(name: string | number, val: number) {
         const key = typeof name === "string" ? "name" : "hash";
         return this.model?.parameters?.filter(p => p[key] === name).forEach(p => p.value = val);
     }
 
-    GetInteger(name: string | number): number {
+    getInteger(name: string | number): number {
         const key = typeof name === "string" ? "name" : "hash";
         return this.model?.parameters?.find(p => p[key] === name)?.value as number ?? 0;
     }
 
-    SetTrigger(name: string | number) {
+    setTrigger(name: string | number) {
         if (debug)
             console.log("SET TRIGGER", name);
         const key = typeof name === "string" ? "name" : "hash";
         return this.model?.parameters?.filter(p => p[key] === name).forEach(p => p.value = true);
     }
 
-    ResetTrigger(name: string | number) {
+    resetTrigger(name: string | number) {
         const key = typeof name === "string" ? "name" : "hash";
         return this.model?.parameters?.filter(p => p[key] === name).forEach(p => p.value = false);
     }
 
-    IsInTransition(): boolean {
+    isInTransition(): boolean {
         return this._activeStates.length > 1;
     }
 
-    SetSpeed(speed: number) {
+    setSpeed(speed: number) {
         this._speed = speed;
     }
 
-    FindState(name: string | undefined | null): State | null {
+    /**@deprecated use findState */
+    FindState(name: string | undefined | null): State | null { return this.findState(name); }
+    findState(name: string | undefined | null): State | null {
         if (!name) return null;
         if (Array.isArray(this.model.layers)) {
             for (const layer of this.model.layers) {

package/src/engine-components/ParticleSystem.ts

@@ -9,7 +9,7 @@ import { getParam } from "../engine/engine_utils";
 import { serializable } from "../engine/engine_serialization";
 import { RGBAColor } from "./js-extensions/RGBAColor";
 import { AxesHelper, BufferGeometry, Color, Material, Matrix4, Mesh, MeshStandardMaterial, Object3D, OneMinusDstAlphaFactor, PlaneGeometry, Quaternion, Sprite, SpriteMaterial, Vector3, Vector4 } from "three";
-import { getWorldPosition, getWorldQuaternion, getWorldScale } from "../engine/engine_three_utils";
+import { getWorldPosition, getWorldQuaternion, getWorldScale, setWorldScale } from "../engine/engine_three_utils";
 import { assign } from "../engine/engine_serialization_core";
 import { BatchedParticleRenderer, Behavior, BillBoardSettings, BurstParameters, ColorGenerator, ConstantColor, ConstantValue, EmissionState, EmitSubParticleSystem, EmitterShape, FunctionColorGenerator, FunctionJSON, FunctionValueGenerator, IntervalValue, MeshSettings, Particle, ParticleEmitter, ParticleSystem as _ParticleSystem, ParticleSystemParameters, PointEmitter, RecordState, RenderMode, RotationGenerator, SizeOverLife, TrailBatch, TrailParticle, TrailSettings, ValueGenerator } from "three.quarks";
 import { createFlatTexture } from "../engine/engine_shaders";
@@ -17,6 +17,7 @@ import { Mathf } from "../engine/engine_math";
 import { Context } from "../engine/engine_setup";
 import { ParticleSubEmitter } from "./ParticleSystemSubEmitter";
 import { NEEDLE_progressive } from "../engine/extensions/NEEDLE_progressive";
+import { Gizmos, isDevEnvironment } from "../engine/api";
 
 const debug = getParam("debugparticles");
 const suppressProgressiveLoading = getParam("noprogressive");
@@ -30,24 +31,6 @@ export enum SubEmitterType {
     Manual = 4,
 }
 
-export class SubEmitterSystem {
-
-    particleSystem?: ParticleSystem;
-
-    emitProbability: number = 1;
-    properties?: number;
-    type?: SubEmitterType;
-
-    _deserialize(context: Context) {
-        const ps = this.particleSystem;
-        if (ps && !(ps instanceof ParticleSystem) && typeof ps["guid"] === "string") {
-            if (debug) console.log("DESERIALIZE SUBEMITTER", ps);
-            this.particleSystem = undefined;
-            this.particleSystem = GameObject.findByGuid(ps["guid"], context.scene) as ParticleSystem;
-        }
-    }
-}
-
 export class ParticleSystemRenderer extends Behaviour {
 
     @serializable()
@@ -62,6 +45,22 @@ export class ParticleSystemRenderer extends Behaviour {
     // @serializable(Mesh)
     particleMesh?: Mesh | string;
 
+    @serializable()
+    maxParticleSize!: number;
+
+    @serializable()
+    minParticleSize!: number;
+
+    start() {
+        if (this.maxParticleSize !== .5 && this.minParticleSize !== 0) {
+            if (isDevEnvironment()) {
+                const msg = `ParticleSystem \"${this.name}\" has non-default min/max particle size. This may not render correctly. Please set min size to 0 and the max size to 0.5 and use the \"StartSize\" setting instead`;
+                console.warn(msg);
+                // showBalloonWarning(msg);
+            }
+        }
+    }
+
     get transparent(): boolean {
         const res = this.particleMaterial?.transparent ?? false;
         // console.log(res, this.particleMaterial);
@@ -305,8 +304,13 @@ class SizeBehaviour extends ParticleSystemBaseBehaviour {
 
     type: string = "NeedleSize";
 
+    private _minSize = 0;
+    private _maxSize = 1;
+
     initialize(particle: Particle) {
         particle[$sizeLerpFactor] = Math.random();
+        this._minSize = this.system.renderer.minParticleSize;
+        this._maxSize = this.system.renderer.maxParticleSize;
     }
 
     update(particle: Particle, _delta: number): void {
@@ -320,7 +324,8 @@ class SizeBehaviour extends ParticleSystemBaseBehaviour {
                 size *= this.system.sizeOverLifetime.evaluate(age01, undefined, particle[$sizeLerpFactor]).x;
             const scaleFactor = this.system.worldScale.x / this.system.cameraScale;
             particle.size = particle.startSize * size * scaleFactor;
-
+            // in Unity this is viewport size
+            particle.size = Mathf.clamp(particle.size, this._minSize, this._maxSize);
         }
     }
 }
@@ -383,7 +388,9 @@ class VelocityBehaviour extends ParticleSystemBaseBehaviour {
     private _gravityDirection = new Vector3();
 
     initialize(particle: Particle): void {
-        const factor = 1 + this.scaleFactorDiff;
+        const simulationSpeed = this.system.main.simulationSpeed;
+
+        const factor = 1 + this.scaleFactorDiff * simulationSpeed;
         particle.startSpeed = this.system.main.startSpeed.evaluate(Math.random(), Math.random()) * factor;
         particle.velocity.copy(this.system.shape.getDirection(particle.position)).multiplyScalar(particle.startSpeed);
         if (this.system.inheritVelocity?.enabled) {
@@ -393,7 +400,7 @@ class VelocityBehaviour extends ParticleSystemBaseBehaviour {
         else particle[$startVelocity].copy(particle.velocity);
 
         const gravityFactor = this.system.main.gravityModifier.evaluate(Math.random(), Math.random()) / (9.81 * 2);
-        particle[$gravityFactor] = gravityFactor;
+        particle[$gravityFactor] = gravityFactor * simulationSpeed;
 
         particle[$velocityLerpFactor] = Math.random();
 
@@ -411,18 +418,18 @@ class VelocityBehaviour extends ParticleSystemBaseBehaviour {
         if (gravityFactor !== 0) {
             // gravityFactor *= -1;
             temp3.copy(this._gravityDirection).multiplyScalar(gravityFactor);
-            // Gizmos.DrawDirection(particle.position, temp3, 0xff0000, 0, false, 10);
+            if(debug) Gizmos.DrawDirection(particle.position, temp3, 0x0000ff, 0, false, 10);
             baseVelocity.add(temp3);
         }
         particle.velocity.copy(baseVelocity);
 
+
         const t01 = particle.age / particle.life;
 
         if (this.system.inheritVelocity?.enabled) {
             this.system.inheritVelocity.applyCurrent(particle.velocity, t01, particle[$velocityLerpFactor]);
         }
 
-
         const noise = this.system.noise;
         if (noise.enabled) {
             noise.apply(0, particle.position, particle.velocity, delta, particle.age, particle.life);
@@ -772,22 +779,25 @@ export class ParticleSystem extends Behaviour implements IParticleSystem {
     }
     private _subEmitterSystems?: SubEmitterSystem[];
 
-    awake(): void {
-
+    onAfterDeserialize(_){
         if (this._subEmitterSystems && Array.isArray(this._subEmitterSystems)) {
             for (const sub of this._subEmitterSystems) {
-                sub._deserialize(this.context);
+                sub._deserialize(this.context, this.gameObject);
             }
         }
+    }
+
+    awake(): void {
 
         this._renderer = this.gameObject.getComponent(ParticleSystemRenderer) as ParticleSystemRenderer;
 
         this._container = new Object3D();
         this._container.matrixAutoUpdate = false;
-        if (this.main.simulationSpace == ParticleSystemSimulationSpace.Local) {
-            this.gameObject.add(this._container);
-        }
-        else {
+        // if (this.main.simulationSpace == ParticleSystemSimulationSpace.Local) {
+        //     this.gameObject.add(this._container);
+        // }
+        // else 
+        {
             this.context.scene.add(this._container);
         }
         // else this._container = this.context.scene;
@@ -875,21 +885,27 @@ export class ParticleSystem extends Behaviour implements IParticleSystem {
             this._cameraScale = scale.x;
         }
 
-        let source = this._container;
-        if (this.worldspace)
-            source = this.gameObject;
+        const isLocalSpace = !this.worldspace;
+
+        const source = this.gameObject;
         getWorldQuaternion(source, this.__worldQuaternion)
         this._worldQuaternionInverted.copy(this.__worldQuaternion).invert();
         getWorldScale(this.gameObject, this._worldScale);
 
-        if (!this.worldspace && this._container && this.gameObject?.parent) {
+        // Handle LOCALSPACE
+        if (isLocalSpace && this._container && this.gameObject?.parent) {
+            // TODO: there's probably a more efficient way to do this
             const scale = getWorldScale(this.gameObject.parent);
             scale.x = 1 / scale.x;
             scale.y = 1 / scale.y;
             scale.z = 1 / scale.z;
-            this._container.matrix.identity();
-            this._container.matrix.scale(scale);
+            this._container.matrix.makeScale(scale.x, scale.y, scale.z);
+            this._container.matrix.makeRotationFromQuaternion(this.__worldQuaternion);
+            this._container.matrix.setPosition(this.worldPos);
+            this._container.matrix.scale(this.gameObject.scale);
         }
+
+
         this.emission.system = this;
         this._interface.update();
         this.shape.update(this, this.context, this.main.simulationSpace, this.gameObject);
@@ -918,3 +934,18 @@ export class ParticleSystem extends Behaviour implements IParticleSystem {
 }
 
 
+
+export class SubEmitterSystem {
+
+    particleSystem?: ParticleSystem;
+    emitProbability: number = 1;
+    properties?: number;
+    type?: SubEmitterType;
+
+    _deserialize(context: Context, _gameObject: GameObject) {
+        const ps = this.particleSystem;
+        if (ps && !(ps instanceof ParticleSystem) && typeof ps["guid"] === "string") {
+            this.particleSystem = GameObject.findByGuid(ps["guid"], context.scene) as ParticleSystem;
+        }
+    }
+}

package/src/engine-components/ParticleSystemModules.ts

@@ -522,10 +522,10 @@ export class ShapeModule implements EmitterShape {
     private readonly _worldSpaceMatrix: Matrix4 = new Matrix4();
     private readonly _worldSpaceMatrixInverse: Matrix4 = new Matrix4();
 
-
-    // constructor() {
-    //     console.log(this);
-    // }
+    constructor() {
+        if (debug)
+            console.log(this);
+    }
 
     update(system: IParticleSystem, _context: Context, simulationSpace: ParticleSystemSimulationSpace, obj: Object3D) {
         this.system = system;
@@ -571,6 +571,7 @@ export class ShapeModule implements EmitterShape {
         if (this.enabled) {
             switch (this.shapeType) {
                 case ParticleSystemShapeType.Box:
+                    if(debug) Gizmos.DrawBox(this.position, this.scale, 0xdddddd, 1);
                     this._vector.x = Math.random() * this.scale.x - this.scale.x / 2;
                     this._vector.y = Math.random() * this.scale.y - this.scale.y / 2;
                     this._vector.z = Math.random() * this.scale.z - this.scale.z / 2;
@@ -605,6 +606,10 @@ export class ShapeModule implements EmitterShape {
             this._vector.applyQuaternion(this.system.worldQuaternion);
             this._vector.add(this.system.worldPos);
         }
+
+        if (debug) {
+            Gizmos.DrawSphere(this._vector, .03, 0xff0000, .5, true);
+        }
     }
 
 
@@ -631,14 +636,15 @@ export class ShapeModule implements EmitterShape {
                 const ry = pos.y;
                 const rz = pos.z;
                 this._dir.set(rx, ry, rz)
-                this._dir.sub(this.position)
+                if (this.system?.worldspace)
+                    this._dir.sub(this.system.worldPos)
                 break;
             default:
                 this._dir.set(0, 0, 1);
                 break;
         }
         if (this._space === ParticleSystemSimulationSpace.World) {
-            this._dir.applyMatrix4(this._worldSpaceMatrixInverse);
+            this._dir.applyQuaternion(this.system.worldQuaternion);
         }
         if (this.updateRotation())
             this._dir.applyEuler(this._rotation);