@needle-tools/engine 2.65.0-pre → 2.65.1-pre

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);

package/src/engine-components/Skybox.ts

@@ -5,6 +5,9 @@ import { EXRLoader } from "three/examples/jsm/loaders/EXRLoader";
 import { EquirectangularRefractionMapping, sRGBEncoding, Texture, 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 {
 
@@ -44,10 +47,17 @@ export class RemoteSkybox extends Behaviour {
 
     async setSkybox(url: string | undefined | null) {
         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;
@@ -74,7 +84,7 @@ export class RemoteSkybox extends Behaviour {
                 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;
         // Check if we're still enabled
@@ -103,7 +113,7 @@ export class RemoteSkybox extends Behaviour {
         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))
@@ -140,12 +150,12 @@ 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);