redhotmagma-visualization 1.26.5 → 1.27.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "redhotmagma-visualization",
-  "version": "1.26.5",
+  "version": "1.27.2",
   "license": "UNLICENSED",
   "private": false,
   "main": "./lib/index.js",
@@ -29,7 +29,7 @@
     "lodash": "^4.17.21",
     "prop-types": "^15.7.2",
     "rimraf": "^3.0.2",
-    "three": "^0.127.0",
+    "three": "^0.131.3",
     "uuid": "^3.4.0"
   },
   "devDependencies": {

package/src/PrintingEffects/EmbroideryEffect.js

@@ -113,6 +113,9 @@ const getImageSrc = imageNode =>
   imageNode.getAttribute("href") || imageNode.getAttribute("xlink:href");
 
 const applyOnChildNode = (imageCanvas, ctx, svgElement) => async node => {
+  if (node.getAttribute("visibility") === "hidden") {
+    return;
+  }
   if (node.tagName === "image") {
     if (getImageSrc(node).startsWith(SVG_DATA_URL_HDR)) {
       await applyOnEmbeddedSvg(node, imageCanvas, ctx, svgElement);

package/src/Three/Three2D.js

@@ -771,6 +771,22 @@ export class Three2D extends ThreeBase {
     }
   }
 
+  getScreenshotSize(targetSize) {
+    let width = get(targetSize, "width", 1024);
+    let height = get(targetSize, "height", 768);
+    const initialRatio = width / height;
+    const modelRatio = this._size.width / this._size.height;
+    if (modelRatio > initialRatio) {
+      height = width / modelRatio;
+    } else {
+      width = height * modelRatio;
+    }
+    return {
+      width,
+      height,
+    };
+  }
+
   async getScreenshots(callback, { designViewList, areaList, variantList, size }) {
     if (!this.renderer) {
       return callback({});
@@ -794,9 +810,6 @@ export class Three2D extends ThreeBase {
 
     const screenshots = {};
 
-    const width = get(size, "width", 1024);
-    const height = get(size, "height", 768);
-
     // store the original camera, variant and renderer size
     const origVariantPath = this._materialVariantPath;
     const origSize = new Vector2();
@@ -816,7 +829,6 @@ export class Three2D extends ThreeBase {
     };
 
     const camera = this.createCameraBase();
-    setOrthographicCameraSize(camera, width, height);
     this._screenshotCamera = camera;
 
     const views = designViewList || designAreaList.map(({ designView }) => designView);
@@ -838,6 +850,9 @@ export class Three2D extends ThreeBase {
                 updateMaterial: false,
               });
 
+              const { width, height } = this.getScreenshotSize(size);
+              setOrthographicCameraSize(camera, width, height);
+
               this.renderer.setSize(width, height);
               this.renderer.setPixelRatio(1);
               camera.zoom = this.getZoomForSize({ width, height });

package/src/Three/Three2DLayers.js

@@ -120,9 +120,6 @@ export class Three2DLayers extends Three2D {
 
     const screenshots = {};
 
-    const width = get(size, "width", 1024);
-    const height = get(size, "height", 768);
-
     // store the original values for restoring afterwards
     const origDesignView = this.getCurrentDesignView();
     const origCamera = this.camera;
@@ -144,7 +141,6 @@ export class Three2DLayers extends Three2D {
     };
 
     const camera = this.createCameraBase();
-    setOrthographicCameraSize(camera, width, height);
     this._screenshotCamera = camera;
 
     const views =
@@ -160,6 +156,10 @@ export class Three2DLayers extends Three2D {
 
       try {
         await this.updateView(view);
+
+        const { width, height } = this.getScreenshotSize(size);
+        setOrthographicCameraSize(camera, width, height);
+
         this.renderer.setSize(width, height);
         this.renderer.setPixelRatio(1);