@needle-tools/engine 3.2.7-alpha → 3.2.8-alpha

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@needle-tools/engine",
-    "version": "3.2.7-alpha",
+    "version": "3.2.8-alpha",
     "description": "Needle Engine is a web-based runtime for 3D apps. It runs on your machine for development with great integrations into editors like Unity or Blender - and can be deployed onto any device! It is flexible, extensible and networking and XR are built-in",
     "main": "dist/needle-engine.umd.cjs",
     "type": "module",

package/src/engine/engine_input.ts

@@ -79,6 +79,20 @@ export class Input extends EventTarget {
             this.context.domElement.style.cursor = "default";
     }
 
+    setPointerUsed(i: number, used: boolean = true) {
+        if (i >= this._pointerUsed.length) {
+            if (i >= this._pointerIds.length)
+                return;
+            while (this._pointerUsed.length <= i) {
+                this._pointerUsed.push(false);
+            }
+        }
+        this._pointerUsed[i] = used;
+    }
+    getPointerUsed(i: number) {
+        if (i >= this._pointerUsed.length) return false;
+        return this._pointerUsed[i];
+    }
     /** how many pointers are currently pressed */
     getPointerPressedCount(): number {
         let count = 0;
@@ -225,6 +239,7 @@ export class Input extends EventTarget {
     private _mouseWheelChanged: boolean[] = [false];
     private _mouseWheelDeltaY: number[] = [0];
     private _pointerEvent: Event[] = [];
+    private _pointerUsed: boolean[] = [];
 
     getKeyDown(): string | null {
         for (const key in this.keysPressed) {
@@ -545,6 +560,9 @@ export class Input extends EventTarget {
         // }
         this.setPointerState(evt.button, this._pointerUp, true);
 
+        while (evt.button >= this._pointerUsed.length) this._pointerUsed.push(false);
+        this.setPointerState(evt.button, this._pointerUsed, false);
+
         this.updatePointerPosition(evt);
 
         if (!this._pointerPositionDown[evt.button]) {

package/src/engine/engine_physics.ts

@@ -15,7 +15,7 @@ import {
 import { InstancingUtil } from './engine_instancing';
 import { foreachComponent } from './engine_gameobject';
 
-import RAPIER, { ActiveEvents, CoefficientCombineRule, Collider, ColliderDesc, EventQueue, JointData, QueryFilterFlags, RigidBody, RigidBodyType, ShapeColliderTOI, World } from '@dimforge/rapier3d-compat';
+import RAPIER, { ActiveCollisionTypes, ActiveEvents, CoefficientCombineRule, Collider, ColliderDesc, EventQueue, JointData, QueryFilterFlags, RigidBody, RigidBodyType, ShapeColliderTOI, World } from '@dimforge/rapier3d-compat';
 import { CollisionDetectionMode, PhysicsMaterialCombine } from '../engine/engine_physics.types';
 import { Gizmos } from './engine_gizmos';
 import { Mathf } from './engine_math';
@@ -645,6 +645,8 @@ export class Physics {
         col[$componentKey] = collider;
         collider[$bodyKey] = col;
         col.setActiveEvents(ActiveEvents.COLLISION_EVENTS);
+        // We want to receive collisitons between two triggers too
+        col.setActiveCollisionTypes(ActiveCollisionTypes.ALL);
         
         // const objectLayerMask = collider.gameObject.layers.mask;
         // const mask = objectLayerMask & ~2;

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

@@ -113,7 +113,7 @@ export class EventSystem extends Behaviour {
         this._selectStartFn ??= (ctrl, args: { grab: THREE.Object3D | null }) => {
             if (!args.grab) return;
             MeshUIHelper.resetLastSelected();
-            const opts = new PointerEventData();
+            const opts = new PointerEventData(this.context.input);
             opts.inputSource = ctrl;
             opts.isDown = ctrl.selectionDown;
             opts.isUp = ctrl.selectionUp;
@@ -126,7 +126,7 @@ export class EventSystem extends Behaviour {
         }
         this._selectEndFn ??= (ctrl, args: { grab: THREE.Object3D }) => {
             if (!args.grab) return;
-            const opts = new PointerEventData();
+            const opts = new PointerEventData(this.context.input);
             opts.inputSource = ctrl;
             opts.isDown = ctrl.selectionDown;
             opts.isUp = ctrl.selectionUp;
@@ -155,7 +155,7 @@ export class EventSystem extends Behaviour {
             controllerRcOpts.ray = _ctrl.getRay();
             const rc = this.performRaycast(controllerRcOpts);
             if (!rc) return;
-            const opts = new PointerEventData();
+            const opts = new PointerEventData(this.context.input);
             opts.inputSource = _ctrl;
             this.handleIntersections(rc, opts);
         };
@@ -230,7 +230,7 @@ export class EventSystem extends Behaviour {
 
         const ptr = this.context.input.getPointerEvent(pointerId);
         // console.log(ptr);
-        const args: PointerEventData = new PointerEventData(ptr);
+        const args: PointerEventData = new PointerEventData(this.context.input, ptr);
         args.inputSource = this.context.input;
         args.pointerId = pointerId;
         args.isClicked = this.context.input.getPointerClicked(pointerId)

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

@@ -7,10 +7,14 @@ export interface IInputEventArgs {
 }
 
 export class PointerEventData implements IInputEventArgs {
+
+    // TODO: should we make this a getter and return the input used state instead? -> this.context.getPointerUsed(this.pointerId);
     used: boolean = false;
 
     Use() {
         this.used = true;
+        if (this.pointerId !== undefined)
+            this.input.setPointerUsed(this.pointerId);
     }
 
     StopPropagation() {
@@ -26,10 +30,13 @@ export class PointerEventData implements IInputEventArgs {
     isPressed: boolean | undefined;
     isClicked: boolean | undefined;
 
+    private input: Input;
+
     private event?: Event;
 
-    constructor(events?: Event) {
+    constructor(input: Input, events?: Event) {
         this.event = events;
+        this.input = input;
     }
 }