@plattar/plattar-ar-adapter 2.7.1 → 2.7.2

package/dist/ar/scene-ar.js

@@ -6,7 +6,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.SceneAR = void 0;
 const plattar_analytics_1 = require("@plattar/plattar-analytics");
 const plattar_api_1 = require("@plattar/plattar-api");
-const plattar_services_1 = require("@plattar/plattar-services");
 const util_1 = require("../util/util");
 const quicklook_viewer_1 = __importDefault(require("../viewers/quicklook-viewer"));
 const scene_viewer_1 = __importDefault(require("../viewers/scene-viewer"));
@@ -64,58 +63,87 @@ class SceneAR extends launcher_ar_1.LauncherAR {
      * Composes a Scene into an AR Model (remote operation) that can be used to launch
      * an AR File
      */
-    _ComposeScene(scene, output) {
-        return new Promise((accept, reject) => {
-            const sceneProducts = scene.relationships.filter(plattar_api_1.SceneProduct);
-            const sceneModels = scene.relationships.filter(plattar_api_1.SceneModel);
-            // nothing to do if no AR components can be found
-            if ((sceneProducts.length + sceneModels.length) <= 0) {
-                return reject(new Error("SceneAR.ComposeScene() - cannot proceed as scene does not contain AR components"));
+    async _ComposeScene(scene, output) {
+        const sceneProducts = scene.relationships.filter(plattar_api_1.SceneProduct);
+        const sceneModels = scene.relationships.filter(plattar_api_1.SceneModel);
+        // nothing to do if no AR components can be found
+        if ((sceneProducts.length + sceneModels.length) <= 0) {
+            throw new Error("SceneAR.ComposeScene() - cannot proceed as scene does not contain AR components");
+        }
+        const url = `${plattar_api_1.Server.location().type === 'staging' ? 'https://converter.plattar.space' : 'https://converter.plattar.com'}/v3/converter/config-to-model`;
+        const payload = {
+            data: {
+                attributes: {
+                    quality: 100,
+                    output: output,
+                    maps: new Array()
+                }
             }
-            // define our configurator
-            const configurator = new plattar_services_1.Configurator();
-            configurator.server = plattar_api_1.Server.location().type;
-            configurator.output = output;
-            let totalARObjectCount = 0;
-            // add our scene products
-            sceneProducts.forEach((sceneProduct) => {
-                const product = sceneProduct.relationships.find(plattar_api_1.Product);
-                const selection = this._options.variationSelection;
-                // we have a specific product selection
-                if (sceneProduct.attributes.include_in_augment) {
-                    // check if this product is the one we want (from selection optionally)
-                    if (product && (product.id === selection.productID) && selection.variationID) {
-                        configurator.addSceneProduct(sceneProduct.id, selection.variationID);
+        };
+        let totalARObjectCount = 0;
+        // add our scene products
+        sceneProducts.forEach((sceneProduct) => {
+            const product = sceneProduct.relationships.find(plattar_api_1.Product);
+            const selection = this._options.variationSelection;
+            // we have a specific product selection
+            if (sceneProduct.attributes.include_in_augment) {
+                // check if this product is the one we want (from selection optionally)
+                if (product && (product.id === selection.productID) && selection.variationID) {
+                    payload.data.attributes.maps.push({
+                        sceneproduct: sceneProduct.id,
+                        productvariation: selection.variationID
+                    });
+                    totalARObjectCount++;
+                }
+                else if (product) {
+                    // check if this scene-product is the one we want (from selection)
+                    if ((sceneProduct.id === selection.sceneProductID) && selection.variationID) {
+                        payload.data.attributes.maps.push({
+                            sceneproduct: sceneProduct.id,
+                            productvariation: selection.variationID
+                        });
                         totalARObjectCount++;
                     }
-                    else if (product) {
-                        // check if this scene-product is the one we want (from selection)
-                        if ((sceneProduct.id === selection.sceneProductID) && selection.variationID) {
-                            configurator.addSceneProduct(sceneProduct.id, selection.variationID);
-                            totalARObjectCount++;
-                        }
-                        else if (product.attributes.product_variation_id) {
-                            configurator.addSceneProduct(sceneProduct.id, product.attributes.product_variation_id);
-                            totalARObjectCount++;
-                        }
+                    else if (product.attributes.product_variation_id) {
+                        payload.data.attributes.maps.push({
+                            sceneproduct: sceneProduct.id,
+                            productvariation: product.attributes.product_variation_id
+                        });
+                        totalARObjectCount++;
                     }
                 }
-            });
-            // add our scene models
-            sceneModels.forEach((sceneModel) => {
-                if (sceneModel.attributes.include_in_augment) {
-                    configurator.addModel(sceneModel.id);
-                    totalARObjectCount++;
-                }
-            });
-            // ensure we have actually added AR objects
-            if (totalARObjectCount <= 0) {
-                return reject(new Error("SceneAR.ComposeScene() - cannot proceed as scene does not contain any enabled AR components"));
             }
-            return configurator.get().then((result) => {
-                accept(result.filename);
-            }).catch(reject);
         });
+        // add our scene models
+        sceneModels.forEach((sceneModel) => {
+            if (sceneModel.attributes.include_in_augment) {
+                payload.data.attributes.maps.push({
+                    scenemodel: sceneModel.id
+                });
+                totalARObjectCount++;
+            }
+        });
+        // ensure we have actually added AR objects
+        if (totalARObjectCount <= 0) {
+            throw new Error("SceneAR.ComposeScene() - cannot proceed as scene does not contain any enabled AR components");
+        }
+        try {
+            const response = await fetch(url, {
+                method: "POST",
+                headers: {
+                    "Content-Type": "application/json"
+                },
+                body: JSON.stringify(payload)
+            });
+            if (!response.ok) {
+                throw new Error(`SceneAR.ComposeScene() - network response was not ok ${response.status}`);
+            }
+            const data = await response.json();
+            return data.data.attributes.filename;
+        }
+        catch (error) {
+            throw new Error(`SceneAR.ComposeScene() - there was a request error to ${url}, error was ${error.message}`);
+        }
     }
     /**
      * Initialise the SceneAR instance. This returns a Promise that resolves

package/dist/version.d.ts

@@ -1,2 +1,2 @@
-declare const _default: "2.7.1";
+declare const _default: "2.7.2";
 export default _default;

package/dist/version.js

@@ -1,3 +1,3 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = "2.7.1";
+exports.default = "2.7.2";

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@plattar/plattar-ar-adapter",
-	"version": "2.7.1",
+	"version": "2.7.2",
 	"description": "Plattar AR Adapter for interfacing with Google & Apple WebAR",
 	"main": "dist/index.js",
 	"module": "dist/index.js",
@@ -40,7 +40,6 @@
 		"@plattar/plattar-analytics": "^2.7.1",
 		"@plattar/plattar-api": "^2.7.1",
 		"@plattar/plattar-qrcode": "2.7.1",
-		"@plattar/plattar-services": "^2.7.2",
 		"@plattar/plattar-web": "^2.7.2"
 	},
 	"devDependencies": {