@perceptimagery/dita-configurator-staging 0.1.5004 → 0.1.6000

package/dist/index.js

@@ -111,7 +111,14 @@ var __publicField = (obj, key, value) => {
     host: "https://api.sprie.io"
   };
   const config = Object.freeze(Config$1);
-  const version = "0.1.5004";
+  const version = "0.1.6000";
+  function modifyLensArr(arr, element) {
+    const index = arr.indexOf(element);
+    if (index !== -1) {
+      return [element, ...arr.slice(0, index), ...arr.slice(index + 1)];
+    }
+    return arr;
+  }
   class APIServiceFactory {
     constructor(fetcher) {
       __publicField(this, "isAuthenticated");
@@ -171,7 +178,12 @@ var __publicField = (obj, key, value) => {
     async FetchCustomisationList() {
       const url = `/v1/widget/list-customisation?search=type:Lens,usage:customizer&limit=50`;
       const response = await this.fetcher.Get(url);
-      return response;
+      const defaultLensData = response.data.find((e) => e.sku === "lens-default");
+      const modifiedRes = {
+        ...response,
+        data: modifyLensArr(response.data, defaultLensData)
+      };
+      return modifiedRes;
     }
     async DownloadMA(Avals) {
       try {
@@ -39280,17 +39292,22 @@ var __publicField = (obj, key, value) => {
         });
       });
     }
-    async renderModel(modelContent, decryptionKey) {
+    async renderModel(modelContent, renderAsIs, decryptionKey) {
       const loader = new GLTFLoader();
       if (modelContent) {
         await this.loadEyewearFromGLTF(
           loader,
           modelContent,
           this.renderer,
+          renderAsIs,
           decryptionKey
         );
       }
     }
+    updateScene(gltf) {
+      gltf.scene.scale.set(7, 7, 7);
+      gltf.scene.position.y -= 0.08;
+    }
     updateMaterials(gltf) {
       gltf.scene.scale.set(7, 7, 7);
       gltf.scene.position.y -= 0.08;
@@ -39403,7 +39420,7 @@ var __publicField = (obj, key, value) => {
         }
       });
     }
-    async loadEyewearFromGLTF(loader, modelFileUrl, renderer, decryptionKey) {
+    async loadEyewearFromGLTF(loader, modelFileUrl, renderer, renderAsIs, decryptionKey) {
       const manager = new LoadingManager();
       const ktx2Loader = new KTX2Loader(manager).setTranscoderPath(
         "https://unpkg.com/three@0.146.0/examples/js/libs/basis/"
@@ -39416,7 +39433,11 @@ var __publicField = (obj, key, value) => {
         result2 = await loader.loadAsync(modelFileUrl);
       } else {
         result2 = await this.LoadEncryptedGlb(loader, modelFileUrl, password).then((finalRes) => {
-          this.updateMaterials(finalRes.result);
+          if (renderAsIs) {
+            this.updateScene(finalRes.result);
+          } else {
+            this.updateMaterials(finalRes.result);
+          }
           this.setupAndRenderScene(finalRes.result.scene);
         });
       }
@@ -39472,6 +39493,7 @@ var __publicField = (obj, key, value) => {
               });
               this.renderModel(
                 modelAsset.asset.cloudfrontUrl,
+                true,
                 modelAsset.decryptionKey
               );
               frameContainer.innerHTML = selectedOption.innerHTML;
@@ -39609,6 +39631,7 @@ var __publicField = (obj, key, value) => {
     }
     setupLensMaterial(selectedLens) {
       if (lensMaterial) {
+        console.log(selectedLens);
         if (selectedLens.direction == "u") {
           lensMaterial.color = new Color(selectedLens.color);
           lensMaterial.opacity = selectedLens.opacity;
@@ -39774,7 +39797,7 @@ var __publicField = (obj, key, value) => {
       controls.update();
       controls.enableDamping = true;
       this.renderer.toneMapping = ACESFilmicToneMapping;
-      this.renderer.toneMappingExposure = 1.5;
+      this.renderer.toneMappingExposure = 1.2;
       this.renderer.useLegacyLights = true;
       const PLANE_WIDTH = 2.5;
       const PLANE_HEIGHT = 2.5;
@@ -40044,7 +40067,7 @@ var __publicField = (obj, key, value) => {
           });
           const customRenderer2 = new CustomRenderer(this.apiService);
           if (modelAsset) {
-            customRenderer2.renderModel(modelAsset.asset.cloudfrontUrl, modelAsset.decryptionKey);
+            customRenderer2.renderModel(modelAsset.asset.cloudfrontUrl, false, modelAsset.decryptionKey);
             customRenderer2.setupDropdownAndListeners(assetResult);
             customRenderer2.setupLensDefault(assetResult);
             const list = await this.apiService.FetchCustomisationList();
@@ -40840,6 +40863,7 @@ var __publicField = (obj, key, value) => {
     ] });
   }
   let customRenderer = null;
+  let currentFrame = null;
   async function changeCustomRenderer({
     orgId,
     apiService,
@@ -40849,11 +40873,21 @@ var __publicField = (obj, key, value) => {
     customRenderer = new CustomRenderer(apiService);
     customRenderer.intialize();
     setLoading(true);
+    const frame = frameList[0];
     const apiRes = await apiService.DownloadMA({
       orgId,
-      assetsId: frameList[0]._id
+      assetsId: frame._id
+    });
+    const defaultLens = frame.customisation.length > 0 ? frame.customisation.find((x2) => x2.type == "Lens") : null;
+    customRenderer.renderModel(apiRes.asset.cloudfrontUrl, defaultLens == null, apiRes.decryptionKey).then(() => {
+      if (frame.customisation.length > 0 && defaultLens) {
+        customRenderer.setupLensMaterial(
+          defaultLens
+        );
+      }
+      currentFrame = frame;
+      setLoading(false);
     });
-    customRenderer.renderModel(apiRes.asset.cloudfrontUrl, apiRes.decryptionKey).then(() => setLoading(false));
   }
   function MainContainer({
     orgName,
@@ -40870,24 +40904,58 @@ var __publicField = (obj, key, value) => {
     const changeFrame = (frame) => {
       if (customRenderer) {
         (async () => {
-          setModelLoading(true);
-          const apiRes = await apiService.DownloadMA({
-            orgId,
-            assetsId: frame._id
-          });
-          customRenderer.renderModel(apiRes.asset.cloudfrontUrl, apiRes.decryptionKey).then(() => {
-            setModelLoading(false);
-            customRenderer.setupLensMaterial(
-              selectedLens
-            );
-          });
+          if (selectedLens) {
+            setModelLoading(true);
+            const apiRes = await apiService.DownloadMA({
+              orgId,
+              assetsId: frame._id
+            });
+            const defaultCustomisation = frame.customisation.length > 0 ? frame.customisation.find((x2) => x2.type == "Lens") : null;
+            const renderAsIs = defaultCustomisation == null && selectedLens.sku == "lens-default";
+            customRenderer.renderModel(apiRes.asset.cloudfrontUrl, renderAsIs, apiRes.decryptionKey).then(async () => {
+              if (selectedLens && selectedLens.sku == "lens-default") {
+                if (defaultCustomisation) {
+                  customRenderer.setupLensMaterial(
+                    defaultCustomisation
+                  );
+                } else {
+                  console.log("Special lens detected.");
+                }
+              } else if (selectedLens) {
+                customRenderer.setupLensMaterial(
+                  selectedLens
+                );
+              }
+              currentFrame = frame;
+              setModelLoading(false);
+            });
+          }
         })();
       }
       setSelectedFrame(frame);
     };
-    const changeLensMaterial = (lens) => {
-      if (customRenderer) {
-        customRenderer.setupLensMaterial(lens);
+    const changeLens = async (lens) => {
+      if (customRenderer && currentFrame && lens) {
+        const defaultCustomisation = currentFrame.customisation.length > 0 ? currentFrame.customisation.find((x2) => x2.type == "Lens") : null;
+        const renderAsIs = defaultCustomisation == null && lens.sku == "lens-default";
+        if (lens.sku == "lens-default") {
+          if (defaultCustomisation) {
+            customRenderer.setupLensMaterial(defaultCustomisation);
+          } else {
+            setModelLoading(true);
+            if (currentFrame) {
+              const apiRes = await apiService.DownloadMA({
+                orgId,
+                assetsId: currentFrame._id
+              });
+              customRenderer.renderModel(apiRes.asset.cloudfrontUrl, renderAsIs, apiRes.decryptionKey).then(() => {
+                setModelLoading(false);
+              });
+            }
+          }
+        } else {
+          customRenderer.setupLensMaterial(lens);
+        }
       }
       setSelectedLens(lens);
     };
@@ -40909,7 +40977,7 @@ var __publicField = (obj, key, value) => {
       !viewerOnly && /* @__PURE__ */ jsxRuntimeExports.jsx("div", { id: "Sprie-config-Checkout-Container", children: /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { id: "Sprie-config-Checkout-box", children: [
         /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { id: "Sprie-config-Checkout-header", children: [
           /* @__PURE__ */ jsxRuntimeExports.jsx("div", { id: "Sprie-config-frameName", children: orgName }),
-          /* @__PURE__ */ jsxRuntimeExports.jsx("div", { id: "Sprie-config-lensPrice", children: `+ $${selectedLens == null ? void 0 : selectedLens.price}.00 USD` })
+          /* @__PURE__ */ jsxRuntimeExports.jsx("div", { id: "Sprie-config-lensPrice", children: `${(selectedLens == null ? void 0 : selectedLens.price) ? `+ $${selectedLens == null ? void 0 : selectedLens.price}.00 USD` : ""}` })
         ] }),
         /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { id: "Sprie-config-Checkout-body", children: [
           /* @__PURE__ */ jsxRuntimeExports.jsxs(
@@ -40933,7 +41001,7 @@ var __publicField = (obj, key, value) => {
                     label: "STEP 2 : SELECT LENS COLOUR",
                     lensData: lensList,
                     selectedLens,
-                    changeLensMaterial
+                    changeLensMaterial: changeLens
                   }
                 )
               ]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@perceptimagery/dita-configurator-staging",
-  "version": "0.1.5004",
+  "version": "0.1.6000",
   "author": "Abhishek Deb <abhishek@perceptimagery.com>",
   "license": "UNLICENSED",
   "main": "dist/index.js",