@configura/babylon-view 2.2.0 → 2.3.0-alpha.0

package/dist/material/texture.js

@@ -13,6 +13,7 @@ import { GMaterial3DTexture, } from "@configura/web-core/dist/cm/core3D/GMateria
 import { Bump3D, GMaterialClassic } from "@configura/web-core/dist/cm/core3D/GMaterialClassic.js";
 import { GMaterialPBR, MIPS_TEXTURE_LEVEL, } from "@configura/web-core/dist/cm/core3D/GMaterialPBR.js";
 import { CMMIPS_MIMETYPE, extractCmMips, getFileExtension, loadImage, LogObservable, } from "@configura/web-utilities";
+import exifr from "exifr";
 function getImageMimeType(fileExtension) {
     switch (fileExtension.toLowerCase()) {
         case "jpg":
@@ -118,12 +119,49 @@ function loadCachedImage(logger, resourceUrl, renderEnvironment) {
         return textureImageWithMeta.image;
     });
 }
+/**
+ * This is needed because textures are drawn inconsistently when applied in Model Lab
+ * or Catalogue Creator. This ensures consistency with Catalogue Creator (if texture loaded
+ * is an image of jpg/png format)
+ */
+function calculateUvScaling(url) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const img = yield loadImage(url);
+        if (img === undefined) {
+            return { uScale: 1, vScale: 1 };
+        }
+        const fileExtensionMatch = url.match(/\.(jpg|jpeg|png)$/);
+        const fileExtension = fileExtensionMatch ? fileExtensionMatch[1] : "unknown";
+        if (fileExtension !== "jpg" && fileExtension !== "jpeg" && fileExtension !== "png") {
+            return { uScale: 1, vScale: 1 };
+        }
+        const metadata = yield exifr.parse(img, {
+            jfif: fileExtension === "jpg" || fileExtension === "jpeg",
+            ihdr: fileExtension === "png",
+        });
+        const imageWidth = img.naturalWidth;
+        const imageHeight = img.naturalHeight;
+        if (!metadata.XResolution || !metadata.YResolution) {
+            return { uScale: 1, vScale: 1 };
+        }
+        const xResolution = metadata.XResolution;
+        const yResolution = metadata.YResolution;
+        const textureXDimension = imageWidth * (25.4 / xResolution);
+        const textureYDimension = imageHeight * (25.4 / yResolution);
+        const xScale = 1000 / textureXDimension;
+        const yScale = 1000 / textureYDimension;
+        return { uScale: xScale, vScale: yScale };
+    });
+}
 export function loadTextureFromURL(url, renderEnvironment) {
     const task = renderEnvironment.assetsManager.addTextureTask("(loadTextureFromURL)", url);
     return new Promise((resolve, reject) => {
-        task.runTask(renderEnvironment.scene, () => {
+        task.runTask(renderEnvironment.scene, () => __awaiter(this, void 0, void 0, function* () {
+            const { uScale, vScale } = yield calculateUvScaling(task.url);
+            task.texture.uScale = uScale;
+            task.texture.vScale = vScale;
             resolve(task.texture);
-        }, reject);
+        }), reject);
     });
 }
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@configura/babylon-view",
-	"version": "2.2.0",
+	"version": "2.3.0-alpha.0",
 	"license": "Apache-2.0",
 	"type": "module",
 	"main": "dist/index.js",
@@ -22,12 +22,13 @@
 		"@babylonjs/loaders": "5.52.0",
 		"@babylonjs/materials": "5.52.0",
 		"@babylonjs/serializers": "5.52.0",
-		"@configura/web-core": "2.2.0",
-		"@configura/web-utilities": "2.2.0",
-		"babylonjs-gltf2interface": "5.22.0"
+		"@configura/web-core": "2.3.0-alpha.0",
+		"@configura/web-utilities": "2.3.0-alpha.0",
+		"babylonjs-gltf2interface": "5.22.0",
+		"exifr": "^7.1.3"
 	},
 	"devDependencies": {
-		"@configura/web-api": "2.2.0",
+		"@configura/web-api": "2.3.0-alpha.0",
 		"@types/react": "17.0.9",
 		"@types/react-dom": "17.0.6",
 		"del-cli": "^3.0.0",
@@ -36,5 +37,5 @@
 	"publishConfig": {
 		"access": "public"
 	},
-	"gitHead": "4b0f18c99803bda6c74eb89c00d1cf6f29139be1"
+	"gitHead": "45b11d8e97c4f0c6e75cb3bb785005d238ffd046"
 }