@configura/babylon-view 2.1.0-alpha.3 → 2.2.0-alpha.0

package/dist/view/SingleProductViewConfiguration.d.ts

@@ -1,33 +1,33 @@
-import { EventListener } from "@configura/web-utilities";
-import { CoordinatorCreator } from "../animation/coordinator/Coordinator.js";
-import { BaseViewConfiguration, BaseViewEventMap } from "./BaseViewConfiguration.js";
-export interface SingleProductViewConfiguration extends BaseViewConfiguration {
-    experimentalAnimationCoordinator?: CoordinatorCreator;
-}
-export interface SingleProductViewEventMap extends BaseViewEventMap {
-    viewPhase: SingleProductViewPhaseEvent;
-}
-export declare type SingleProductViewEventListener<K extends keyof SingleProductViewEventMap> = EventListener<SingleProductViewEventMap, K>;
-export declare type SingleProductViewPhaseEvent = {
-    previous: SingleProductViewPhase;
-    current: SingleProductViewPhase;
-};
-export declare enum SingleProductViewPhase {
-    Idle = "Idle",
-    LoadProductCalled = "LoadProductCalled",
-    RemovePreviousProduct = "RemovePreviousProduct",
-    RemovedProduct = "RemovedProduct",
-    MakeNewProduct = "MakeNewProduct",
-    AddNewProduct = "AddNewProduct",
-    SetApplicationAreas = "SetApplicationAreas",
-    SetModelsAndLoadGeo = "SetModelsAndLoadGeo",
-    GeoLoaded = "GeoLoaded",
-    ApplyGeo = "ApplyGeo",
-    HandleSizing = "HandleSizing",
-    LoadMaterials = "LoadMaterials",
-    ApplyMaterials = "ApplyMaterials",
-    AppliedMaterials = "AppliedMaterials",
-    Aborted = "Aborted",
-    Error = "Error"
-}
+import { EventListener } from "@configura/web-utilities";
+import { CoordinatorCreator } from "../animation/coordinator/Coordinator.js";
+import { BaseViewConfiguration, BaseViewEventMap } from "./BaseViewConfiguration.js";
+export interface SingleProductViewConfiguration extends BaseViewConfiguration {
+    experimentalAnimationCoordinator?: CoordinatorCreator;
+}
+export interface SingleProductViewEventMap extends BaseViewEventMap {
+    viewPhase: SingleProductViewPhaseEvent;
+}
+export declare type SingleProductViewEventListener<K extends keyof SingleProductViewEventMap> = EventListener<SingleProductViewEventMap, K>;
+export declare type SingleProductViewPhaseEvent = {
+    previous: SingleProductViewPhase;
+    current: SingleProductViewPhase;
+};
+export declare enum SingleProductViewPhase {
+    Idle = "Idle",
+    LoadProductCalled = "LoadProductCalled",
+    RemovePreviousProduct = "RemovePreviousProduct",
+    RemovedProduct = "RemovedProduct",
+    MakeNewProduct = "MakeNewProduct",
+    AddNewProduct = "AddNewProduct",
+    SetApplicationAreas = "SetApplicationAreas",
+    SetModelsAndLoadGeo = "SetModelsAndLoadGeo",
+    GeoLoaded = "GeoLoaded",
+    ApplyGeo = "ApplyGeo",
+    HandleSizing = "HandleSizing",
+    LoadMaterials = "LoadMaterials",
+    ApplyMaterials = "ApplyMaterials",
+    AppliedMaterials = "AppliedMaterials",
+    Aborted = "Aborted",
+    Error = "Error"
+}
 //# sourceMappingURL=SingleProductViewConfiguration.d.ts.map

package/dist/view/SingleProductViewConfiguration.js

@@ -1,19 +1,19 @@
-export var SingleProductViewPhase;
-(function (SingleProductViewPhase) {
-    SingleProductViewPhase["Idle"] = "Idle";
-    SingleProductViewPhase["LoadProductCalled"] = "LoadProductCalled";
-    SingleProductViewPhase["RemovePreviousProduct"] = "RemovePreviousProduct";
-    SingleProductViewPhase["RemovedProduct"] = "RemovedProduct";
-    SingleProductViewPhase["MakeNewProduct"] = "MakeNewProduct";
-    SingleProductViewPhase["AddNewProduct"] = "AddNewProduct";
-    SingleProductViewPhase["SetApplicationAreas"] = "SetApplicationAreas";
-    SingleProductViewPhase["SetModelsAndLoadGeo"] = "SetModelsAndLoadGeo";
-    SingleProductViewPhase["GeoLoaded"] = "GeoLoaded";
-    SingleProductViewPhase["ApplyGeo"] = "ApplyGeo";
-    SingleProductViewPhase["HandleSizing"] = "HandleSizing";
-    SingleProductViewPhase["LoadMaterials"] = "LoadMaterials";
-    SingleProductViewPhase["ApplyMaterials"] = "ApplyMaterials";
-    SingleProductViewPhase["AppliedMaterials"] = "AppliedMaterials";
-    SingleProductViewPhase["Aborted"] = "Aborted";
-    SingleProductViewPhase["Error"] = "Error";
-})(SingleProductViewPhase || (SingleProductViewPhase = {}));
+export var SingleProductViewPhase;
+(function (SingleProductViewPhase) {
+    SingleProductViewPhase["Idle"] = "Idle";
+    SingleProductViewPhase["LoadProductCalled"] = "LoadProductCalled";
+    SingleProductViewPhase["RemovePreviousProduct"] = "RemovePreviousProduct";
+    SingleProductViewPhase["RemovedProduct"] = "RemovedProduct";
+    SingleProductViewPhase["MakeNewProduct"] = "MakeNewProduct";
+    SingleProductViewPhase["AddNewProduct"] = "AddNewProduct";
+    SingleProductViewPhase["SetApplicationAreas"] = "SetApplicationAreas";
+    SingleProductViewPhase["SetModelsAndLoadGeo"] = "SetModelsAndLoadGeo";
+    SingleProductViewPhase["GeoLoaded"] = "GeoLoaded";
+    SingleProductViewPhase["ApplyGeo"] = "ApplyGeo";
+    SingleProductViewPhase["HandleSizing"] = "HandleSizing";
+    SingleProductViewPhase["LoadMaterials"] = "LoadMaterials";
+    SingleProductViewPhase["ApplyMaterials"] = "ApplyMaterials";
+    SingleProductViewPhase["AppliedMaterials"] = "AppliedMaterials";
+    SingleProductViewPhase["Aborted"] = "Aborted";
+    SingleProductViewPhase["Error"] = "Error";
+})(SingleProductViewPhase || (SingleProductViewPhase = {}));

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@configura/babylon-view",
-	"version": "2.1.0-alpha.3",
+	"version": "2.2.0-alpha.0",
 	"license": "Apache-2.0",
 	"type": "module",
 	"main": "dist/index.js",
@@ -15,17 +15,22 @@
 		"test": "echo \"Error: run tests from root\" && exit 1"
 	},
 	"dependencies": {
-		"@babylonjs/core": "4.2.0",
-		"@configura/web-core": "2.1.0-alpha.3",
-		"@configura/web-utilities": "2.1.0-alpha.3"
+		"@babylonjs/core": "5.52.0",
+		"@babylonjs/gui": "5.52.0",
+		"@babylonjs/gui-editor": "5.52.0",
+		"@babylonjs/loaders": "5.52.0",
+		"@babylonjs/materials": "5.52.0",
+		"@babylonjs/serializers": "5.52.0",
+		"@configura/web-core": "2.2.0-alpha.0",
+		"@configura/web-utilities": "2.2.0-alpha.0"
 	},
 	"devDependencies": {
-		"@configura/web-api": "2.1.0-alpha.3",
+		"@configura/web-api": "2.2.0-alpha.0",
 		"del-cli": "^3.0.0",
-		"typescript": "4.2"
+		"typescript": "4.5"
 	},
 	"publishConfig": {
 		"access": "public"
 	},
-	"gitHead": "2ef8219ac17b71f67995071c25078424cfeb2f68"
+	"gitHead": "b01f3df9b902478356fb957c7b85ec6e3f2c5e9c"
 }

package/dist/camera/CfgArcRotateCameraPointersInput.d.ts

@@ -1,27 +0,0 @@
-import { ArcRotateCameraPointersInput } from "@babylonjs/core/Cameras/Inputs/arcRotateCameraPointersInput.js";
-import "@babylonjs/core/Engines/Extensions/engine.webVR.js";
-/**
- * This class exists to workaround a severe touch input issue that exists on at least iOS 13.4 in
- * Babylon release 4.1.0 and possibly later.
- *
- * The main workaround is marked with "--- START OF WORKAROUND ---" in the source below.
- *
- * Most of the code below is copied from the Babylon source class BaseCameraPointersInput.ts,
- * which ArcRotateCameraPointersInput extends. Some additional private support code from
- * BaseCameraPointersInput is also included and suffixed with "CfgPatch".
- *
- * @warning: DO NOT do any other changes to this file! They WILL be lost when this workaround is no
- * longer needed.
- *
- * @todo Every time the babylon module is updated to a new release, test if the workaround is still
- * needed. If not, simply remove this file and update CfgOrbitalCamera.ts to not use it.
- */
-export declare class CfgArcRotateCameraPointersInput extends ArcRotateCameraPointersInput {
-    attachControl(noPreventDefault?: boolean): void;
-    detachControl(ignored?: any): void;
-    private _observerCfgPatch;
-    private _onLostFocusCfgPatch;
-    private _pointA;
-    private _pointB;
-}
-//# sourceMappingURL=CfgArcRotateCameraPointersInput.d.ts.map

package/dist/camera/CfgArcRotateCameraPointersInput.js

@@ -1,266 +0,0 @@
-// Disable eslint since this (mostly) isn't our code
-/* eslint-disable */
-import { ArcRotateCameraPointersInput } from "@babylonjs/core/Cameras/Inputs/arcRotateCameraPointersInput.js";
-import "@babylonjs/core/Engines/Extensions/engine.webVR.js"; // isInVRExclusivePointerMode
-import { PointerEventTypes, } from "@babylonjs/core/Events/pointerEvents.js";
-import { Tools } from "@babylonjs/core/Misc/tools.js";
-/**
- * This class exists to workaround a severe touch input issue that exists on at least iOS 13.4 in
- * Babylon release 4.1.0 and possibly later.
- *
- * The main workaround is marked with "--- START OF WORKAROUND ---" in the source below.
- *
- * Most of the code below is copied from the Babylon source class BaseCameraPointersInput.ts,
- * which ArcRotateCameraPointersInput extends. Some additional private support code from
- * BaseCameraPointersInput is also included and suffixed with "CfgPatch".
- *
- * @warning: DO NOT do any other changes to this file! They WILL be lost when this workaround is no
- * longer needed.
- *
- * @todo Every time the babylon module is updated to a new release, test if the workaround is still
- * needed. If not, simply remove this file and update CfgOrbitalCamera.ts to not use it.
- */
-export class CfgArcRotateCameraPointersInput extends ArcRotateCameraPointersInput {
-    constructor() {
-        super(...arguments);
-        this._observerCfgPatch = null;
-        this._onLostFocusCfgPatch = null;
-        this._pointA = null;
-        this._pointB = null;
-    }
-    attachControl(noPreventDefault) {
-        noPreventDefault = Tools.BackCompatCameraNoPreventDefault(arguments);
-        var engine = this.camera.getEngine();
-        const element = engine.getInputElement();
-        var previousPinchSquaredDistance = 0;
-        var previousMultiTouchPanPosition = null;
-        this._pointA = null;
-        this._pointB = null;
-        this._altKey = false;
-        this._ctrlKey = false;
-        this._metaKey = false;
-        this._shiftKey = false;
-        this._buttonsPressed = 0;
-        const pointerInput = (p, s) => {
-            var evt = p.event;
-            let isTouch = evt.pointerType === "touch";
-            if (engine.isInVRExclusivePointerMode) {
-                return;
-            }
-            if (p.type !== PointerEventTypes.POINTERMOVE &&
-                this.buttons.indexOf(evt.button) === -1) {
-                return;
-            }
-            let srcElement = (evt.srcElement || evt.target);
-            this._altKey = evt.altKey;
-            this._ctrlKey = evt.ctrlKey;
-            this._metaKey = evt.metaKey;
-            this._shiftKey = evt.shiftKey;
-            this._buttonsPressed = evt.buttons;
-            if (engine.isPointerLock) {
-                let offsetX = evt.movementX ||
-                    evt.mozMovementX ||
-                    evt.webkitMovementX ||
-                    evt.msMovementX ||
-                    0;
-                let offsetY = evt.movementY ||
-                    evt.mozMovementY ||
-                    evt.webkitMovementY ||
-                    evt.msMovementY ||
-                    0;
-                this.onTouch(null, offsetX, offsetY);
-                this._pointA = null;
-                this._pointB = null;
-            }
-            else if (p.type === PointerEventTypes.POINTERDOWN && srcElement) {
-                try {
-                    srcElement.setPointerCapture(evt.pointerId);
-                }
-                catch (e) {
-                    //Nothing to do with the error. Execution will continue.
-                }
-                if (this._pointA === null) {
-                    this._pointA = {
-                        x: evt.clientX,
-                        y: evt.clientY,
-                        pointerId: evt.pointerId,
-                        type: evt.pointerType,
-                    };
-                }
-                else if (this._pointB === null) {
-                    this._pointB = {
-                        x: evt.clientX,
-                        y: evt.clientY,
-                        pointerId: evt.pointerId,
-                        type: evt.pointerType,
-                    };
-                }
-                this.onButtonDown(evt);
-                if (!noPreventDefault) {
-                    evt.preventDefault();
-                    element && element.focus();
-                }
-            }
-            else if (p.type === PointerEventTypes.POINTERDOUBLETAP) {
-                this.onDoubleTap(evt.pointerType);
-            }
-            else if (p.type === PointerEventTypes.POINTERUP && srcElement) {
-                try {
-                    srcElement.releasePointerCapture(evt.pointerId);
-                }
-                catch (e) {
-                    //Nothing to do with the error.
-                }
-                if (!isTouch) {
-                    this._pointB = null; // Mouse and pen are mono pointer
-                }
-                //would be better to use pointers.remove(evt.pointerId) for multi-touch gestures,
-                //but emptying completely pointers collection is required to fix a bug on iPhone :
-                //when changing orientation while pinching camera,
-                //one pointer stay pressed forever if we don't release all pointers
-                //will be ok to put back pointers.remove(evt.pointerId); when iPhone bug corrected
-                if (engine._badOS) {
-                    this._pointA = this._pointB = null;
-                }
-                else {
-                    //only remove the impacted pointer in case of multi-touch allowing on most
-                    //platforms switching from rotate to zoom and pan seamlessly.
-                    if (this._pointB && this._pointA && this._pointA.pointerId === evt.pointerId) {
-                        this._pointA = this._pointB;
-                        this._pointB = null;
-                    }
-                    else if (this._pointA &&
-                        this._pointB &&
-                        this._pointB.pointerId === evt.pointerId) {
-                        this._pointB = null;
-                    }
-                    else {
-                        this._pointA = this._pointB = null;
-                    }
-                }
-                if (previousPinchSquaredDistance !== 0 || previousMultiTouchPanPosition) {
-                    // Previous pinch data is populated but a button has been lifted
-                    // so pinch has ended.
-                    this.onMultiTouch(this._pointA, this._pointB, previousPinchSquaredDistance, 0, // pinchSquaredDistance
-                    previousMultiTouchPanPosition, null // multiTouchPanPosition
-                    );
-                    previousPinchSquaredDistance = 0;
-                    previousMultiTouchPanPosition = null;
-                }
-                this.onButtonUp(evt);
-                if (!noPreventDefault) {
-                    evt.preventDefault();
-                }
-            }
-            else if (p.type === PointerEventTypes.POINTERMOVE) {
-                if (!noPreventDefault) {
-                    evt.preventDefault();
-                }
-                // --- START OF WORKAROUND ---
-                // At least iOS 13.4 has problems where some touches generates pointer move events
-                // without a starting pointer down event nor a finishing pointer up. It appears
-                // that the triggering cause is using two fingers at almost the same time.
-                //
-                // Babylon.js (version 4.1.0 as of this writing) does not gracefully handle this
-                // but instead starts flickering between the two different touch points since it
-                // does not validate that the pointerID matches the stored point A.
-                //
-                // Babylon also doesn't properly handle when more than two fingers gets pressed or
-                // a third finger gets added, again starting to flicker between the touch points
-                // since it only checks if the pointerID is "point A" and assumes that all other
-                // touches are "point B".
-                //
-                // The short code snippet below provides some filtering and workarounds not yet
-                // present in Babylon. All other code around this workaround comes from the release
-                // version of Babylon 4.1.0, class ArcRotateCameraPointerInput.ts
-                if (engine._badOS) {
-                    // Unknown touch when only one touch is registered, register as second touch
-                    if (this._pointA && !this._pointB && evt.pointerId !== this._pointA.pointerId) {
-                        this._pointB = {
-                            x: evt.clientX,
-                            y: evt.clientY,
-                            pointerId: evt.pointerId,
-                            type: evt.pointerType,
-                        };
-                    }
-                }
-                // The touch does not match either of the registered touches, ignore it
-                if (!((this._pointA && this._pointA.pointerId === evt.pointerId) ||
-                    (this._pointB && this._pointB.pointerId === evt.pointerId))) {
-                    return;
-                }
-                // --- END OF WORKAROUND ---
-                // One button down
-                if (this._pointA && this._pointB === null) {
-                    var offsetX = evt.clientX - this._pointA.x;
-                    var offsetY = evt.clientY - this._pointA.y;
-                    this.onTouch(this._pointA, offsetX, offsetY);
-                    this._pointA.x = evt.clientX;
-                    this._pointA.y = evt.clientY;
-                }
-                // Two buttons down: pinch
-                else if (this._pointA && this._pointB) {
-                    var ed = this._pointA.pointerId === evt.pointerId ? this._pointA : this._pointB;
-                    ed.x = evt.clientX;
-                    ed.y = evt.clientY;
-                    var distX = this._pointA.x - this._pointB.x;
-                    var distY = this._pointA.y - this._pointB.y;
-                    var pinchSquaredDistance = distX * distX + distY * distY;
-                    var multiTouchPanPosition = {
-                        x: (this._pointA.x + this._pointB.x) / 2,
-                        y: (this._pointA.y + this._pointB.y) / 2,
-                        pointerId: evt.pointerId,
-                        type: p.type,
-                    };
-                    this.onMultiTouch(this._pointA, this._pointB, previousPinchSquaredDistance, pinchSquaredDistance, previousMultiTouchPanPosition, multiTouchPanPosition);
-                    previousMultiTouchPanPosition = multiTouchPanPosition;
-                    previousPinchSquaredDistance = pinchSquaredDistance;
-                }
-            }
-        };
-        this._observerCfgPatch = this.camera
-            .getScene()
-            .onPointerObservable.add(pointerInput, PointerEventTypes.POINTERDOWN |
-            PointerEventTypes.POINTERUP |
-            PointerEventTypes.POINTERMOVE);
-        this._onLostFocusCfgPatch = () => {
-            this._pointA = this._pointB = null;
-            previousPinchSquaredDistance = 0;
-            previousMultiTouchPanPosition = null;
-            this.onLostFocus();
-        };
-        element &&
-            element.addEventListener("contextmenu", this.onContextMenu.bind(this), false);
-        let hostWindow = this.camera.getScene().getEngine().getHostWindow();
-        if (hostWindow) {
-            Tools.RegisterTopRootEvents(hostWindow, [
-                { name: "blur", handler: this._onLostFocusCfgPatch },
-            ]);
-        }
-    }
-    detachControl(ignored) {
-        if (this._onLostFocusCfgPatch) {
-            let hostWindow = this.camera.getScene().getEngine().getHostWindow();
-            if (hostWindow) {
-                Tools.UnregisterTopRootEvents(hostWindow, [
-                    { name: "blur", handler: this._onLostFocusCfgPatch },
-                ]);
-            }
-        }
-        if (this._observerCfgPatch) {
-            this.camera.getScene().onPointerObservable.remove(this._observerCfgPatch);
-            this._observerCfgPatch = null;
-            if (this.onContextMenu) {
-                const inputElement = this.camera.getScene().getEngine().getInputElement();
-                inputElement &&
-                    inputElement.removeEventListener("contextmenu", this.onContextMenu);
-            }
-            this._onLostFocusCfgPatch = null;
-        }
-        this._altKey = false;
-        this._ctrlKey = false;
-        this._metaKey = false;
-        this._shiftKey = false;
-        this._buttonsPressed = 0;
-    }
-}