@shopware-ag/dive 1.16.26-beta.3 → 1.17.1

package/README.md

@@ -305,6 +305,14 @@ DIVECommunication class via
             Returns a list of objects of given IDs.
         </td>
     </tr>
+    <tr>
+        <td>
+            <a href="src/com/actions/scene/launchar.ts"> LAUNCH_AR </a>
+        </td>
+        <td>
+            Launches AR mode in native capabilities. (iOS: AR Quick Look, Android: Google Scene Viewer)
+        </td>
+    </tr>
     <tr>
         <td>
             <a href="src/com/actions/object/model/modelloaded.ts"> MODEL_LOADED </a>

package/build/dive.cjs

@@ -766,26 +766,51 @@ var init_Info = __esm({
   }
 });
 
+// src/exporters/usdz/USDZExporter.ts
+var import_USDZExporter, DIVEUSDZExporter;
+var init_USDZExporter = __esm({
+  "src/exporters/usdz/USDZExporter.ts"() {
+    "use strict";
+    import_USDZExporter = require("three/examples/jsm/exporters/USDZExporter");
+    DIVEUSDZExporter = class extends import_USDZExporter.USDZExporter {
+      parse(scene, options) {
+        return super.parse(scene, options);
+      }
+    };
+  }
+});
+
 // src/ar/arquicklook/ARQuickLook.ts
-var import_three5, import_USDZExporter, DIVEARQuickLook;
+var import_three5, DIVEARQuickLook;
 var init_ARQuickLook = __esm({
   "src/ar/arquicklook/ARQuickLook.ts"() {
     "use strict";
     import_three5 = require("three");
-    import_USDZExporter = require("three/examples/jsm/exporters/USDZExporter");
+    init_USDZExporter();
     DIVEARQuickLook = class {
-      static Launch(scene) {
+      static Launch(scene, options) {
         const quickLookScene = new import_three5.Object3D();
         quickLookScene.add(...this.extractModels(scene));
-        return this.launchARFromNode(quickLookScene);
+        return this.launchARFromNode(quickLookScene, options);
       }
       static extractModels(scene) {
         return scene.Root.children;
       }
-      static launchARFromNode(node) {
-        return this._usdzExporter.parse(node, { quickLookCompatible: true }).then((usdz) => {
+      static launchARFromNode(node, options) {
+        return this._usdzExporter.parse(node, {
+          quickLookCompatible: true,
+          ar: {
+            anchoring: { type: "plane" },
+            planeAnchoring: {
+              alignment: (options == null ? void 0 : options.arPlacement) === "vertical" ? "vertical" : "horizontal"
+            }
+          }
+        }).then((usdz) => {
           const blob = new Blob([usdz], { type: "model/vnd.usdz+zip" });
-          const url = URL.createObjectURL(blob);
+          let url = URL.createObjectURL(blob);
+          if ((options == null ? void 0 : options.arScale) === "fixed") {
+            url = url.concat("#allowsContentScaling=0");
+          }
           const a = document.createElement("a");
           a.innerHTML = "<picture></picture>";
           a.rel = "ar";
@@ -795,7 +820,7 @@ var init_ARQuickLook = __esm({
         });
       }
     };
-    DIVEARQuickLook._usdzExporter = new import_USDZExporter.USDZExporter();
+    DIVEARQuickLook._usdzExporter = new DIVEUSDZExporter();
   }
 });
 
@@ -1621,18 +1646,21 @@ var init_WebXRController = __esm({
       Update(frame) {
         this._frameBuffer = frame;
         if (!this._placed) {
-          this._xrCamera.updateMatrixWorld();
-          this._scene.XRRoot.XRHandNode.position.copy(
-            this._handNodeInitialPosition.clone().applyMatrix4(this._xrCamera.matrixWorld)
-          );
-          this._scene.XRRoot.XRHandNode.quaternion.setFromRotationMatrix(
-            this._xrCamera.matrixWorld
-          );
+          this.updateHandNode();
           if (this._origin) {
             this._origin.Update(frame);
           }
         }
       }
+      updateHandNode() {
+        this._xrCamera.updateMatrixWorld();
+        this._scene.XRRoot.XRHandNode.position.copy(
+          this._handNodeInitialPosition.clone().applyMatrix4(this._xrCamera.matrixWorld)
+        );
+        this._scene.XRRoot.XRHandNode.quaternion.setFromRotationMatrix(
+          this._xrCamera.matrixWorld
+        );
+      }
       // placement
       initOrigin() {
         return __async(this, null, function* () {
@@ -1904,6 +1932,54 @@ var init_WebXR = __esm({
   }
 });
 
+// src/ar/sceneviewer/SceneViewer.ts
+var DIVESceneViewer;
+var init_SceneViewer = __esm({
+  "src/ar/sceneviewer/SceneViewer.ts"() {
+    "use strict";
+    DIVESceneViewer = class {
+      static Launch(scene, options) {
+        const url = this.findSceneViewerSrc(scene);
+        this.launchSceneViewer(url, options);
+      }
+      static launchSceneViewer(url, options) {
+        const anchor = document.createElement("a");
+        const noArViewerSigil = "#model-viewer-no-ar-fallback";
+        const location = self.location.toString();
+        const locationUrl = new URL(location);
+        const modelUrl = new URL(url, location);
+        const params = new URLSearchParams(modelUrl.search);
+        locationUrl.hash = noArViewerSigil;
+        params.set("mode", "ar_only");
+        if ((options == null ? void 0 : options.arScale) === "fixed") {
+          params.set("resizable", "false");
+        }
+        if ((options == null ? void 0 : options.arPlacement) === "vertical") {
+          params.set("enable_vertical_placement", "true");
+        }
+        const intent = `intent://arvr.google.com/scene-viewer/1.2?${params.toString() + "&file=" + modelUrl.toString()}#Intent;scheme=https;package=com.google.android.googlequicksearchbox;action=android.intent.action.VIEW;S.browser_fallback_url=${encodeURIComponent(
+          locationUrl.toString()
+        )};end;`;
+        anchor.setAttribute("href", intent);
+        anchor.click();
+      }
+      static findSceneViewerSrc(scene) {
+        let uri = null;
+        scene.traverse((object) => {
+          if (uri) return;
+          if (object.userData.uri) {
+            uri = object.userData.uri;
+          }
+        });
+        if (!uri) {
+          throw new Error("No model found in scene");
+        }
+        return uri;
+      }
+    };
+  }
+});
+
 // src/ar/AR.ts
 var AR_exports = {};
 __export(AR_exports, {
@@ -1916,118 +1992,63 @@ var init_AR = __esm({
     init_Info();
     init_ARQuickLook();
     init_WebXR();
+    init_SceneViewer();
     DIVEAR = class {
       constructor(renderer, scene, controller) {
-        this.arPlacement = "floor";
-        this.arScale = "auto";
         this._renderer = renderer;
         this._scene = scene;
         this._controller = controller;
       }
-      Launch() {
+      Launch(options) {
         return __async(this, null, function* () {
           const system = DIVEInfo.GetSystem();
           if (system === "iOS") {
-            const support = DIVEInfo.GetSupportsARQuickLook();
-            if (!support) {
-              console.log("ARQuickLook not supported");
-              return Promise.reject();
-            }
-            console.log("Launching AR on iOS");
-            yield DIVEARQuickLook.Launch(this._scene);
-            return Promise.resolve();
+            return this.tryARQuickLook();
           }
           if (system === "Android") {
-            this.openSceneViewer();
-            return;
-            const support = yield DIVEInfo.GetSupportsWebXR();
-            if (!support) {
-              console.log(
-                "WebXR not supported. Reason: " + WebXRUnsupportedReason[DIVEInfo.GetWebXRUnsupportedReason()]
-              );
-              return Promise.reject();
+            if (options == null ? void 0 : options.useWebXR) {
+              console.warn("DIVE: WebXR is experimental on Android.");
+              return this.tryWebXR();
             }
-            console.log("Launching AR on Android");
-            yield DIVEWebXR.Launch(
-              this._renderer,
-              this._scene,
-              this._controller
-            );
-            return Promise.resolve();
+            return this.trySceneViewer();
           }
           console.log(
-            "AR not supported. Not a mobile system. (System is " + system + ")"
+            "DIVE: AR not supported. Not a mobile system. (System is " + system + ")"
           );
         });
       }
-      openSceneViewer() {
-        const src = this.createSceneViewerSrc();
-        const anchor = document.createElement("a");
-        const noArViewerSigil = "#model-viewer-no-ar-fallback";
-        const location = self.location.toString();
-        const locationUrl = new URL(location);
-        const modelUrl = new URL(src, location);
-        if (modelUrl.hash) modelUrl.hash = "";
-        const params = new URLSearchParams(modelUrl.search);
-        locationUrl.hash = noArViewerSigil;
-        params.set("mode", "ar_preferred");
-        if (!params.has("disable_occlusion")) {
-          params.set("disable_occlusion", "true");
-        }
-        if (this.arScale === "fixed") {
-          params.set("resizable", "false");
-        }
-        if (this.arPlacement === "wall") {
-          params.set("enable_vertical_placement", "true");
-        }
-        if (params.has("sound")) {
-          const soundUrl = new URL(params.get("sound"), location);
-          params.set("sound", soundUrl.toString());
-        }
-        if (params.has("link")) {
-          const linkUrl = new URL(params.get("link"), location);
-          params.set("link", linkUrl.toString());
-        }
-        console.log("modelUrl.toString()", modelUrl.toString());
-        console.log(
-          "encodeURIComponent(modelUrl.toString())",
-          encodeURIComponent(modelUrl.toString())
-        );
-        const version = "1.0";
-        console.log("USING SCENE VIEWER");
-        console.log("version:", version);
-        console.log("params:", params.toString());
-        console.log("modelUrl:", modelUrl.toString());
-        console.log("locationUrl:", locationUrl.toString());
-        const intent = `intent://arvr.google.com/scene-viewer/${version}?${params.toString() + "&file=" + modelUrl.toString()}#Intent;scheme=https;package=com.google.android.googlequicksearchbox;action=android.intent.action.VIEW;S.browser_fallback_url=${encodeURIComponent(
-          locationUrl.toString()
-        )};end;`;
-        console.log({ intent });
-        const undoHashChange = () => {
-          if (self.location.hash === noArViewerSigil) {
-            self.history.back();
-            console.warn(
-              "Error while trying to present in AR with Scene Viewer"
-            );
-            console.warn("Falling back to next ar-mode");
+      tryARQuickLook(options) {
+        return __async(this, null, function* () {
+          const support = DIVEInfo.GetSupportsARQuickLook();
+          if (!support) {
+            console.log("ARQuickLook not supported");
+            return Promise.reject();
           }
-        };
-        self.addEventListener("hashchange", undoHashChange, { once: true });
-        anchor.setAttribute("href", intent);
-        console.log("Attempting to present in AR with Scene Viewer...");
+          console.log("DIVE: Launching AR with ARQuickLook ...");
+          yield DIVEARQuickLook.Launch(this._scene, options);
+          return Promise.resolve();
+        });
       }
-      createSceneViewerSrc() {
-        let uri = null;
-        this._scene.traverse((object) => {
-          if (uri) return;
-          if (object.userData.uri) {
-            uri = object.userData.uri;
+      tryWebXR() {
+        return __async(this, null, function* () {
+          const support = yield DIVEInfo.GetSupportsWebXR();
+          if (!support) {
+            console.log(
+              "WebXR not supported. Reason: " + WebXRUnsupportedReason[DIVEInfo.GetWebXRUnsupportedReason()]
+            );
+            return Promise.reject();
           }
+          console.log("DIVE: Launching AR with WebXR ...");
+          yield DIVEWebXR.Launch(this._renderer, this._scene, this._controller);
+          return Promise.resolve();
+        });
+      }
+      trySceneViewer(options) {
+        return __async(this, null, function* () {
+          console.log("DIVE: Launching AR with SceneViewer ...");
+          DIVESceneViewer.Launch(this._scene, options);
+          return Promise.resolve();
         });
-        if (!uri) {
-          throw new Error("No model found in scene");
-        }
-        return uri;
       }
     };
   }
@@ -2430,8 +2451,9 @@ var _DIVECommunication = class _DIVECommunication {
         break;
       }
       case "LAUNCH_AR": {
-        this.ar.Launch();
-        returnValue = true;
+        returnValue = this.ar.Launch(
+          payload
+        );
         break;
       }
       default: {
@@ -2528,6 +2550,22 @@ var _DIVECommunication = class _DIVECommunication {
   deleteObject(payload) {
     const deletedObject = this.registered.get(payload.id);
     if (!deletedObject) return false;
+    if (deletedObject.parentId) {
+      this.setParent({
+        object: { id: deletedObject.id },
+        parent: null
+      });
+    }
+    if (deletedObject.entityType === "group") {
+      this.registered.forEach((object) => {
+        if (object.parentId === deletedObject.id) {
+          this.updateObject({
+            id: object.id,
+            parentId: null
+          });
+        }
+      });
+    }
     Object.assign(payload, deletedObject);
     this.registered.delete(payload.id);
     Array.from(this.registered.values()).forEach((object) => {
@@ -2690,6 +2728,10 @@ var _DIVECommunication = class _DIVECommunication {
     if (!sceneObject) return false;
     if (payload.parent === null) {
       this.scene.Root.attach(sceneObject);
+      this.updateObject({
+        id: object.id,
+        parentId: null
+      });
       return true;
     }
     if (payload.object.id === payload.parent.id) {
@@ -2698,14 +2740,26 @@ var _DIVECommunication = class _DIVECommunication {
     const parent = this.registered.get(payload.parent.id);
     if (!parent) {
       this.scene.Root.attach(sceneObject);
+      this.updateObject({
+        id: object.id,
+        parentId: null
+      });
       return true;
     }
     const parentObject = this.scene.GetSceneObject(parent);
     if (!parentObject) {
       this.scene.Root.attach(sceneObject);
+      this.updateObject({
+        id: object.id,
+        parentId: null
+      });
       return true;
     }
     parentObject.attach(sceneObject);
+    this.updateObject({
+      id: object.id,
+      parentId: parent.id
+    });
     return true;
   }
   exportScene(payload) {
@@ -2980,12 +3034,15 @@ var DIVEModel = class extends DIVENode {
     }
   }
   PlaceOnFloor() {
-    var _a;
+    var _a, _b, _c, _d, _e;
     const worldPos = this.getWorldPosition(this._positionWorldBuffer);
     const oldWorldPos = worldPos.clone();
-    worldPos.y = (this._boundingBox.max.y - this._boundingBox.min.y) / 2;
+    (_b = (_a = this._mesh) == null ? void 0 : _a.geometry) == null ? void 0 : _b.computeBoundingBox();
+    const meshBB = (_d = (_c = this._mesh) == null ? void 0 : _c.geometry) == null ? void 0 : _d.boundingBox;
+    if (!meshBB || !this._mesh) return;
+    worldPos.y = worldPos.y - this._mesh.localToWorld(meshBB.min.clone()).y;
     if (worldPos.y === oldWorldPos.y) return;
-    (_a = DIVECommunication.get(this.userData.id)) == null ? void 0 : _a.PerformAction(
+    (_e = DIVECommunication.get(this.userData.id)) == null ? void 0 : _e.PerformAction(
       "UPDATE_OBJECT",
       {
         id: this.userData.id,
@@ -3117,12 +3174,15 @@ var DIVEPrimitive = class extends DIVENode {
     if (this._mesh) this._mesh.material = primitiveMaterial;
   }
   PlaceOnFloor() {
-    var _a;
+    var _a, _b, _c, _d, _e;
     const worldPos = this.getWorldPosition(this._positionWorldBuffer);
     const oldWorldPos = worldPos.clone();
-    worldPos.y = (this._boundingBox.max.y - this._boundingBox.min.y) / 2;
+    (_b = (_a = this._mesh) == null ? void 0 : _a.geometry) == null ? void 0 : _b.computeBoundingBox();
+    const meshBB = (_d = (_c = this._mesh) == null ? void 0 : _c.geometry) == null ? void 0 : _d.boundingBox;
+    if (!meshBB || !this._mesh) return;
+    worldPos.y = worldPos.y - this._mesh.localToWorld(meshBB.min.clone()).y;
     if (worldPos.y === oldWorldPos.y) return;
-    (_a = DIVECommunication.get(this.userData.id)) == null ? void 0 : _a.PerformAction(
+    (_e = DIVECommunication.get(this.userData.id)) == null ? void 0 : _e.PerformAction(
       "UPDATE_OBJECT",
       {
         id: this.userData.id,
@@ -4368,7 +4428,7 @@ init_Info();
 // package.json
 var package_default = {
   name: "@shopware-ag/dive",
-  version: "1.16.26-beta.3",
+  version: "1.17.1",
   description: "Shopware Spatial Framework",
   type: "module",
   main: "./build/dive.cjs",
@@ -4437,7 +4497,8 @@ var package_default = {
     "generate-readme": "yarn generate-readme:transpile && yarn generate-readme:write && yarn generate-readme:cleanup",
     "generate-readme:transpile": "yarn tsc --resolveJsonModule --esModuleInterop ci/readme/generate-readme.ts && mv ci/readme/generate-readme.js ci/readme/generate-readme.cjs",
     "generate-readme:write": "node ci/readme/generate-readme.cjs",
-    "generate-readme:cleanup": `node -e "require('fs').unlinkSync('ci/readme/generate-readme.cjs')"`
+    "generate-readme:cleanup": `node -e "require('fs').unlinkSync('ci/readme/generate-readme.cjs')"`,
+    ci: "yarn lint && yarn coverage && yarn prettier:check && yarn build && bash ci/lint/lint-actions.sh"
   }
 };