kitchen-simulator 4.4.0 → 4.4.1

package/es/components/viewer2d/viewer2d.js

@@ -1410,10 +1410,9 @@ export default function Viewer2D(_ref, _ref2) {
     detectAutoPan: mode2DetectAutopan(mode),
     onMouseDown: onMouseDown,
     onMouseMove: onMouseMove,
-    onMouseUp: onMouseUp
-    // miniaturePosition="none"
-    // toolbarPosition="none"
-    ,
+    onMouseUp: onMouseUp,
+    miniaturePosition: "none",
+    toolbarPosition: "none",
     detectPinchGesture: false,
     disableDoubleClickZoomWithToolAuto: true,
     ref: Viewer

package/es/components/viewer3d/scene-creator.js

@@ -9,7 +9,7 @@ import { disposeObject } from "./three-memory-cleaner";
 import { ANIMATE_STEP_MAX, ANIMATE_STEP_MIN, ARRAY_3D_MODES, ARROW_TEXT_BACKCOLOR, ARROW_TEXT_FONTFACE, ARROW_TEXT_FORECOLOR, BASE_CABINET_LAYOUTPOS, BOTTOM_MOLDING_LOCATION, DECIMAL_PLACES_2, DIFFERENT_VALUES_PATH_LENGTH, DISTANCE_EPSILON, EPSILON, MIDDLE_MOLDING_LOCATION, MODE_DRAGGING_ITEM_3D, MODE_DRAWING_ITEM_3D, MODE_IDLE, MODE_IDLE_3D, MODE_ROTATING_ITEM_3D, OBJTYPE_MESH, SHADE_DARK_PURPLE_COLOR, TOP_MOLDING_LOCATION, UNIT_CENTIMETER, UNIT_FOOT, UNIT_INCH, UNIT_METER, WALL_CABINET_LAYOUTPOS } from "../../constants";
 import { GeometryUtils, IDBroker, MoldingUtils } from "../../utils/export";
 import { convert } from "../../utils/convert-units-lite";
-import { calcDistancesFromItemToWalls, getSnappedWallLines, verticesDistance } from "../../utils/geometry";
+import { calcDistancesFromItemToWalls, getLineSnapPointsOfItem, getSnappedWallLines, isOverlappedTwoItemsOnOneLine, pointsDistance, verticesDistance } from "../../utils/geometry";
 import * as GeomUtils from "../../catalog/utils/geom-utils";
 import { loadTexture } from "../../catalog/utils/item-loader";
 import { returnReplaceableDeepSearchType } from "../viewer2d/utils";
@@ -3035,13 +3035,23 @@ export function createBacksplash(item, layer, planData, scene) {
    */
   var altItems = [],
     flag = false;
+  var D0 = {},
+    D1 = {};
   wallItems.map(function (wallItem) {
     var _wallItem$itemInfo, _wallItem$itemInfo2;
     var altitude = (_wallItem$itemInfo = wallItem.itemInfo) === null || _wallItem$itemInfo === void 0 || (_wallItem$itemInfo = _wallItem$itemInfo.properties) === null || _wallItem$itemInfo === void 0 ? void 0 : _wallItem$itemInfo.get('altitude').get('_length');
     var altitudeUnit = ((_wallItem$itemInfo2 = wallItem.itemInfo) === null || _wallItem$itemInfo2 === void 0 || (_wallItem$itemInfo2 = _wallItem$itemInfo2.properties) === null || _wallItem$itemInfo2 === void 0 ? void 0 : _wallItem$itemInfo2.get('altitude').get('_unit')) || 'cm';
     if (!isEmpty(altitude) && !isEmpty(altitudeUnit)) {
       altitude = convert(altitude).from(altitudeUnit).to('cm');
+      var altPoints = getLineSnapPointsOfItem(layer, curLine, wallItem);
+      if (altPoints.length > 1) {
+        D0 = altPoints[0];
+        D1 = altPoints[1];
+      }
       altItems.push({
+        D0: D0,
+        // D0, D1: item's snapped points with line
+        D1: D1,
         x: wallItem.pos.x,
         width: wallItem.size.width,
         altitude: altitude
@@ -3049,10 +3059,29 @@ export function createBacksplash(item, layer, planData, scene) {
     }
   });
   layer.holes.map(function (hole) {
-    var _hole$properties, _hole$properties2;
+    var _hole$properties, _hole$properties2, _layer$lines, _layer$vertices, _line$vertices, _layer$vertices2, _line$vertices2;
     var width = (_hole$properties = hole.properties) === null || _hole$properties === void 0 ? void 0 : _hole$properties.getIn(['width', 'length']);
     var altitude = (_hole$properties2 = hole.properties) === null || _hole$properties2 === void 0 ? void 0 : _hole$properties2.getIn(['altitude', 'length']);
+    var line = (_layer$lines = layer.lines) === null || _layer$lines === void 0 ? void 0 : _layer$lines.get(curLine === null || curLine === void 0 ? void 0 : curLine.id);
+    var v0 = (_layer$vertices = layer.vertices) === null || _layer$vertices === void 0 ? void 0 : _layer$vertices.get(line === null || line === void 0 || (_line$vertices = line.vertices) === null || _line$vertices === void 0 ? void 0 : _line$vertices.get(0));
+    var v1 = (_layer$vertices2 = layer.vertices) === null || _layer$vertices2 === void 0 ? void 0 : _layer$vertices2.get(line === null || line === void 0 || (_line$vertices2 = line.vertices) === null || _line$vertices2 === void 0 ? void 0 : _line$vertices2.get(1));
+    if (!isEmpty(v0) || !isEmpty(v1)) {
+      var lineLength = pointsDistance(v0.x, v0.y, v1.x, v1.y);
+      var disD0 = lineLength * hole.offset - width / 2;
+      var disD1 = lineLength * hole.offset + width / 2;
+      D0 = {
+        x: v0.x + disD0 * Math.cos(hole.rotRad),
+        y: v0.y + disD0 * Math.sin(hole.rotRad)
+      };
+      D1 = {
+        x: v0.x + disD1 * Math.cos(hole.rotRad),
+        y: v0.y + disD1 * Math.sin(hole.rotRad)
+      };
+    }
     if (!isEmpty(width) && !isEmpty(altitude) && hole.line === (curLine === null || curLine === void 0 ? void 0 : curLine.id)) altItems.push({
+      D0: D0,
+      // D0, D1: hole's two points
+      D1: D1,
       x: hole.x,
       width: width,
       altitude: altitude
@@ -3061,7 +3090,7 @@ export function createBacksplash(item, layer, planData, scene) {
   if (altItems.length > 0) {
     depth = altItems[0].altitude;
     altItems.map(function (altItem) {
-      if (item.pos.x + item.size.width / 2 >= altItem.x - altItem.width / 2 && item.pos.x - item.size.width / 2 <= altItem.x + altItem.width / 2) {
+      if (isOverlappedTwoItemsOnOneLine(layer, curLine, item, altItem)) {
         if (depth >= altItem.altitude) {
           depth = altItem.altitude;
           flag = true;
@@ -3171,9 +3200,9 @@ export function createBacksplash(item, layer, planData, scene) {
   }
   itemToSave.info.id = item.itemInfo.id;
   deleteSpecifiedMeshObjects('backsplash' + item.itemInfo.id);
-  if (Math.abs(item.rotRad % (Math.PI / 2)) < EPSILON) planData.plan.add(backsplash);
+  if (Math.abs(item.rotRad % (Math.PI / 2)) < EPSILON || Math.abs(item.rotRad % (Math.PI / 2) - Math.PI / 2) < EPSILON) planData.plan.add(backsplash);
   backsplash.name = name;
-  backsplash.visible = item.itemInfo.get('backsplashVisible') && backsplashApplied && Math.abs(item.rotRad % (Math.PI / 2)) < EPSILON;
+  backsplash.visible = item.itemInfo.get('backsplashVisible') && backsplashApplied && Math.abs(item.rotRad % (Math.PI / 2)) < EPSILON || Math.abs(item.rotRad % (Math.PI / 2) - Math.PI / 2) < EPSILON;
 
   // Save to scene graph
 

package/es/utils/geometry.js

@@ -2845,4 +2845,83 @@ export function getSnappedWallLines(item, layer, catalog) {
     }
   }
   return snappedWallLines;
+}
+export function getLineSnapPointsOfItem(layer, curLine, item) {
+  var _layer$lines2, _layer$vertices4, _line$vertices3, _layer$vertices5, _line$vertices4;
+  //       V0
+  //       /|
+  //    D0 /|-----------|
+  //       /|           |
+  //       /|    Item   |    ====>   get D0, D1
+  //       /|           |
+  //    D1 /|-----------|
+  //       /|
+  // get v0, v1 of line
+  var line = (_layer$lines2 = layer.lines) === null || _layer$lines2 === void 0 ? void 0 : _layer$lines2.get(curLine === null || curLine === void 0 ? void 0 : curLine.id);
+  var v0 = (_layer$vertices4 = layer.vertices) === null || _layer$vertices4 === void 0 ? void 0 : _layer$vertices4.get(line === null || line === void 0 || (_line$vertices3 = line.vertices) === null || _line$vertices3 === void 0 ? void 0 : _line$vertices3.get(0));
+  var v1 = (_layer$vertices5 = layer.vertices) === null || _layer$vertices5 === void 0 ? void 0 : _layer$vertices5.get(line === null || line === void 0 || (_line$vertices4 = line.vertices) === null || _line$vertices4 === void 0 ? void 0 : _line$vertices4.get(1));
+  var pointGroup = [];
+  if (isEmpty(v0) || isEmpty(v1)) return pointGroup;
+  var itemRect = item === null || item === void 0 ? void 0 : item.rect;
+  if (!isEmpty(itemRect)) {
+    for (var i = 0; i < itemRect.length; i++) {
+      if (distancePointFromLineSegment(v0, v1, itemRect[i].x, itemRect[i].y) < EPSILON) {
+        pointGroup.push(itemRect[i]);
+      }
+    }
+  }
+  return pointGroup;
+}
+export function isOverlappedTwoItemsOnOneLine(layer, curLine, srcItem, desItem) {
+  var _layer$lines3, _layer$vertices6, _line$vertices5, _layer$vertices7, _line$vertices6, _S, _S2, _S3, _S4;
+  if (isEmpty(layer) || isEmpty(curLine) || isEmpty(srcItem) || isEmpty(desItem) || isEmpty(desItem.D0) || isEmpty(desItem.D1)) return false;
+  // get v0, v1 of line
+  var line = (_layer$lines3 = layer.lines) === null || _layer$lines3 === void 0 ? void 0 : _layer$lines3.get(curLine === null || curLine === void 0 ? void 0 : curLine.id);
+  var v0 = (_layer$vertices6 = layer.vertices) === null || _layer$vertices6 === void 0 ? void 0 : _layer$vertices6.get(line === null || line === void 0 || (_line$vertices5 = line.vertices) === null || _line$vertices5 === void 0 ? void 0 : _line$vertices5.get(0));
+  var v1 = (_layer$vertices7 = layer.vertices) === null || _layer$vertices7 === void 0 ? void 0 : _layer$vertices7.get(line === null || line === void 0 || (_line$vertices6 = line.vertices) === null || _line$vertices6 === void 0 ? void 0 : _line$vertices6.get(1));
+  var S0,
+    S1,
+    D0 = desItem === null || desItem === void 0 ? void 0 : desItem.D0,
+    D1 = desItem === null || desItem === void 0 ? void 0 : desItem.D1;
+  if (isEmpty(v0) || isEmpty(v1)) return false;
+  // get distance from v0 to srcItem's S0, S1 and desItem(item or hole)'s D0, D1 are placed on line
+  var srcPoints = getLineSnapPointsOfItem(layer, curLine, srcItem);
+  if (srcPoints.length > 1) {
+    S0 = srcPoints[0];
+    S1 = srcPoints[1];
+  }
+  var disV0S0 = pointsDistance(v0.x, v0.y, (_S = S0) === null || _S === void 0 ? void 0 : _S.x, (_S2 = S0) === null || _S2 === void 0 ? void 0 : _S2.y);
+  var disV0S1 = pointsDistance(v0.x, v0.y, (_S3 = S1) === null || _S3 === void 0 ? void 0 : _S3.x, (_S4 = S1) === null || _S4 === void 0 ? void 0 : _S4.y);
+  var disV0D0 = pointsDistance(v0.x, v0.y, D0.x, D0.y);
+  var disV0D1 = pointsDistance(v0.x, v0.y, D1.x, D1.y);
+  // detect two items are overlapped
+  var maxDisV0S = Math.max(disV0S0, disV0S1);
+  var minDisV0S = Math.min(disV0S0, disV0S1);
+  var maxDisV0D = Math.max(disV0D0, disV0D1);
+  var minDisV0D = Math.min(disV0D0, disV0D1);
+  if (maxDisV0S > maxDisV0D && maxDisV0D - minDisV0S > EPSILON) {
+    //      d0     s0 d1  s1   ===>  maxDisV0S: v0s1, minDisV0S: v0s0, maxDisV0D: v0d1, minDisV0D: v0d0
+    //  v0 __________________________ v1
+    //      |      |  |   |
+    //      |      |  |   |
+    //      |__DI__|__|   |
+    //             |__SI__|
+    /////////////////////////////////////////
+    //      s0     d0     d1   s1  ===>  maxDisV0S: v0s1, minDisV0S: v0s0, maxDisV0D: v0d1, minDisV0D: v0d0
+    //  v0 __________________________ v1
+    //      |      |      |    |
+    //      |      |__DI__|    |
+    //      |_________SI_______|
+    return true;
+  } else if (minDisV0S < minDisV0D && maxDisV0S - minDisV0D > EPSILON) {
+    //      s0     d0 s1  d1   ===>  maxDisV0S: v0s1, minDisV0S: v0s0, maxDisV0D: v0d1, minDisV0D: v0d0
+    //  v0 __________________________ v1
+    //      |      |  |   |
+    //      |      |__DI__|
+    //      |__SI_____|
+    //
+    return true;
+  } else {
+    return false;
+  }
 }