@crystaldesign/real-time-viewer 26.7.0-beta.2 → 26.7.0-beta.3

package/build/esm/index.js

@@ -3161,6 +3161,7 @@ var customMat = /*#__PURE__*/function () {
     var setDataRow,
       sceneStore,
       url,
+      normalizedEnvironment,
       doReCtrTex,
       _mat,
       res,
@@ -3178,9 +3179,13 @@ var customMat = /*#__PURE__*/function () {
           url.searchParams.append('isStdMat', _customMat.isStdMat.toString());
           url.searchParams.append('blob', _customMat.blob);
           url.searchParams.append('isIDM3D', _customMat.isIDM3D.toString());
+          if (_customMat.idm3DEnvironment) {
+            normalizedEnvironment = _customMat.idm3DEnvironment.trim();
+            if (normalizedEnvironment) url.searchParams.append('idm3DEnvironment', normalizedEnvironment);
+          }
           url.searchParams.append('debug', JSON.stringify(!!sceneStore.apiConfig.useDebugUrl));
           if (_customMat.tiling) url.searchParams.append('tiling', JSON.stringify(_customMat.tiling));
-          _context.prev = 9;
+          _context.prev = 10;
           // need to re construct the textures, due to data loss(tiling, mimetype, etc.) on glbasync export after parse/serialize of a mat
           // just triggers the right things for that to work, texture itself is cached so no real perf impact 
           doReCtrTex = function doReCtrTex(texture) {
@@ -3195,18 +3200,18 @@ var customMat = /*#__PURE__*/function () {
             reCtrTex._mimeType = texture.url.endsWith('.jpg') ? 'image/jpeg' : 'image/png';
             return reCtrTex;
           };
-          _context.next = 13;
+          _context.next = 14;
           return fetch(url.toString(), {
             method: 'GET',
             headers: {
               Authorization: "Bearer ".concat(sceneStore.jwt)
             }
           });
-        case 13:
+        case 14:
           _mat = _context.sent;
-          _context.next = 16;
+          _context.next = 17;
           return _mat.json();
-        case 16:
+        case 17:
           res = _context.sent;
           parsedMat = PBRMetallicRoughnessMaterial.Parse(res, _customMat.scene, '');
           parsedMat.baseTexture = doReCtrTex(parsedMat.baseTexture);
@@ -3226,9 +3231,9 @@ var customMat = /*#__PURE__*/function () {
             mat: parsedMat,
             found: true
           });
-        case 27:
-          _context.prev = 27;
-          _context.t0 = _context["catch"](9);
+        case 28:
+          _context.prev = 28;
+          _context.t0 = _context["catch"](10);
           if (setDataRow) useUtilStoreContext().setAnalyzeDataRow({
             type: 'MAT',
             found: false,
@@ -3237,17 +3242,17 @@ var customMat = /*#__PURE__*/function () {
             path: _customMat.blob,
             sizeMb: 0
           });
-        case 30:
+        case 31:
           mat = new PBRMetallicRoughnessMaterial(_customMat.name, sceneStore.scene);
           return _context.abrupt("return", {
             mat: mat,
             found: true
           });
-        case 32:
+        case 33:
         case "end":
           return _context.stop();
       }
-    }, _callee, null, [[9, 27]]);
+    }, _callee, null, [[10, 28]]);
   }));
   return function customMat(_x) {
     return _ref.apply(this, arguments);
@@ -3258,6 +3263,13 @@ function _createForOfIteratorHelper$3(r, e) { var t = "undefined" != typeof Symb
 function _unsupportedIterableToArray$3(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray$3(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray$3(r, a) : void 0; } }
 function _arrayLikeToArray$3(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
 getLogger('RealTimeViewer', 'FindAsset');
+var DEFAULT_IDM3D_ENVIRONMENT = 'diva.ro';
+function getIDM3DEnvironment(idm3DEnvironment) {
+  if (!idm3DEnvironment) return DEFAULT_IDM3D_ENVIRONMENT;
+  var normalizedEnvironment = idm3DEnvironment.trim();
+  if (!normalizedEnvironment) return DEFAULT_IDM3D_ENVIRONMENT;
+  return normalizedEnvironment;
+}
 function findAssets(_x, _x2) {
   return _findAssets.apply(this, arguments);
 }
@@ -3340,7 +3352,7 @@ function _findAssets() {
             }));
             return _importGeo.apply(this, arguments);
           };
-          importGeo = function _importGeo2(_x13, _x14) {
+          importGeo = function _importGeo2(_x14, _x15) {
             return _importGeo.apply(this, arguments);
           };
           _unifyAndSetStdMats = function _unifyAndSetStdMats3() {
@@ -3366,7 +3378,7 @@ function _findAssets() {
                   case 8:
                     name = 'std_' + name;
                     _context.next = 11;
-                    return createOrGetMaterial(name, path, splittedName[0], true, true, false, undefined, true);
+                    return createOrGetMaterial(name, path, splittedName[0], true, true, false, undefined, undefined, true);
                   case 11:
                     mat = _context.sent;
                     if (!mat.found) utilStore.setAnalyzeDataRow({
@@ -3434,7 +3446,7 @@ function _findAssets() {
             }));
             return _unifyAndSetStdMats.apply(this, arguments);
           };
-          unifyAndSetStdMats = function _unifyAndSetStdMats2(_x11, _x12) {
+          unifyAndSetStdMats = function _unifyAndSetStdMats2(_x12, _x13) {
             return _unifyAndSetStdMats.apply(this, arguments);
           };
           sceneStore = useSceneStoreContext();
@@ -3449,7 +3461,7 @@ function _findAssets() {
           _iterator = _createForOfIteratorHelper$3(assets.geos);
           _context5.prev = 11;
           _loop = /*#__PURE__*/_regeneratorRuntime.mark(function _loop() {
-            var geo, path, idm_path, mesh, cachedGeo;
+            var geo, path, idm_path, idm3DEnvironment, mesh, cachedGeo;
             return _regeneratorRuntime.wrap(function _loop$(_context3) {
               while (1) switch (_context3.prev = _context3.next) {
                 case 0:
@@ -3457,7 +3469,8 @@ function _findAssets() {
                   path = sceneStore.apiConfig.diva3darchive + '/' + geo.blob + '/' + geo.catCodex + '/AR/';
                   if (geo.isIDM3D) {
                     idm_path = geo.name.split('.');
-                    path = sceneStore.apiConfig.diva3darchive + '/IDM3D_ARCHIV/GEOMETRIES/' + idm_path[0] + '/' + idm_path[1] + '/';
+                    idm3DEnvironment = getIDM3DEnvironment(geo.idm3DEnvironment);
+                    path = sceneStore.apiConfig.diva3darchive + '/IDM3D_ARCHIV/' + idm3DEnvironment + '/GEOMETRIES/' + idm_path[0] + '/' + idm_path[1] + '/';
                   }
                   //! check if cached
                   if (!cache.find(function (cachedElement) {
@@ -3554,7 +3567,7 @@ function _findAssets() {
                   return _context4.abrupt("return", 1);
                 case 5:
                   _context4.next = 7;
-                  return createOrGetMaterial(mat.id + '_' + mat.name, mat.blob, mat.name, true, false, !!mat.isIDM3D, {
+                  return createOrGetMaterial(mat.id + '_' + mat.name, mat.blob, mat.name, true, false, !!mat.isIDM3D, mat.idm3DEnvironment, {
                     tileU: mat.tileU,
                     tileV: mat.tileV
                   }, true);
@@ -3574,7 +3587,7 @@ function _findAssets() {
                   _context4.t3 = newCache;
                   _context4.t4 = mat.id;
                   _context4.next = 17;
-                  return createOrGetMaterial(mat.id + '_' + mat.name, mat.blob, mat.name, true, false, !!mat.isIDM3D, {
+                  return createOrGetMaterial(mat.id + '_' + mat.name, mat.blob, mat.name, true, false, !!mat.isIDM3D, mat.idm3DEnvironment, {
                     tileU: mat.tileU,
                     tileV: mat.tileV
                   }, true);
@@ -3639,11 +3652,11 @@ function _findAssets() {
   }));
   return _findAssets.apply(this, arguments);
 }
-function createOrGetMaterial(_x3, _x4, _x5, _x6, _x7, _x8, _x9, _x10) {
+function createOrGetMaterial(_x3, _x4, _x5, _x6, _x7, _x8, _x9, _x10, _x11) {
   return _createOrGetMaterial.apply(this, arguments);
 }
 function _createOrGetMaterial() {
-  _createOrGetMaterial = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee4(name, blob, fileName, checkExisting, isStdMat, isIDM3D, tiling, setDataRow) {
+  _createOrGetMaterial = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee4(name, blob, fileName, checkExisting, isStdMat, isIDM3D, idm3DEnvironment, tiling, setDataRow) {
     var sceneStore, uiStore, _iterator5, _step5, cachedMaterial, mat, material;
     return _regeneratorRuntime.wrap(function _callee4$(_context6) {
       while (1) switch (_context6.prev = _context6.next) {
@@ -3690,6 +3703,7 @@ function _createOrGetMaterial() {
           mat = {
             isStdMat: !!isStdMat,
             isIDM3D: isIDM3D,
+            idm3DEnvironment: idm3DEnvironment,
             blob: blob,
             name: name,
             fileName: fileName,

package/build/types/real-time-viewer/src/CustomMaterial/index.d.ts

@@ -6,6 +6,7 @@ export interface CustomMaterial {
     blob: string;
     isStdMat: boolean;
     isIDM3D: boolean;
+    idm3DEnvironment?: string;
     scene: Scene;
     tiling?: {
         tileU: number;

package/build/types/real-time-viewer/src/CustomMaterial/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/CustomMaterial/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAC9C,OAAO,EAAE,4BAA4B,EAAE,MAAM,4DAA4D,CAAC;AAK1G,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,OAAO,CAAC;IAClB,OAAO,EAAE,OAAO,CAAC;IACjB,KAAK,EAAE,KAAK,CAAC;IACb,MAAM,CAAC,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC;CAC3C;AAGD,QAAA,MAAM,SAAS,cAAqB,cAAc,eAAc,OAAO,KAAU,OAAO,CAAC;IAAE,GAAG,EAAE,4BAA4B,CAAC;IAAC,KAAK,EAAE,OAAO,CAAA;CAAE,CAoD7I,CAAC;AAEF,eAAe,SAAS,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/CustomMaterial/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAC9C,OAAO,EAAE,4BAA4B,EAAE,MAAM,4DAA4D,CAAC;AAK1G,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,OAAO,CAAC;IAClB,OAAO,EAAE,OAAO,CAAC;IACjB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,KAAK,EAAE,KAAK,CAAC;IACb,MAAM,CAAC,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC;CAC3C;AAGD,QAAA,MAAM,SAAS,cAAqB,cAAc,eAAc,OAAO,KAAU,OAAO,CAAC;IAAE,GAAG,EAAE,4BAA4B,CAAC;IAAC,KAAK,EAAE,OAAO,CAAA;CAAE,CAwD7I,CAAC;AAEF,eAAe,SAAS,CAAC"}

package/build/types/real-time-viewer/src/parser/findAssets/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../src/parser/findAssets/index.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,aAAa,EAAE,MAAM,sCAAsC,CAAC;AAGrE,OAAO,EAAE,UAAU,EAAW,MAAM,UAAU,CAAC;AAE/C,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAMpC,wBAA8B,UAAU,CAAC,MAAM,EAAE,UAAU,EAAE,KAAK,EAAE,KAAK,EAAE;;;GA0J1E"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../src/parser/findAssets/index.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,aAAa,EAAE,MAAM,sCAAsC,CAAC;AAGrE,OAAO,EAAE,UAAU,EAAW,MAAM,UAAU,CAAC;AAE/C,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAcpC,wBAA8B,UAAU,CAAC,MAAM,EAAE,UAAU,EAAE,KAAK,EAAE,KAAK,EAAE;;;GAsK1E"}

package/build/types/real-time-viewer/src/parser/types.d.ts

@@ -81,6 +81,7 @@ export interface HQS_Geo {
     name: string;
     tempGeoPath?: string;
     isIDM3D?: boolean;
+    idm3DEnvironment?: string;
     blob: string;
     catCodex: string;
     isResizedGeo?: boolean;
@@ -89,6 +90,7 @@ export interface HQS_Mat {
     id: string;
     name: string;
     isIDM3D?: boolean;
+    idm3DEnvironment?: string;
     tileU: number;
     tileV: number;
     tempSubsPath?: string;

package/build/types/real-time-viewer/src/parser/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../../src/parser/types.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../../src/parser/types.ts"],"names":[],"mappings":"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"}