@crystaldesign/real-time-viewer 25.7.0-beta.13 → 25.7.0-beta.15

package/build/esm/index.js

@@ -2841,12 +2841,10 @@ var customMat = /*#__PURE__*/function () {
     var setDataRow,
       sceneStore,
       url,
+      doReCtrTex,
       _mat,
       res,
       parsedMat,
-      baseTexture,
-      mRTexture,
-      nTexture,
       found,
       mat,
       _args = arguments;
@@ -2863,27 +2861,34 @@ var customMat = /*#__PURE__*/function () {
           url.searchParams.append('debug', JSON.stringify(!!sceneStore.apiConfig.useDebugUrl));
           if (_customMat.tiling) url.searchParams.append('tiling', JSON.stringify(_customMat.tiling));
           _context.prev = 9;
-          _context.next = 12;
+          // 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) {
+            if (!texture) return texture;
+            var reCtrTex = new Texture(texture.url, _customMat.scene);
+            reCtrTex.uScale = texture.uScale;
+            reCtrTex.vScale = texture.vScale;
+            reCtrTex._mimeType = texture.url.endsWith('.jpg') ? 'image/jpeg' : 'image/png';
+            return reCtrTex;
+          };
+          _context.next = 13;
           return fetch(url.toString(), {
             method: 'GET',
             headers: {
               Authorization: "Bearer ".concat(sceneStore.jwt)
             }
           });
-        case 12:
+        case 13:
           _mat = _context.sent;
-          _context.next = 15;
+          _context.next = 16;
           return _mat.json();
-        case 15:
+        case 16:
           res = _context.sent;
           parsedMat = PBRMetallicRoughnessMaterial.Parse(res, _customMat.scene, '');
           parsedMat.name = _customMat.name;
-          baseTexture = parsedMat.baseTexture;
-          mRTexture = parsedMat.metallicRoughnessTexture;
-          nTexture = parsedMat.normalTexture;
-          if (baseTexture) baseTexture._mimeType = baseTexture.url.endsWith('.jpg') ? 'image/jpeg' : 'image/png';
-          if (mRTexture) mRTexture._mimeType = mRTexture.url.endsWith('.jpg') ? 'image/jpeg' : 'image/png';
-          if (nTexture) nTexture._mimeType = nTexture.url.endsWith('.jpg') ? 'image/jpeg' : 'image/png';
+          parsedMat.baseTexture = doReCtrTex(parsedMat.baseTexture);
+          parsedMat.metallicRoughnessTexture = doReCtrTex(parsedMat.metallicRoughnessTexture);
+          parsedMat.normalTexture = doReCtrTex(parsedMat.normalTexture);
           found = !!parsedMat.baseTexture;
           if (!found) LOG$1.warn('MISSING_MATERIAL: could not get material ' + _customMat.name + ' for iln ' + _customMat.blob);
           if (setDataRow) useUtilStoreContext().setAnalyzeDataRow({
@@ -2898,8 +2903,8 @@ var customMat = /*#__PURE__*/function () {
             mat: parsedMat,
             found: true
           });
-        case 30:
-          _context.prev = 30;
+        case 28:
+          _context.prev = 28;
           _context.t0 = _context["catch"](9);
           if (setDataRow) useUtilStoreContext().setAnalyzeDataRow({
             type: 'MAT',
@@ -2909,17 +2914,17 @@ var customMat = /*#__PURE__*/function () {
             path: _customMat.blob,
             sizeMb: 0
           });
-        case 33:
+        case 31:
           mat = new PBRMetallicRoughnessMaterial(_customMat.name, _customMat.scene);
           return _context.abrupt("return", {
             mat: mat,
             found: true
           });
-        case 35:
+        case 33:
         case "end":
           return _context.stop();
       }
-    }, _callee, null, [[9, 30]]);
+    }, _callee, null, [[9, 28]]);
   }));
   return function customMat(_x) {
     return _ref.apply(this, arguments);

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;AAI1G,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,CAyC7I,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,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,CAiD7I,CAAC;AAEF,eAAe,SAAS,CAAC"}