@vived/app 4.14.0 → 4.15.0

package/lib/Components/Transform3D/Mocks/MockRayPanScaleTransformUC.d.ts

@@ -1,5 +1,6 @@
 /// <reference types="jest" />
 import { AppObject } from "../../../AppObject";
+import { ParametricPlane } from "../../../ValueObjects";
 import { RayPanScaleTransformUC } from "../UC";
 export declare class MockRayPanScaleTransformUC extends RayPanScaleTransformUC {
     enabled: boolean;
@@ -10,6 +11,7 @@ export declare class MockRayPanScaleTransformUC extends RayPanScaleTransformUC {
     maxX?: number | undefined;
     minY?: number | undefined;
     maxY?: number | undefined;
+    pickPlane?: ParametricPlane | undefined;
     update: jest.Mock<any, any>;
     initialize: jest.Mock<any, any>;
     finish: jest.Mock<any, any>;

package/lib/Components/Transform3D/Mocks/MockRayScaleTransform.d.ts

@@ -1,5 +1,6 @@
 /// <reference types="jest" />
 import { AppObject } from "../../../AppObject";
+import { ParametricPlane } from "../../../ValueObjects";
 import { ScaleTransformUC } from "../UC";
 export declare class MockRayScaleTransform extends ScaleTransformUC {
     enabled: boolean;
@@ -7,6 +8,7 @@ export declare class MockRayScaleTransform extends ScaleTransformUC {
     raySensitivity: number;
     minScale?: number | undefined;
     maxScale?: number | undefined;
+    pickPlane?: ParametricPlane | undefined;
     updateRay: jest.Mock<any, any>;
     initializeRay: jest.Mock<any, any>;
     finish: jest.Mock<any, any>;

package/lib/Components/Transform3D/UC/BumpTransformScaleAboutPixelPoint.d.ts

@@ -1,10 +1,11 @@
 import { AppObject, AppObjectUC } from "../../../AppObject";
-import { Vector2 } from "../../../ValueObjects";
+import { ParametricPlane, Vector2 } from "../../../ValueObjects";
 export declare abstract class BumpTransformScaleAboutPixelPointUC extends AppObjectUC {
     static readonly type = "BumpTransformScaleAboutPixelPointUC";
     abstract sensitivity: number;
     abstract minScale?: number | undefined;
     abstract maxScale?: number | undefined;
+    abstract pickPlane?: ParametricPlane;
     abstract enabled: boolean;
     abstract allow(): boolean;
     abstract bump(direction: "IN" | "OUT", pixelPosition: Vector2): void;

package/lib/Components/Transform3D/UC/BumpTransformScaleAboutPixelPoint.js

@@ -23,7 +23,7 @@ class BumpTransformScaleAboutPixelPointUCImp extends BumpTransformScaleAboutPixe
             return true;
         };
         this.bump = (direction, pixelPosition) => {
-            var _a;
+            var _a, _b, _c;
             if (!this.enabled)
                 return;
             if (!this.transform)
@@ -36,8 +36,14 @@ class BumpTransformScaleAboutPixelPointUCImp extends BumpTransformScaleAboutPixe
             }
             const currentScale = this.transform.worldScale.x;
             const scaleDelta = bumpDirection * this.sensitivity * currentScale;
-            const pick = Babylon_1.scenePixelPick(pixelPosition, this.appObjects);
-            const pickPoint = (_a = pick === null || pick === void 0 ? void 0 : pick.worldPickPoint) !== null && _a !== void 0 ? _a : ValueObjects_1.Vector3.Zero();
+            let pickPoint = ValueObjects_1.Vector3.Zero();
+            if (this.pickPlane) {
+                const pickRay = Babylon_1.pixelToSceneRay(pixelPosition, this.appObjects);
+                pickPoint = (_a = this.pickPlane.intersectLine(pickRay)) !== null && _a !== void 0 ? _a : ValueObjects_1.Vector3.Zero();
+            }
+            else {
+                pickPoint = (_c = (_b = Babylon_1.scenePixelPick(pixelPosition, this.appObjects)) === null || _b === void 0 ? void 0 : _b.worldPickPoint) !== null && _c !== void 0 ? _c : ValueObjects_1.Vector3.Zero();
+            }
             this.bumpScaleAboutPoint(scaleDelta, pickPoint);
             Dispatcher_1.dispatchStateChange(this.appObjects);
         };

package/lib/Components/Transform3D/UC/PinchTransform.d.ts

@@ -1,11 +1,12 @@
 import { AppObject, AppObjectUC } from "../../../AppObject";
-import { Vector2 } from "../../../ValueObjects";
+import { ParametricPlane, Vector2 } from "../../../ValueObjects";
 export declare abstract class PinchTransformUC extends AppObjectUC {
     static readonly type = "PinchTransformUC";
     abstract sensitivity: number;
     abstract enabled: boolean;
     abstract minScale?: number;
     abstract maxScale?: number;
+    abstract pickPlane?: ParametricPlane;
     abstract doPinch: (touchPos1: Vector2, touchPos2: Vector2) => void;
     abstract initializePinch: (touchPos1: Vector2, touchPos2: Vector2) => void;
     abstract finishPinch: () => void;

package/lib/Components/Transform3D/UC/PinchTransform.js

@@ -20,7 +20,7 @@ class PinchTransformUCImp extends PinchTransformUC {
         this.sensitivity = 0.01;
         this.enabled = true;
         this.previousDistanceBetweenTouches = 0;
-        this.panPlane = ValueObjects_1.ParametricPlane.XY();
+        this._panPlane = ValueObjects_1.ParametricPlane.XY();
         this.pickOffset = ValueObjects_1.Vector3.Zero();
         this.initialScale = 0;
         this.initializePinch = (touchPos1, touchPos2) => {
@@ -30,11 +30,16 @@ class PinchTransformUCImp extends PinchTransformUC {
             this.previousDistanceBetweenTouches = this.getTouchDistance(touchPos1, touchPos2);
             const touchCenter = this.getTouchCenter(touchPos1, touchPos2);
             const scenePick = Babylon_1.scenePixelPick(touchCenter, this.appObjects);
-            const pickPoint = (_a = scenePick === null || scenePick === void 0 ? void 0 : scenePick.worldPickPoint) !== null && _a !== void 0 ? _a : ValueObjects_1.Vector3.Zero();
-            const pickPlaneDirection = ValueObjects_1.Vector3.Backward();
-            this.panPlane = ValueObjects_1.ParametricPlane.FromPointNormal(pickPoint, pickPlaneDirection);
+            if (this.pickPlane) {
+                this._panPlane = this.pickPlane;
+            }
+            else {
+                const pickPoint = (_a = scenePick === null || scenePick === void 0 ? void 0 : scenePick.worldPickPoint) !== null && _a !== void 0 ? _a : ValueObjects_1.Vector3.Zero();
+                const pickPlaneDirection = ValueObjects_1.Vector3.Backward();
+                this._panPlane = ValueObjects_1.ParametricPlane.FromPointNormal(pickPoint, pickPlaneDirection);
+            }
             const pickRay = Babylon_1.pixelToSceneRay(touchCenter, this.appObjects);
-            const planePick = (_b = this.panPlane.intersectLine(pickRay)) !== null && _b !== void 0 ? _b : ValueObjects_1.Vector3.Zero();
+            const planePick = (_b = this._panPlane.intersectLine(pickRay)) !== null && _b !== void 0 ? _b : ValueObjects_1.Vector3.Zero();
             this.pickOffset = this.transform.worldPointToLocal(planePick);
             this.initialScale = this.transform.worldScale.x;
         };
@@ -58,7 +63,7 @@ class PinchTransformUCImp extends PinchTransformUC {
             this.transform.worldScale = new ValueObjects_1.Vector3(newScale, newScale, newScale);
             const touchCenter = this.getTouchCenter(touchPos1, touchPos2);
             const pickRay = Babylon_1.pixelToSceneRay(touchCenter, this.appObjects);
-            const planePick = (_a = this.panPlane.intersectLine(pickRay)) !== null && _a !== void 0 ? _a : ValueObjects_1.Vector3.Zero();
+            const planePick = (_a = this._panPlane.intersectLine(pickRay)) !== null && _a !== void 0 ? _a : ValueObjects_1.Vector3.Zero();
             const globalOffset = this.transform.localPointToWorld(this.pickOffset);
             const delta = ValueObjects_1.Vector3.Subtract(planePick, globalOffset);
             const currentWorldPos = this.transform.worldPosition;

package/lib/Components/Transform3D/UC/RayPanScaleTransform.d.ts

@@ -1,5 +1,5 @@
 import { AppObject, AppObjectUC } from "../../../AppObject";
-import { ParametricLine } from "../../../ValueObjects";
+import { ParametricLine, ParametricPlane } from "../../../ValueObjects";
 export declare abstract class RayPanScaleTransformUC extends AppObjectUC {
     static readonly type = "RayPanScaleTransformUC";
     abstract sensitivity: number;
@@ -10,6 +10,7 @@ export declare abstract class RayPanScaleTransformUC extends AppObjectUC {
     abstract maxX?: number;
     abstract minY?: number;
     abstract maxY?: number;
+    abstract pickPlane?: ParametricPlane;
     abstract update: (ray: ParametricLine) => void;
     abstract initialize: (ray: ParametricLine) => void;
     abstract finish: () => void;

package/lib/Components/Transform3D/UC/RayPanScaleTransform.js

@@ -22,16 +22,21 @@ class RayPanScaleTransformUCImp extends RayPanScaleTransformUC {
         this.allowUpdate = false;
         this.initialScale = 1;
         this.pickOffset = ValueObjects_1.Vector3.Zero();
-        this.panPlane = ValueObjects_1.ParametricPlane.XY();
+        this._panPlane = ValueObjects_1.ParametricPlane.XY();
         this.lastRayLength = 0;
         this.initialize = (ray) => {
             var _a, _b;
             this.allowUpdate = false;
             if (!this.transform)
                 return;
-            const pick = Babylon_1.sceneRayPick(ray, this.appObjects);
-            this.panPlane = ValueObjects_1.ParametricPlane.FromPointNormal((_a = pick === null || pick === void 0 ? void 0 : pick.worldPickPoint) !== null && _a !== void 0 ? _a : ValueObjects_1.Vector3.Zero(), ValueObjects_1.Vector3.Backward());
-            const pickPoint = (_b = this.panPlane.intersectLine(ray)) !== null && _b !== void 0 ? _b : ValueObjects_1.Vector3.Zero();
+            if (this.pickPlane) {
+                this._panPlane = this.pickPlane;
+            }
+            else {
+                const pick = Babylon_1.sceneRayPick(ray, this.appObjects);
+                this._panPlane = ValueObjects_1.ParametricPlane.FromPointNormal((_a = pick === null || pick === void 0 ? void 0 : pick.worldPickPoint) !== null && _a !== void 0 ? _a : ValueObjects_1.Vector3.Zero(), ValueObjects_1.Vector3.Backward());
+            }
+            const pickPoint = (_b = this._panPlane.intersectLine(ray)) !== null && _b !== void 0 ? _b : ValueObjects_1.Vector3.Zero();
             this.lastRayLength = ValueObjects_1.ParametricLine.GetDistanceToPoint(ray, pickPoint);
             this.pickOffset = this.transform.worldPointToLocal(pickPoint);
             this.initialScale = this.transform.worldScale.x;
@@ -45,7 +50,7 @@ class RayPanScaleTransformUCImp extends RayPanScaleTransformUC {
                 return;
             if (!this.transform)
                 return;
-            const pick = (_a = this.panPlane.intersectLine(ray)) !== null && _a !== void 0 ? _a : ValueObjects_1.Vector3.Zero();
+            const pick = (_a = this._panPlane.intersectLine(ray)) !== null && _a !== void 0 ? _a : ValueObjects_1.Vector3.Zero();
             this.updateScale(ray, pick);
             this.updatePosition(pick);
         };

package/lib/Components/Transform3D/UC/ScaleTransform.d.ts

@@ -1,5 +1,5 @@
 import { AppObject, AppObjectUC } from "../../../AppObject";
-import { ParametricLine, Vector2 } from "../../../ValueObjects";
+import { ParametricLine, ParametricPlane, Vector2 } from "../../../ValueObjects";
 export declare abstract class ScaleTransformUC extends AppObjectUC {
     static readonly type = "ScaleTransformUC";
     abstract raySensitivity: number;
@@ -7,6 +7,7 @@ export declare abstract class ScaleTransformUC extends AppObjectUC {
     abstract enabled: boolean;
     abstract minScale?: number;
     abstract maxScale?: number;
+    abstract pickPlane?: ParametricPlane;
     abstract initializeRay: (ray: ParametricLine) => void;
     abstract updateRay: (ray: ParametricLine) => void;
     abstract initializePixel: (pixel: Vector2) => void;

package/lib/Components/Transform3D/UC/ScaleTransform.js

@@ -92,12 +92,16 @@ class ScaleTransformUCImp extends ScaleTransformUC {
         }
     }
     doInitialize(ray) {
-        var _a;
+        var _a, _b, _c;
         this.isScaling = false;
         if (!this.transform)
             return;
-        const pick = Babylon_1.sceneRayPick(ray, this.appObjects);
-        this.pickPoint = (_a = pick === null || pick === void 0 ? void 0 : pick.worldPickPoint) !== null && _a !== void 0 ? _a : ValueObjects_1.Vector3.Zero();
+        if (this.pickPlane) {
+            this.pickPoint = (_a = this.pickPlane.intersectLine(ray)) !== null && _a !== void 0 ? _a : ValueObjects_1.Vector3.Zero();
+        }
+        else {
+            this.pickPoint = (_c = (_b = Babylon_1.sceneRayPick(ray, this.appObjects)) === null || _b === void 0 ? void 0 : _b.worldPickPoint) !== null && _c !== void 0 ? _c : ValueObjects_1.Vector3.Zero();
+        }
         this.initialScale = this.transform.worldScale.x;
         this.isScaling = true;
     }

package/lib/Components/index.d.ts

@@ -1,6 +1,7 @@
 export * from "./App";
 export * from "./Babylon";
 export * from "./Camera";
+export * from "./Challenge";
 export * from "./ChannelModel";
 export * from "./Dispatcher";
 export * from "./Enablement";

package/lib/Components/index.js

@@ -13,6 +13,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./App"), exports);
 __exportStar(require("./Babylon"), exports);
 __exportStar(require("./Camera"), exports);
+__exportStar(require("./Challenge"), exports);
 __exportStar(require("./ChannelModel"), exports);
 __exportStar(require("./Dispatcher"), exports);
 __exportStar(require("./Enablement"), exports);

package/lib/Types/ReactHookPmAdapter.d.ts

@@ -0,0 +1,6 @@
+import { AppObjectRepo } from "../AppObject";
+export interface ReactHookPmAdapter<VM> {
+    defaultVM: VM;
+    subscribe(appObjects: AppObjectRepo, setVM: (vm: VM) => void): void;
+    unsubscribe(appObjects: AppObjectRepo, setVM: (vm: VM) => void): void;
+}

package/lib/Types/ReactHookPmAdapter.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/lib/Types/index.d.ts

@@ -2,3 +2,4 @@ export * from "./AppBoundary";
 export * from "./AssetMetaDTO";
 export * from "./ChannelModelData";
 export * from "./EaseFn";
+export * from "./ReactHookPmAdapter";

package/lib/Types/index.js

@@ -14,3 +14,4 @@ __exportStar(require("./AppBoundary"), exports);
 __exportStar(require("./AssetMetaDTO"), exports);
 __exportStar(require("./ChannelModelData"), exports);
 __exportStar(require("./EaseFn"), exports);
+__exportStar(require("./ReactHookPmAdapter"), exports);

package/package.json

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