kitchen-simulator 3.1.12 → 3.1.13

package/es/utils/geometry.js

@@ -2481,7 +2481,7 @@ function getAllItems2(curItem, layer) {
       height: height
     };
     if (curItem.get('id') !== item.id) {
-      var detectObjectsAtSameAltitudeFlag = item.layoutpos === 'Base' ? item.properties.getIn(['altitude', '_length']) <= curItem.get('properties').getIn(['altitude', '_length']) + tempHeight.get('_length') : item.properties.getIn(['altitude', '_length']) + item.properties.getIn(['height', '_length']) >= curItem.get('properties').getIn(['altitude', '_length']);
+      var detectObjectsAtSameAltitudeFlag = curItem.get('layoutpos') === 'Base' ? item.properties.getIn(['altitude', '_length']) <= curItem.get('properties').getIn(['altitude', '_length']) + tempHeight.get('_length') : item.properties.getIn(['altitude', '_length']) + item.properties.getIn(['height', '_length']) >= curItem.get('properties').getIn(['altitude', '_length']);
       if (detectObjectsAtSameAltitudeFlag) {
         var x = val.pos.x;
         var y = val.pos.y;
@@ -2531,9 +2531,9 @@ export function calcDistancesFromItemToWalls(curItem, layer) {
     height = convert(curItem.info.sizeinfo.depth).from('in').to('cm');
   }
   var center_h = 3 * height / 8;
-  var center_x = x;
+  var center_x = x; // middle of front line of cabinet rect
   var center_y = y;
-  var center_x1 = x - center_h * Math.sin(rotRad);
+  var center_x1 = x - center_h * Math.sin(rotRad); // center point of cabinet rect
   var center_y1 = y + center_h * Math.cos(rotRad);
   var PointArray = [];
   var itemInfo = {
@@ -2552,20 +2552,33 @@ export function calcDistancesFromItemToWalls(curItem, layer) {
   var allLines = getAllLines(layer);
   var allLineRects = buildRectFromLines(layer, allLines);
   var allRect = allLineRects.concat(allItemRect.others);
-  curiteminfo.rectCenterPoint.forEach(function (centerpoint) {
-    var comparelength = [];
+  var _loop = function _loop(i) {
+    // [rectCenterPoint] has four middle points of cabinet rect edges
+    var centerpoint = curiteminfo.rectCenterPoint[i];
+    var comparelength = []; // distance array from rectCenterPoint[i] to other lines(walls, other cabinet rect edges)
     var a;
-    var RectLineFuction;
+    var RectLineFuction; // normal line of cabinet rect edge
     if (centerpoint[1] === 180 || centerpoint[1] === 0) RectLineFuction = linePassingThroughTwoPoints(centerpoint[0].x, centerpoint[0].y, center_x1, center_y1);else RectLineFuction = linePassingThroughTwoPoints(centerpoint[0].x, centerpoint[0].y, center_x, center_y);
     allRect.forEach(function (linerect) {
+      // calc distance to all other lines
       var p0 = clone_point(linerect.rect[2]);
       var p1 = clone_point(linerect.rect[3]);
-      var lineFunction = {};
+      var lineFunction = {}; // other line function
       if (p0.x !== p1.x || p0.y !== p1.y) lineFunction = linePassingThroughTwoPoints(p0.x, p0.y, p1.x, p1.y);
+      // intersection between normal line and other line
       var coordinatePoint = twoLinesIntersection(lineFunction.a, lineFunction.b, lineFunction.c, RectLineFuction.a, RectLineFuction.b, RectLineFuction.c);
       if (coordinatePoint !== undefined) {
-        if (pointsDistance(p0.x, p0.y, p1.x, p1.y) > pointsDistance(p0.x, p0.y, coordinatePoint.x, coordinatePoint.y) && pointsDistance(p0.x, p0.y, p1.x, p1.y) > pointsDistance(p1.x, p1.y, coordinatePoint.x, coordinatePoint.y)) {
-          if (pointsDistance(coordinatePoint.x, coordinatePoint.y, center_x, center_y) > pointsDistance(centerpoint[0].x, centerpoint[0].y, coordinatePoint.x, coordinatePoint.y)) {
+        if (
+        // intersection point is on the other line
+        pointsDistance(p0.x, p0.y, p1.x, p1.y) > pointsDistance(p0.x, p0.y, coordinatePoint.x, coordinatePoint.y) && pointsDistance(p0.x, p0.y, p1.x, p1.y) > pointsDistance(p1.x, p1.y, coordinatePoint.x, coordinatePoint.y)) {
+          // check the intersection point is outside direction of edge
+          var isOutside = true;
+          for (var j = 0; j < curiteminfo.rectCenterPoint.length; j++) {
+            if (j === i) continue;
+            var otherCenterPoint = curiteminfo.rectCenterPoint[j];
+            if (isPointOnLineSegment(centerpoint[0].x, centerpoint[0].y, coordinatePoint.x, coordinatePoint.y, otherCenterPoint[0].x, otherCenterPoint[0].y)) isOutside = false;
+          }
+          if (isOutside && pointsDistance(coordinatePoint.x, coordinatePoint.y, center_x, center_y) > pointsDistance(centerpoint[0].x, centerpoint[0].y, coordinatePoint.x, coordinatePoint.y)) {
             comparelength.push(pointsDistance(centerpoint[0].x, centerpoint[0].y, coordinatePoint.x, coordinatePoint.y));
             a = Math.min.apply(null, comparelength);
           }
@@ -2573,7 +2586,10 @@ export function calcDistancesFromItemToWalls(curItem, layer) {
       }
     });
     PointArray.push([a, centerpoint[1]]);
-  });
+  };
+  for (var i = 0; i < curiteminfo.rectCenterPoint.length; i++) {
+    _loop(i);
+  }
   PointArray.forEach(function (pointElement, index) {
     if (pointElement[0] == undefined) PointArray[index][0] = 0;
   });

package/es/utils/isolate-event-handler.js

@@ -1039,14 +1039,14 @@ function movePan2D3D(props, payload, state) {
       case RIGHT:
         window.interval = setTimeout(function () {
           window.tDKeyDown({
-            keyCode: 39
+            keyCode: 37
           });
         }, 50);
         break;
       case LEFT:
         window.interval = setTimeout(function () {
           window.tDKeyDown({
-            keyCode: 37
+            keyCode: 39
           });
         }, 50);
         break;
@@ -1059,7 +1059,7 @@ export function handleExternalEvent(_x10) {
 function _handleExternalEvent() {
   _handleExternalEvent = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee9(props) {
     var _evt$payload3, _evt$payload4;
-    var evt, state, layerId, layer, _evt$payload, cdsItems, itemKeys, _loop3, i, _props$onInternalEven, sLineCnt, element, _state$viewer2D, _evt$payload$initialP, mouseX, mouseY, v2d, vPosX, vPosY, layerID, defaulTitle, _Object$keys, _evt$payload5, doorStyle, itemCDS, isAll, _layerId, _cdsItems, allItems, selectedItemId, _itemKeys, _loop4, _i2, _props$onInternalEven2, _evt$payload6, roomShapeType, width, height, _doorStyle, value, _value, _evt$payload7, moldingInfo, isGlobal, distElement, _distElement, _evt$payload8, option, _value2, _layerId2, _layer, _layer$getIn, selectedLines, selectedHoles, selectedItems, _i4, _i5, _i6, _evt$payload9, _evt$payload0, _evt$payload1, _evt$payload10, _layerID, _layer2, orginalItemInfo, originalItem, originalItemPos, replaceItem, _props$onInternalEven3, sceneData, currentTexture, _t5;
+    var evt, state, layerId, layer, _evt$payload, cdsItems, itemKeys, _loop3, i, _props$onInternalEven, sLineCnt, _state$getIn, element, cds, _cds$find, currentCdsId, _state$viewer2D, _evt$payload$initialP, mouseX, mouseY, v2d, vPosX, vPosY, layerID, defaulTitle, _Object$keys, _evt$payload5, doorStyle, itemCDS, isAll, _layerId, _cdsItems, allItems, selectedItemId, _itemKeys, _loop4, _i2, _props$onInternalEven2, _evt$payload6, roomShapeType, width, height, _doorStyle, value, _value, _evt$payload7, moldingInfo, isGlobal, distElement, _distElement, _evt$payload8, option, _value2, _layerId2, _layer, _layer$getIn, selectedLines, selectedHoles, selectedItems, _i4, _i5, _i6, _evt$payload9, _evt$payload0, _evt$payload1, _evt$payload10, _layerID, _layer2, orginalItemInfo, originalItem, originalItemPos, replaceItem, _props$onInternalEven3, sceneData, currentTexture, _t5;
     return _regeneratorRuntime.wrap(function (_context1) {
       while (1) switch (_context1.prev = _context1.next) {
         case 0:
@@ -1176,7 +1176,19 @@ function _handleExternalEvent() {
             _context1.next = 11;
             break;
           }
-          element = evt.payload;
+          element = evt.payload; ///// filter the tempPlaceholders using layer-doorstyle-cds
+          cds = (_state$getIn = state.getIn(['scene', 'layers', 'layer-1', 'doorStyle'])) === null || _state$getIn === void 0 ? void 0 : _state$getIn.cds;
+          if (cds) {
+            currentCdsId = (_cds$find = cds.find(function (c) {
+              return c.itemID === element.itemID;
+            })) === null || _cds$find === void 0 ? void 0 : _cds$find.cabinet_door_style_id;
+            if (currentCdsId && element.structure_json.tempPlaceholders.length > 0) {
+              element.structure_json.tempPlaceholders[0] = element.structure_json.tempPlaceholders.find(function (tPlaceholder) {
+                return tPlaceholder.id === currentCdsId;
+              });
+            }
+          }
+          /////
           _context1.next = 10;
           return addItemToCatalog(element, state, props.catalog, props.projectActions);
         case 10:

package/lib/catalog/factories/area-factory-3d.js

@@ -12,7 +12,7 @@ var SharedStyle = _interopRequireWildcard(require("../../shared-style"));
 var _RGBELoader = require("three/examples/jsm/loaders/RGBELoader");
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, "default": e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
 var params = {
-  envMap: "HDR",
+  envMap: 'HDR',
   roughness: 0.9,
   metalness: 0.8,
   exposure: 1.0
@@ -67,7 +67,7 @@ var assignUVs = function assignUVs(geometry) {
     var y3 = position.getY(i + 2);
     uvArray.push((x1 + offset.x) / range.x, (y1 + offset.y) / range.y, (x2 + offset.x) / range.x, (y2 + offset.y) / range.y, (x3 + offset.x) / range.x, (y3 + offset.y) / range.y);
   }
-  geometry.setAttribute("uv", new Three.BufferAttribute(new Float32Array(uvArray), 2));
+  geometry.setAttribute('uv', new Three.BufferAttribute(new Float32Array(uvArray), 2));
   geometry.needsUpdate = true;
 };
 function createArea(element, layer, scene, textures) {
@@ -78,15 +78,15 @@ function createArea(element, layer, scene, textures) {
   var texture = element.texture;
   texture.lengthRepeatScale = 0.01;
   texture.heightRepeatScale = 0.01;
-  var color = element.properties.get("patternColor");
+  var color = element.properties.get('patternColor');
   if (element.selected) {
     color = SharedStyle.AREA_MESH_COLOR.selected;
   } else {
     color = SharedStyle.AREA_MESH_COLOR.unselected;
   }
-  if (texture.uri === undefined || texture.uri == "") {
+  if (texture.uri === undefined || texture.uri == '') {
     // @todo THIS IS A TEMPORARY FIX TO HAVE A DEFAULT FLOOR TEXTURE
-    texture.uri = layer.floorStyle.uri || "https://media.test.diydesignspace.com/uploads/CountTop/202203162950_2/texture/oak-barcelona-s.jpg";
+    texture.uri = layer.floorStyle.uri || 'https://media.test.diydesignspace.com/uploads/CountTop/202203162950_2/texture/oak-barcelona-s.jpg';
   }
   var shape = new _three.Shape();
   shape.moveTo(vertices[0].x, vertices[0].y);
@@ -94,7 +94,7 @@ function createArea(element, layer, scene, textures) {
     shape.lineTo(vertices[i].x, vertices[i].y);
   }
   function loadFloorENV() {
-    return new _RGBELoader.RGBELoader().load("/assets/Window.hdr", function (texture) {
+    return new _RGBELoader.RGBELoader().load('/assets/Window.hdr', function (texture) {
       texture.mapping = Three.EquirectangularReflectionMapping;
       return texture;
     });
@@ -114,8 +114,8 @@ function createArea(element, layer, scene, textures) {
   /* Create holes for the area */
   element.holes.forEach(function (holeID) {
     var holeCoords = [];
-    layer.getIn(["areas", holeID, "vertices"]).forEach(function (vertexID) {
-      var _layer$getIn = layer.getIn(["vertices", vertexID]),
+    layer.getIn(['areas', holeID, 'vertices']).forEach(function (vertexID) {
+      var _layer$getIn = layer.getIn(['vertices', vertexID]),
         x = _layer$getIn.x,
         y = _layer$getIn.y;
       holeCoords.push([x, y]);
@@ -142,7 +142,7 @@ function createArea(element, layer, scene, textures) {
   var area = new _three.Mesh(shapeGeometry, areaMaterial);
   area.rotation.x -= Math.PI / 2;
   area.receiveShadow = true;
-  area.name = "floor";
+  area.name = 'floor';
   // This mesh is use for creating ceiling mesh
 
   var shapeGeometry2 = new Three.ShapeGeometry(shape);
@@ -153,7 +153,7 @@ function createArea(element, layer, scene, textures) {
   area2.castShadow = true;
   area2.rotation.x -= Math.PI / 2;
   area2.receiveShadow = true;
-  area2.name = "floorSupport";
+  area2.name = 'floorSupport';
   var floorSupport = area2.clone();
   area.userData.floorSupport = floorSupport;
   return Promise.resolve(area);
@@ -163,13 +163,13 @@ function updatedArea(element, layer, scene, textures, mesh, oldElement, differen
     selfDestroy();
     return selfBuild();
   };
-  var floor = mesh.getObjectByName("floor");
+  var floor = mesh.getObjectByName('floor');
   floor.receiveShadow = true;
-  if (differences[0] == "selected") {
+  if (differences[0] == 'selected') {
     var color = element.selected ? SharedStyle.AREA_MESH_COLOR.selected : SharedStyle.AREA_MESH_COLOR.unselected;
     floor.material.color.set(color);
-  } else if (differences[0] == "properties") {
-    if (differences[1] === "texture") {
+  } else if (differences[0] == 'properties') {
+    if (differences[1] === 'texture') {
       return noPerf();
     }
   } else return noPerf();

package/lib/catalog/holes/window-clear/planner-element.js

@@ -13,12 +13,12 @@ var _constants = require("../../../constants");
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, "default": e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
 var cached3DWindow = null;
 var _default = exports["default"] = {
-  name: 'Clear Window',
+  name: 'Window',
   prototype: 'holes',
   info: {
     title: 'Clear',
     tag: ['window'],
-    description: 'Clear Window',
+    description: 'Window',
     image: '/assets/img/svg/window/Clear.svg',
     url: '/assets/gltf/window_clear.gltf'
   },