@needle-tools/engine 2.63.1-pre → 2.63.2-pre

package/license-2447137e.js

@@ -0,0 +1,4 @@
+const e = {};
+export {
+  e as default
+};

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@needle-tools/engine",
-    "version": "2.63.1-pre",
+    "version": "2.63.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": "dist/needle-engine.js",
@@ -25,7 +25,8 @@
         "LICENSE.md",
         "src",
         "dist",
-        "lib"
+        "lib",
+        "license-2447137e.js"
     ],
     "keywords": [
         "needle",

package/src/engine/codegen/license.js

@@ -0,0 +1 @@
+export const hasLicense = false;

package/src/engine/engine_license.ts

@@ -109,6 +109,7 @@ function createLicenseElement() {
     return licenseElement;
 }
 
+// TODO: would be better to put this into a web element and use shadow dom
 function createLicenseStyle() {
     const licenseStyle = document.createElement("style");
     const selector = "." + licenseElementClass;
@@ -120,10 +121,17 @@ function createLicenseStyle() {
         font-weight: 300;
     }
 
+    ${selector}, ${selector} > * {
+        display: inline-block !important;
+        visibility: visible !important;
+        background: none !important;
+        border: none !important;
+        text-decoration: none !important;
+    }
+
     ${selector} a {
-        color: black;
-        text-decoration: none;
-        font-weight: 500;
+        color: black !important;
+        font-weight: 500 !important;
     }
     
     @keyframes append-animate {
@@ -173,21 +181,18 @@ function createLicenseStyle() {
         animation-easing: ease-in-out;
     }
 
-    ${selector} .text, ${selector} a {
-        color: rgb(255, 0, 0); 
-        mix-blend-mode: difference;
-    }
-
     ${selector} .logo {
-        border-radius: 50%;
-        background-color: transparent;
-        padding: 5px;
-        transition: all 0.1s ease-in-out;
+        position: relative !important;
+        display: inline-block !important;
+        border-radius: 50% !important;
+        background-color: transparent !important;
+        padding: 5px !important;
+        transition: all 0.1s ease-in-out !important;
     }
 
     ${selector} .logo:hover {
-        transform: scale(1.3);
-        cursor: pointer;
+        transform: scale(1.3) !important;
+        cursor: pointer !important;
     }
     `
     return licenseStyle;

package/src/engine-components/DeleteBox.ts

@@ -1,12 +1,14 @@
 
 import * as THREE from "three";
 import { syncDestroy } from "../engine/engine_networking_instantiate";
+import { getParam } from "../engine/engine_utils";
 import { BoxHelperComponent } from "./BoxHelperComponent";
 import { Behaviour, GameObject } from "./Component";
 import { UsageMarker } from "./Interactable";
 
+const debug = getParam("debugdeletable");
 
-export class DeleteBox extends BoxHelperComponent {}
+export class DeleteBox extends BoxHelperComponent { }
 
 
 export class Deletable extends Behaviour {
@@ -21,13 +23,13 @@ export class Deletable extends Behaviour {
         for (const box of this.deleteBoxes) {
             const obj = this.gameObject as unknown as THREE.Mesh;
             const res = box.isInBox(obj);
-            // console.log(res);
             if (res === true) {
                 const marker = GameObject.getComponentInParent(this.gameObject, UsageMarker);
                 if (!marker) {
-                    // console.log("DESTROY");
+                    if (debug) console.log("DESTROY", this.gameObject);
                     syncDestroy(this.gameObject, this.context.connection);
                 }
+                else if (debug) console.warn("Can not delete object with usage marker", this.guid, marker)
             }
         }
     }

package/src/engine-components/DragControls.ts

@@ -153,11 +153,8 @@ export class DragControls extends Interactable implements IPointerDownHandler, I
             this.onUpdateDrag();
         }
 
-
-        if (this._isDragging) {
-            if (this._dragHelper?.hasSelected === false) {
-                this.onDragEnd(null);
-            }
+        if (this._dragHelper?.hasSelected === false || (this._activePointerId !== undefined && this.context.input.getPointerPressed(this._activePointerId) === false)) {
+            this.onDragEnd(null);
         }
     }
 
@@ -165,6 +162,7 @@ export class DragControls extends Interactable implements IPointerDownHandler, I
     private _marker: UsageMarker | null = null;
     private _dragDelta!: THREE.Vector2;
     private _didDrag: boolean = false;
+    private _activePointerId?: number;
 
     private onDragStart(evt: PointerEventData) {
         if (!this._dragHelper) {
@@ -191,14 +189,22 @@ export class DragControls extends Interactable implements IPointerDownHandler, I
             listener(this, args);
         }
 
+        this._activePointerId = evt.pointerId;
+
         if (!args.attached) return;
         if (args.attached !== object) {
-            // if duplicatable changes the object being dragged
-            // should it also change the active drag controls (e.g. if it has a own one)
+            // // if duplicatable changes the object being dragged
+            // // should it also change the active drag controls (e.g. if it has a own one)
             // const drag = GameObject.getComponentInParent(args.attached, DragControls);
-            // if(drag !== this){
-            //     console.log(args.attached, object);
-            //     drag?.onDragStart(evt);
+            // if (drag && drag !== this) {
+            //     // incredibly ugly code to pass the drag controls event to another drag controls instance
+            //     // This is necessary since we dont call the onPointerUp events anymore for all objects
+            //     // that have previously received the onPointerDown event.
+            //     // NOTE: added the EventSystem.raisedPointerDownEvents array again because of this uglyness here. The code was originally removed in 757fc5e5bafd02aa13d6cd35dd5e8729c841465a and now we're adding it in 8ce886d8344d1abd5ebb89ae3e1fb8d6d47293da
+            //     this.onDragEnd(null);
+            //     drag.onPointerDown(evt);
+            //     evt.object = args.attached;
+            //     drag.onDragStart(evt);
             //     return;
             // }
         }
@@ -257,9 +263,9 @@ export class DragControls extends Interactable implements IPointerDownHandler, I
                 sync.fastMode = false;
                 // sync?.requestOwnership();
             }
-            if (this._marker) {
-                this._marker.destroy();
-            }
+        }
+        if (this._marker) {
+            this._marker.destroy();
         }
         // raise event
         for (const listener of this.selectEndEventListener) {

package/src/engine-components/timeline/PlayableDirector.ts

@@ -9,6 +9,7 @@ import * as Tracks from "./TimelineTracks";
 import { deepClone, getParam } from '../../engine/engine_utils';
 import { GuidsMap } from '../../engine/engine_types';
 import { Object3D } from 'three';
+import { isLocalNetwork } from '../../engine/engine_networking_utils';
 
 const debug = getParam("debugtimeline");
 
@@ -72,7 +73,13 @@ export class PlayableDirector extends Behaviour {
     get isPlaying(): boolean { return this._isPlaying; }
     get isPaused(): boolean { return this._isPaused; }
     get time(): number { return this._time; }
-    set time(value: number) { this._time = value; }
+    set time(value: number) {
+        if (typeof value === "number" && !Number.isNaN(value))
+            this._time = value;
+        else if (debug || isLocalNetwork()) {
+            console.error("INVALID TIMELINE.TIME VALUE", value, this.name)
+        };
+    }
     get duration(): number { return this._duration; }
     set duration(value: number) { this._duration = value; }
     get weight(): number { return this._weight; };

package/src/engine-components/ui/EventSystem.ts

@@ -264,11 +264,11 @@ export class EventSystem extends Behaviour {
         else return;
 
         if (this.lastPointerEvent.isUp) {
-            // for (const obj of this.raisedPointerDownEvents) {
-            //     if (obj.onPointerUp) {
-            //         obj.onPointerUp(this.lastPointerEvent);
-            //     }
-            // }
+            for (const obj of this.raisedPointerDownEvents) {
+                if (obj.onPointerUp) {
+                    obj.onPointerUp(this.lastPointerEvent);
+                }
+            }
             this.raisedPointerDownEvents.length = 0;
             this.raisedPointerDownObjects.length = 0;
         }
@@ -426,7 +426,8 @@ export class EventSystem extends Behaviour {
                 if (args.isDown) {
                     if (comp.onPointerDown && !this.raisedPointerDownEvents.includes(comp)) {
                         comp.onPointerDown(args);
-                        // need to save this to also send pointer up event
+                        // need to save this to also send pointer up event to objects we sent pointer down to previously
+                        // for example Duplicatable+DragControls currently expects this behaviour
                         this.raisedPointerDownEvents.push(comp);
                         this.raisedPointerDownObjects.push(originalObject);
                     }
@@ -434,6 +435,14 @@ export class EventSystem extends Behaviour {
 
                 if (args.isUp) {
                     if (comp.onPointerUp) {
+                        // Remove the pointer up event handling here to not send it twice
+                        // the array is just used for when the "UP" event doesnt hit the same object as the "DOWN" event
+                        // For example if the object was cloned by the Duplicatable
+                        // The original component that received the down event SHOULD also receive the up event tho
+                        const index = this.raisedPointerDownEvents.indexOf(comp);
+                        if (index !== -1) {
+                            this.raisedPointerDownEvents.splice(index, 1);
+                        }
                         comp.onPointerUp(args);
                     }
                 }