@vived/app 4.11.3 → 4.13.0

package/lib/Components/zSpace/UC/StylusFromGamepadHook.js

@@ -1,11 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeStylusFromGamepadHook = exports.StylusFromGamepadHook = void 0;
-const AppObjectUC_1 = require("../../../AppObject/AppObjectUC");
+const AppObject_1 = require("../../../AppObject");
 const ValueObjects_1 = require("../../../ValueObjects");
+const Stylus_1 = require("../../Stylus");
 const XR_1 = require("../../XR");
-const ZSpaceEntity_1 = require("../Entities/ZSpaceEntity");
-class StylusFromGamepadHook extends AppObjectUC_1.AppObjectUC {
+class StylusFromGamepadHook extends AppObject_1.AppObjectUC {
 }
 exports.StylusFromGamepadHook = StylusFromGamepadHook;
 StylusFromGamepadHook.type = "StylusFromGamepadHook";
@@ -18,7 +18,7 @@ class StylusFromGamepadUCImp extends StylusFromGamepadHook {
         super(appObject, StylusFromGamepadHook.type);
         this.lastPresses = [false, false, false];
         this.onNewXRFrame = () => {
-            if (!this.xrEntity)
+            if (!this.xrEntity || !this.stylus)
                 return;
             const frame = this.xrEntity.lastXRFrame;
             if (!frame)
@@ -43,23 +43,23 @@ class StylusFromGamepadUCImp extends StylusFromGamepadHook {
             if (stylusPose)
                 this.processStylusPose(stylusPose);
         };
-        const zSpaceEntity = appObject.getComponent(ZSpaceEntity_1.ZSpaceEntity.type);
-        if (!zSpaceEntity) {
-            throw new Error("No ZSpace Entity");
-        }
-        this.zSpace = zSpaceEntity;
-        const xrEntity = zSpaceEntity.appObject.getComponent(XR_1.XREntity.type);
+        const xrEntity = appObject.getComponent(XR_1.XREntity.type);
         if (!xrEntity) {
-            this.warn("Unable to get XREntity from App Object");
+            this.error("Added to an App Object that does not have XREntity");
             return;
         }
         this.xrEntity = xrEntity;
         this.xrEntity.addChangeObserver(this.onNewXRFrame);
     }
+    get stylus() {
+        return this.getCachedSingleton(Stylus_1.StylusEntity.type);
+    }
     processStylusPose(pose) {
         const matrix = ValueObjects_1.Matrix.FromFloat32Array(pose.transform.matrix);
         const flippedMatrix = ValueObjects_1.Matrix.FlipTransformMatrixHand(matrix);
-        this.zSpace.stylus.transform.localMatrix = flippedMatrix;
+        if (this.stylus) {
+            this.stylus.transform.localMatrix = flippedMatrix;
+        }
     }
     processButtons(stylusSource) {
         var _a, _b, _c;
@@ -73,9 +73,10 @@ class StylusFromGamepadUCImp extends StylusFromGamepadHook {
         presses[1] = (_b = gamepad.buttons[3]) === null || _b === void 0 ? void 0 : _b.pressed;
         presses[2] = (_c = gamepad.buttons[4]) === null || _c === void 0 ? void 0 : _c.pressed;
         presses.forEach((press, i) => {
+            var _a;
             if (this.lastPresses[i] !== press) {
                 this.lastPresses[i] = press;
-                this.zSpace.stylus.updateButtonState(i, press);
+                (_a = this.stylus) === null || _a === void 0 ? void 0 : _a.updateButtonState(i, press);
             }
         });
     }

package/lib/Components/zSpace/index.d.ts

@@ -1,4 +1,3 @@
 export * from "./Entities";
 export * from "./PM";
 export * from "./UC";
-export * from "./Controllers";

package/lib/Components/zSpace/index.js

@@ -13,4 +13,3 @@ Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./Entities"), exports);
 __exportStar(require("./PM"), exports);
 __exportStar(require("./UC"), exports);
-__exportStar(require("./Controllers"), exports);

package/lib/Entities/TransformNode.d.ts

@@ -2,75 +2,20 @@ import { EaseFn } from "../Types";
 import { Matrix, Quaternion, Vector3 } from "../ValueObjects";
 export declare type OnTransformNodeChange = () => void;
 export interface TransformNode {
-    /**
-     * Local position of the transform
-     */
     localPosition: Vector3;
-    /**
-     * The world position of the transform
-     */
     worldPosition: Vector3;
-    /**
-     * Local roation of the transform
-     */
     localRotation: Quaternion;
-    /**
-     * World roation of the transform
-     */
     worldRotation: Quaternion;
-    /**
-     * Local scale of the transform
-     */
     localScale: Vector3;
-    /**
-     * World scale of the transform
-     */
     worldScale: Vector3;
-    /**
-     * Local transformation matrix
-     */
     localMatrix: Matrix;
-    /**
-     * The global transformation matrix
-     */
     worldMatrix: Matrix;
-    /**
-     * The transform's parent. Optional
-     */
     parent?: TransformNode;
-    /**
-     * Transforms a point from local to world space coordinates
-     * @param point point to transform in local coordinates
-     */
     localPointToWorld: (point: Vector3) => Vector3;
-    /**
-     * Transforms a point from world to local space coordinates
-     * @param point point to transform in world coordinates
-     */
     worldPointToLocal: (point: Vector3) => Vector3;
-    /**
-     * Transforms a local direction vector to world coordinates.
-     * @param direction direction to transform in local coordinates
-     */
     localDirectionToWorld: (direction: Vector3) => Vector3;
-    /**
-     * Transforms a world direction vector to local coordinates
-     * @param direction direction to transform in world coordinates
-     */
     worldDirectionToLocal: (direction: Vector3) => Vector3;
-    /**
-     * Lerps this transform node
-     * @param duration Lerp duration in MS
-     * @param ease Lerp ease function
-     * @param desiredPosition: Desired position. Optional.
-     * @param desiredRotation: Desired rotation. Optional.
-     * @param desiredScale: Desired scale. Optional.
-     * @param onCompletedCallback: Optional function to call when the lerp has completed
-     */
     lerp: (duration: number, ease: EaseFn, desiredPosition?: Vector3, desiredRotation?: Quaternion, desiredScale?: Vector3, onCompletedCallback?: () => void) => void;
-    /**
-     * Cancels any currently running lerp
-     */
     cancelLerp: () => void;
     addObserver: (observer: OnTransformNodeChange) => void;
     removeObserver: (observer: OnTransformNodeChange) => void;

package/lib/ValueObjects/Color.js

@@ -70,7 +70,7 @@ class Color {
      */
     static X11(name) {
         for (const c of x11Colors) {
-            if (c.name === name) {
+            if (c.name.toLowerCase() === name.toLowerCase()) {
                 return Color.Hex(c.hex);
             }
         }

package/lib/ValueObjects/ParametricLine.d.ts

@@ -17,11 +17,14 @@ export declare class ParametricLine {
     static Left(): ParametricLine;
     static Right(): ParametricLine;
     static GetPointAtDistance(line: ParametricLine, distance: number): Vector3;
+    static GetDistanceToPoint(line: ParametricLine, point: Vector3): number;
     readonly x0: number;
     readonly y0: number;
     readonly z0: number;
     readonly a: number;
     readonly b: number;
     readonly c: number;
+    get origin(): Vector3;
+    get direction(): Vector3;
     constructor(parameters: LineParameters);
 }

package/lib/ValueObjects/ParametricLine.js

@@ -7,9 +7,10 @@ class ParametricLine {
         this.x0 = parameters.x0;
         this.y0 = parameters.y0;
         this.z0 = parameters.z0;
-        this.a = parameters.a;
-        this.b = parameters.b;
-        this.c = parameters.c;
+        const dir = new Vector3_1.Vector3(parameters.a, parameters.b, parameters.c).unit;
+        this.a = dir.x;
+        this.b = dir.y;
+        this.c = dir.z;
     }
     // See https://planetcalc.com/8253/
     static FromTwoPoint(p1, p2) {
@@ -62,5 +63,14 @@ class ParametricLine {
         const z = line.z0 + line.c * distance;
         return new Vector3_1.Vector3(x, y, z);
     }
+    static GetDistanceToPoint(line, point) {
+        return Vector3_1.Vector3.Subtract(line.origin, point).magnitude;
+    }
+    get origin() {
+        return new Vector3_1.Vector3(this.x0, this.y0, this.z0);
+    }
+    get direction() {
+        return new Vector3_1.Vector3(this.a, this.b, this.c);
+    }
 }
 exports.ParametricLine = ParametricLine;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vived/app",
-  "version": "4.11.3",
+  "version": "4.13.0",
   "description": "Public package for the VIVED Learning App system",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",