@vived/app 2.15.7 → 2.16.0

package/lib/Entities/Babylon.d.ts

@@ -1,4 +1,4 @@
-import { ParametricLine, Vector2, Vector3 } from "../ValueObjects";
+import { ParametricLine, Result, Vector2, Vector3 } from "../ValueObjects";
 export declare type OnBabylonChange = () => void;
 export interface ScenePick {
     mouseRay: ParametricLine;
@@ -16,6 +16,8 @@ export interface Babylon {
     renderCanvas?: HTMLCanvasElement;
     scenePick: (pixelPos: Vector2) => ScenePick;
     sceneRay: (pixelPos: Vector2) => ParametricLine;
+    sceneObjectPick: (pixelPos: Vector2) => Result<string, SceneObjectPickErrors>;
+    makeSceneObjectMeta: (id: string) => object;
     updateCanvasSize: () => void;
     submitRenderCanvas: (canvas: HTMLCanvasElement) => void;
     clearRenderCanvas: () => void;
@@ -28,3 +30,13 @@ export interface Babylon {
     removeObserver: (observer: OnBabylonChange) => void;
 }
 export declare function makeBabylon(): Babylon;
+export declare class SceneObjectPickErrorNoPicker extends Error {
+    constructor();
+}
+export declare class SceneObjectPickErrorNoPick extends Error {
+    constructor();
+}
+export declare class SceneObjectPickErrorNoID extends Error {
+    constructor();
+}
+export declare type SceneObjectPickErrors = SceneObjectPickErrorNoPicker | SceneObjectPickErrorNoPick | SceneObjectPickErrorNoID;

package/lib/Entities/Babylon.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.makeBabylon = void 0;
+exports.SceneObjectPickErrorNoID = exports.SceneObjectPickErrorNoPick = exports.SceneObjectPickErrorNoPicker = exports.makeBabylon = void 0;
 const ValueObjects_1 = require("../ValueObjects");
 const MemoizedBoolean_1 = require("./MemoizedBoolean");
 const MemoizedVector2_1 = require("./MemoizedVector2");
@@ -11,6 +11,7 @@ function makeBabylon() {
 exports.makeBabylon = makeBabylon;
 class BabylonImp {
     constructor() {
+        this._scenePickerHasBeenSet = false;
         this.scenePick = () => {
             console.warn("orignal scene picker");
             return {
@@ -73,10 +74,32 @@ class BabylonImp {
         };
         this.registerScenePicker = (picker) => {
             this.scenePick = picker;
+            this._scenePickerHasBeenSet = true;
         };
         this.registerSceneRayer = (rayer) => {
             this.sceneRay = rayer;
         };
+        this.sceneObjectPick = (pixelPos) => {
+            var _a;
+            if (!this._scenePickerHasBeenSet) {
+                return ValueObjects_1.reject(new SceneObjectPickErrorNoPicker());
+            }
+            const scenePick = this.scenePick(pixelPos);
+            if (!scenePick.hit) {
+                return ValueObjects_1.reject(new SceneObjectPickErrorNoPick());
+            }
+            if (!((_a = scenePick.objectPickMeta) === null || _a === void 0 ? void 0 : _a.hasOwnProperty("sceneObjectID"))) {
+                return ValueObjects_1.reject(new SceneObjectPickErrorNoID());
+            }
+            const sceneObjectId = scenePick.objectPickMeta.sceneObjectID;
+            if (!sceneObjectId) {
+                return ValueObjects_1.reject(new SceneObjectPickErrorNoID());
+            }
+            return ValueObjects_1.resolve(sceneObjectId);
+        };
+        this.makeSceneObjectMeta = (id) => {
+            return { sceneObjectID: id };
+        };
         this.memoizedShowInspector = new MemoizedBoolean_1.MemoizedBoolean(false, this.observers.notify);
         this.memoizedCanvasSize = new MemoizedVector2_1.MemoizedVector2(ValueObjects_1.Vector2.One(), this.observers.notify);
     }
@@ -96,3 +119,24 @@ class BabylonImp {
         this.memoizedCanvasSize.val = val;
     }
 }
+class SceneObjectPickErrorNoPicker extends Error {
+    constructor() {
+        super();
+        this.message = "No picker has been registered";
+    }
+}
+exports.SceneObjectPickErrorNoPicker = SceneObjectPickErrorNoPicker;
+class SceneObjectPickErrorNoPick extends Error {
+    constructor() {
+        super();
+        this.message = "Nothing was picked on";
+    }
+}
+exports.SceneObjectPickErrorNoPick = SceneObjectPickErrorNoPick;
+class SceneObjectPickErrorNoID extends Error {
+    constructor() {
+        super();
+        this.message = "Picked object does not have a scene ID";
+    }
+}
+exports.SceneObjectPickErrorNoID = SceneObjectPickErrorNoID;

package/package.json

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