kitchen-simulator 11.19.0 → 11.20.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/es/catalog/utils/item-loader.js +2 -1
- package/es/components/viewer2d/item.js +2 -1
- package/es/components/viewer3d/scene-creator.js +2 -1
- package/es/events/external/handleExternalEvent.util.js +2 -1
- package/es/shared/domain/cabinet-corner.js +6 -0
- package/es/utils/geometry.js +3 -2
- package/es/utils/skinPanelEngine.js +3 -2
- package/lib/catalog/utils/item-loader.js +2 -1
- package/lib/components/viewer2d/item.js +2 -1
- package/lib/components/viewer3d/scene-creator.js +2 -1
- package/lib/events/external/handleExternalEvent.util.js +2 -1
- package/lib/shared/domain/cabinet-corner.js +12 -0
- package/lib/utils/geometry.js +3 -2
- package/lib/utils/skinPanelEngine.js +3 -2
- package/package.json +1 -1
|
@@ -15,6 +15,7 @@ import { loadGLTF } from "./load-obj";
|
|
|
15
15
|
import { animateDoor, getCatalogCabinetSku, isEmpty, translateDrawer } from "../../utils/helper";
|
|
16
16
|
import { isWarningCabinet } from "../../shared/domain/cabinet-warning";
|
|
17
17
|
import { orderCabinetAssemblyKeys } from "../cabinet/cabinet-assembly-order";
|
|
18
|
+
import { isCorner } from "../../shared/domain/cabinet-corner";
|
|
18
19
|
var INITIAL_NORMAL_MAP = '';
|
|
19
20
|
|
|
20
21
|
// env Map ///////////////
|
|
@@ -497,7 +498,7 @@ export function render3DItem(element, layer, scene, sizeinfo, structure_json, is
|
|
|
497
498
|
var isDoubleDoor = door_match && door_match[2] !== undefined;
|
|
498
499
|
(_child$children$ = child.children[0]) === null || _child$children$ === void 0 || _child$children$.children.forEach(function (it) {
|
|
499
500
|
var _it$name, _it$children;
|
|
500
|
-
if (it !== null && it !== void 0 && (_it$name = it.name) !== null && _it$name !== void 0 && _it$name.includes('handle') && (_it$children = it.children) !== null && _it$children !== void 0 && _it$children.length && is_corner
|
|
501
|
+
if (it !== null && it !== void 0 && (_it$name = it.name) !== null && _it$name !== void 0 && _it$name.includes('handle') && (_it$children = it.children) !== null && _it$children !== void 0 && _it$children.length && isCorner(is_corner) && isDoubleDoor) {
|
|
501
502
|
var _child$name, _child$name2, _object1$children, _t0$name, _t0$children;
|
|
502
503
|
var tname = child !== null && child !== void 0 && (_child$name = child.name) !== null && _child$name !== void 0 && _child$name.endsWith('_L') ? child.name.replace('_L', '_R') : child === null || child === void 0 || (_child$name2 = child.name) === null || _child$name2 === void 0 ? void 0 : _child$name2.replace('_R', '_L');
|
|
503
504
|
var tmp = (object1 === null || object1 === void 0 || (_object1$children = object1.children) === null || _object1$children === void 0 ? void 0 : _object1$children.filter(function (item) {
|
|
@@ -6,6 +6,7 @@ import { convert } from "../../utils/convert-units-lite";
|
|
|
6
6
|
import { MODE_ROTATING_ITEM, WALL_CABINET_LAYOUTPOS } from "../../constants";
|
|
7
7
|
import { isWarningCabinet } from "../../shared/domain/cabinet-warning";
|
|
8
8
|
import { calcDistancesFromItemToWalls, findCatalogElement } from "../../utils/geometry";
|
|
9
|
+
import { isCornerCabinet } from "../../shared/domain/cabinet-corner";
|
|
9
10
|
var STYLE_LINE = {
|
|
10
11
|
fill: '#0096fd',
|
|
11
12
|
stroke: '#0096fd'
|
|
@@ -87,7 +88,7 @@ export default function Item(_ref, _ref2) {
|
|
|
87
88
|
length: itemDistanceFromLine,
|
|
88
89
|
angle: rotation,
|
|
89
90
|
rotation: element[1],
|
|
90
|
-
transform: "translate(".concat(element[1] === 180 ? -nw : element[1] === 0 ? nw : 0, ", ").concat(element[1] === 90 ? nh : element[1] === -90 ? (item
|
|
91
|
+
transform: "translate(".concat(element[1] === 180 ? -nw : element[1] === 0 ? nw : 0, ", ").concat(element[1] === 90 ? nh : element[1] === -90 ? !isCornerCabinet(item) ? -(nh + 4) : -nh : 0, ") rotate(").concat(element[1], ", 0, 0)")
|
|
91
92
|
})));
|
|
92
93
|
}
|
|
93
94
|
});
|
|
@@ -17,6 +17,7 @@ import { returnReplaceableDeepSearchType } from "../viewer2d/utils";
|
|
|
17
17
|
import { animateDoor, isElevationView, isEmpty, isImmutable, replaceMeshesWithLineSegments, translateDrawer } from "../../utils/helper";
|
|
18
18
|
import { formatNumber } from "../../utils/math";
|
|
19
19
|
import { toJSIfNeeded } from "../../shared/objects/immutable";
|
|
20
|
+
import { isCornerCabinet } from "../../shared/domain/cabinet-corner";
|
|
20
21
|
export var fVLine = [];
|
|
21
22
|
var scene_mode = null;
|
|
22
23
|
export function parseData(sceneData, actions, catalog, camera, renderer, mode) {
|
|
@@ -3151,7 +3152,7 @@ export function createBacksplash(item, layer, planData, scene) {
|
|
|
3151
3152
|
backsplash.rotation.y = itemToSave.info.rotY;
|
|
3152
3153
|
var allLines = GeometryUtils.getAllLines(layer);
|
|
3153
3154
|
var allLineRects = GeometryUtils.buildRectFromLines(layer, allLines);
|
|
3154
|
-
if (item
|
|
3155
|
+
if (isCornerCabinet(item) && GeometryUtils.isSnappedSideLine(item, allLineRects)) {
|
|
3155
3156
|
// corner cabinet item.itemInfo.getIn(["cabinet_category"]) === "Corner Base Cabinets"
|
|
3156
3157
|
var geometry1 = new Three.BoxGeometry(splashWidth, splashHeight, splashDepth);
|
|
3157
3158
|
// Make backsplash mesh
|
|
@@ -18,6 +18,7 @@ import { returnReplaceableDeepSearchType } from "../../components/viewer2d/utils
|
|
|
18
18
|
import { SVGLoader } from 'three/addons/loaders/SVGLoader';
|
|
19
19
|
import { calcDistancesFromHoleToNearestOneOrWall } from "../../utils/geometry";
|
|
20
20
|
import { loadJSONWithFallback } from "../../shared/domain/asset/load-asset-json";
|
|
21
|
+
import { isCornerCabinet } from "../../shared/domain/cabinet-corner";
|
|
21
22
|
var PRECISION = 2;
|
|
22
23
|
|
|
23
24
|
// ---- compatibility: supports old + optimized props shapes ----
|
|
@@ -284,7 +285,7 @@ function _parseTempPlaceholdersFromCabinetPayload() {
|
|
|
284
285
|
var phname = tempPlaceholders[0].name;
|
|
285
286
|
var newph = undefined;
|
|
286
287
|
var blAdd = true;
|
|
287
|
-
if (cabinetPayload
|
|
288
|
+
if (isCornerCabinet(cabinetPayload)) {
|
|
288
289
|
if (tempData['base_door' + t.name.slice(-2)] && tempData['base_door' + t.name.slice(-2)][0].isLeftPlaceholder()) {
|
|
289
290
|
newph = tempPlaceholders.find(function (el) {
|
|
290
291
|
return el.name.isLeftPlaceholder();
|
|
@@ -0,0 +1,6 @@
|
|
|
1
|
+
export var isCorner = function isCorner(value) {
|
|
2
|
+
return value === 1 || value === true || value === '1' || value === 'true';
|
|
3
|
+
};
|
|
4
|
+
export var isCornerCabinet = function isCornerCabinet(cabinet) {
|
|
5
|
+
return isCorner(cabinet === null || cabinet === void 0 ? void 0 : cabinet.is_corner);
|
|
6
|
+
};
|
package/es/utils/geometry.js
CHANGED
|
@@ -20,6 +20,7 @@ import * as Three from 'three';
|
|
|
20
20
|
import { returnReplaceableDeepSearchType } from "../components/viewer2d/utils.js";
|
|
21
21
|
import { isEmpty } from "./helper.js";
|
|
22
22
|
import { MathUtils } from "./export.js";
|
|
23
|
+
import { isCorner } from "../shared/domain/cabinet-corner.js";
|
|
23
24
|
export function compareVertices(v0, v1) {
|
|
24
25
|
return v0.x === v1.x ? v0.y - v1.y : v0.x - v1.x;
|
|
25
26
|
}
|
|
@@ -927,7 +928,7 @@ export function getAllItemSnap(allItemRects) {
|
|
|
927
928
|
snap1.isSnappedLine = true;
|
|
928
929
|
snap2.isSnappedLine = true;
|
|
929
930
|
}
|
|
930
|
-
if (rect.is_corner) {
|
|
931
|
+
if (isCorner(rect.is_corner)) {
|
|
931
932
|
var _nrot = rect.rotRad + Math.PI * 3 / 2;
|
|
932
933
|
if (_nrot >= Math.PI) _nrot -= Math.PI * 2;
|
|
933
934
|
var snap5 = itemrectInfo(rect.rect[1].x - oy1, rect.rect[1].y + ox1, _nrot, cur && cur.size, rect.layoutpos, rect.is_corner);
|
|
@@ -1162,7 +1163,7 @@ export function getAllLineSnap(allLineRects, curItemRect) {
|
|
|
1162
1163
|
var thick = rect.size.height;
|
|
1163
1164
|
var snap3 = itemInfo(rect.rect[2].x + ox1, rect.rect[2].y + oy1, nrot, cur.size);
|
|
1164
1165
|
var snap4 = itemInfo(rect.rect[3].x + ox0, rect.rect[3].y + oy0, nrot, cur.size);
|
|
1165
|
-
if (!cur.is_corner) {
|
|
1166
|
+
if (!isCorner(cur.is_corner)) {
|
|
1166
1167
|
allLineSnap.push(snap3);
|
|
1167
1168
|
}
|
|
1168
1169
|
allLineSnap.push(snap4);
|
|
@@ -8,6 +8,7 @@ import { MathUtils } from "./export";
|
|
|
8
8
|
import { convert } from "./convert-units-lite";
|
|
9
9
|
import { getCatalogCabinetSku, isEmpty } from "./helper";
|
|
10
10
|
import { SKIN_SKU_BSV_24, SKIN_SKU_BSV_48, SKIN_SKU_WSV_1242, SKIN_SKU_WSV_2442, SKIN_SKU_WSV_2460, SKIN_SKU_USV245325, SKIN_HEIGHT_53_25 } from "../constants/catalog/skinPanel";
|
|
11
|
+
import { isCornerCabinet } from "../shared/domain/cabinet-corner";
|
|
11
12
|
function toCm(item, prop) {
|
|
12
13
|
var unit = item.properties.get(prop).get('_unit') || 'cm';
|
|
13
14
|
var value = item.properties.get(prop).get('_length');
|
|
@@ -31,7 +32,7 @@ export function getSideFaces(item, layer) {
|
|
|
31
32
|
var overlapList = [OVERLAP_INCLUDED, OVERLAP_SAME, OVERLAP_SOME];
|
|
32
33
|
var pos = [[-1, -1], [1, -1], [1, 1], [-1, 1]];
|
|
33
34
|
for (var i = 0; i < 4; i++) {
|
|
34
|
-
if (!item
|
|
35
|
+
if (!isCornerCabinet(item)) {
|
|
35
36
|
if (i === 0) continue; // only left & right & base cabinet's back
|
|
36
37
|
if (i === 2 && item.layoutpos !== BASE_CABINET_LAYOUTPOS) continue;
|
|
37
38
|
}
|
|
@@ -120,7 +121,7 @@ function collectFaces(items, layer) {
|
|
|
120
121
|
return faces;
|
|
121
122
|
}
|
|
122
123
|
function isSnappedWithCornerCabient(srcItem, desItem) {
|
|
123
|
-
if (srcItem
|
|
124
|
+
if (isCornerCabinet(srcItem) || isCornerCabinet(desItem)) {
|
|
124
125
|
return true;
|
|
125
126
|
} else return false;
|
|
126
127
|
}
|
|
@@ -26,6 +26,7 @@ var _loadObj = require("./load-obj");
|
|
|
26
26
|
var _helper = require("../../utils/helper");
|
|
27
27
|
var _cabinetWarning = require("../../shared/domain/cabinet-warning");
|
|
28
28
|
var _cabinetAssemblyOrder = require("../cabinet/cabinet-assembly-order");
|
|
29
|
+
var _cabinetCorner = require("../../shared/domain/cabinet-corner");
|
|
29
30
|
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" != _typeof3(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 _t2 in e) "default" !== _t2 && {}.hasOwnProperty.call(e, _t2) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t2)) && (i.get || i.set) ? o(f, _t2, i) : f[_t2] = e[_t2]); return f; })(e, t); }
|
|
30
31
|
function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
|
|
31
32
|
function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2["default"])(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
|
|
@@ -511,7 +512,7 @@ function render3DItem(element, layer, scene, sizeinfo, structure_json, is_corner
|
|
|
511
512
|
var isDoubleDoor = door_match && door_match[2] !== undefined;
|
|
512
513
|
(_child$children$ = child.children[0]) === null || _child$children$ === void 0 || _child$children$.children.forEach(function (it) {
|
|
513
514
|
var _it$name, _it$children;
|
|
514
|
-
if (it !== null && it !== void 0 && (_it$name = it.name) !== null && _it$name !== void 0 && _it$name.includes('handle') && (_it$children = it.children) !== null && _it$children !== void 0 && _it$children.length && is_corner
|
|
515
|
+
if (it !== null && it !== void 0 && (_it$name = it.name) !== null && _it$name !== void 0 && _it$name.includes('handle') && (_it$children = it.children) !== null && _it$children !== void 0 && _it$children.length && (0, _cabinetCorner.isCorner)(is_corner) && isDoubleDoor) {
|
|
515
516
|
var _child$name, _child$name2, _object1$children, _t0$name, _t0$children;
|
|
516
517
|
var tname = child !== null && child !== void 0 && (_child$name = child.name) !== null && _child$name !== void 0 && _child$name.endsWith('_L') ? child.name.replace('_L', '_R') : child === null || child === void 0 || (_child$name2 = child.name) === null || _child$name2 === void 0 ? void 0 : _child$name2.replace('_R', '_L');
|
|
517
518
|
var tmp = (object1 === null || object1 === void 0 || (_object1$children = object1.children) === null || _object1$children === void 0 ? void 0 : _object1$children.filter(function (item) {
|
|
@@ -14,6 +14,7 @@ var _convertUnitsLite = require("../../utils/convert-units-lite");
|
|
|
14
14
|
var _constants = require("../../constants");
|
|
15
15
|
var _cabinetWarning = require("../../shared/domain/cabinet-warning");
|
|
16
16
|
var _geometry = require("../../utils/geometry");
|
|
17
|
+
var _cabinetCorner = require("../../shared/domain/cabinet-corner");
|
|
17
18
|
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); }
|
|
18
19
|
var STYLE_LINE = {
|
|
19
20
|
fill: '#0096fd',
|
|
@@ -96,7 +97,7 @@ function Item(_ref, _ref2) {
|
|
|
96
97
|
length: itemDistanceFromLine,
|
|
97
98
|
angle: rotation,
|
|
98
99
|
rotation: element[1],
|
|
99
|
-
transform: "translate(".concat(element[1] === 180 ? -nw : element[1] === 0 ? nw : 0, ", ").concat(element[1] === 90 ? nh : element[1] === -90 ? (
|
|
100
|
+
transform: "translate(".concat(element[1] === 180 ? -nw : element[1] === 0 ? nw : 0, ", ").concat(element[1] === 90 ? nh : element[1] === -90 ? !(0, _cabinetCorner.isCornerCabinet)(item) ? -(nh + 4) : -nh : 0, ") rotate(").concat(element[1], ", 0, 0)")
|
|
100
101
|
})));
|
|
101
102
|
}
|
|
102
103
|
});
|
|
@@ -48,6 +48,7 @@ var _utils = require("../viewer2d/utils");
|
|
|
48
48
|
var _helper = require("../../utils/helper");
|
|
49
49
|
var _math = require("../../utils/math");
|
|
50
50
|
var _immutable = require("../../shared/objects/immutable");
|
|
51
|
+
var _cabinetCorner = require("../../shared/domain/cabinet-corner");
|
|
51
52
|
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); }
|
|
52
53
|
function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
|
|
53
54
|
function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2["default"])(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
|
|
@@ -3185,7 +3186,7 @@ function createBacksplash(item, layer, planData, scene) {
|
|
|
3185
3186
|
backsplash.rotation.y = itemToSave.info.rotY;
|
|
3186
3187
|
var allLines = _export.GeometryUtils.getAllLines(layer);
|
|
3187
3188
|
var allLineRects = _export.GeometryUtils.buildRectFromLines(layer, allLines);
|
|
3188
|
-
if (item
|
|
3189
|
+
if ((0, _cabinetCorner.isCornerCabinet)(item) && _export.GeometryUtils.isSnappedSideLine(item, allLineRects)) {
|
|
3189
3190
|
// corner cabinet item.itemInfo.getIn(["cabinet_category"]) === "Corner Base Cabinets"
|
|
3190
3191
|
var geometry1 = new Three.BoxGeometry(splashWidth, splashHeight, splashDepth);
|
|
3191
3192
|
// Make backsplash mesh
|
|
@@ -28,6 +28,7 @@ var _utils = require("../../components/viewer2d/utils");
|
|
|
28
28
|
var _SVGLoader = require("three/addons/loaders/SVGLoader");
|
|
29
29
|
var _geometry = require("../../utils/geometry");
|
|
30
30
|
var _loadAssetJson = require("../../shared/domain/asset/load-asset-json");
|
|
31
|
+
var _cabinetCorner = require("../../shared/domain/cabinet-corner");
|
|
31
32
|
var _excluded = ["ccdf"];
|
|
32
33
|
function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
|
|
33
34
|
function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2["default"])(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
|
|
@@ -297,7 +298,7 @@ function _parseTempPlaceholdersFromCabinetPayload() {
|
|
|
297
298
|
var phname = tempPlaceholders[0].name;
|
|
298
299
|
var newph = undefined;
|
|
299
300
|
var blAdd = true;
|
|
300
|
-
if (
|
|
301
|
+
if ((0, _cabinetCorner.isCornerCabinet)(cabinetPayload)) {
|
|
301
302
|
if (tempData['base_door' + t.name.slice(-2)] && tempData['base_door' + t.name.slice(-2)][0].isLeftPlaceholder()) {
|
|
302
303
|
newph = tempPlaceholders.find(function (el) {
|
|
303
304
|
return el.name.isLeftPlaceholder();
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
|
|
3
|
+
Object.defineProperty(exports, "__esModule", {
|
|
4
|
+
value: true
|
|
5
|
+
});
|
|
6
|
+
exports.isCornerCabinet = exports.isCorner = void 0;
|
|
7
|
+
var isCorner = exports.isCorner = function isCorner(value) {
|
|
8
|
+
return value === 1 || value === true || value === '1' || value === 'true';
|
|
9
|
+
};
|
|
10
|
+
var isCornerCabinet = exports.isCornerCabinet = function isCornerCabinet(cabinet) {
|
|
11
|
+
return isCorner(cabinet === null || cabinet === void 0 ? void 0 : cabinet.is_corner);
|
|
12
|
+
};
|
package/lib/utils/geometry.js
CHANGED
|
@@ -112,6 +112,7 @@ var Three = _interopRequireWildcard(require("three"));
|
|
|
112
112
|
var _utils = require("../components/viewer2d/utils.js");
|
|
113
113
|
var _helper = require("./helper.js");
|
|
114
114
|
var _export = require("./export.js");
|
|
115
|
+
var _cabinetCorner = require("../shared/domain/cabinet-corner.js");
|
|
115
116
|
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); }
|
|
116
117
|
function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
|
|
117
118
|
function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2["default"])(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
|
|
@@ -1031,7 +1032,7 @@ function getAllItemSnap(allItemRects) {
|
|
|
1031
1032
|
snap1.isSnappedLine = true;
|
|
1032
1033
|
snap2.isSnappedLine = true;
|
|
1033
1034
|
}
|
|
1034
|
-
if (rect.is_corner) {
|
|
1035
|
+
if ((0, _cabinetCorner.isCorner)(rect.is_corner)) {
|
|
1035
1036
|
var _nrot = rect.rotRad + Math.PI * 3 / 2;
|
|
1036
1037
|
if (_nrot >= Math.PI) _nrot -= Math.PI * 2;
|
|
1037
1038
|
var snap5 = itemrectInfo(rect.rect[1].x - oy1, rect.rect[1].y + ox1, _nrot, cur && cur.size, rect.layoutpos, rect.is_corner);
|
|
@@ -1266,7 +1267,7 @@ function getAllLineSnap(allLineRects, curItemRect) {
|
|
|
1266
1267
|
var thick = rect.size.height;
|
|
1267
1268
|
var snap3 = itemInfo(rect.rect[2].x + ox1, rect.rect[2].y + oy1, nrot, cur.size);
|
|
1268
1269
|
var snap4 = itemInfo(rect.rect[3].x + ox0, rect.rect[3].y + oy0, nrot, cur.size);
|
|
1269
|
-
if (!cur.is_corner) {
|
|
1270
|
+
if (!(0, _cabinetCorner.isCorner)(cur.is_corner)) {
|
|
1270
1271
|
allLineSnap.push(snap3);
|
|
1271
1272
|
}
|
|
1272
1273
|
allLineSnap.push(snap4);
|
|
@@ -13,6 +13,7 @@ var _export = require("./export");
|
|
|
13
13
|
var _convertUnitsLite = require("./convert-units-lite");
|
|
14
14
|
var _helper = require("./helper");
|
|
15
15
|
var _skinPanel = require("../constants/catalog/skinPanel");
|
|
16
|
+
var _cabinetCorner = require("../shared/domain/cabinet-corner");
|
|
16
17
|
function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t["return"] || t["return"](); } finally { if (u) throw o; } } }; }
|
|
17
18
|
function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
|
|
18
19
|
function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
|
|
@@ -39,7 +40,7 @@ function getSideFaces(item, layer) {
|
|
|
39
40
|
var overlapList = [_constants.OVERLAP_INCLUDED, _constants.OVERLAP_SAME, _constants.OVERLAP_SOME];
|
|
40
41
|
var pos = [[-1, -1], [1, -1], [1, 1], [-1, 1]];
|
|
41
42
|
for (var i = 0; i < 4; i++) {
|
|
42
|
-
if (!
|
|
43
|
+
if (!(0, _cabinetCorner.isCornerCabinet)(item)) {
|
|
43
44
|
if (i === 0) continue; // only left & right & base cabinet's back
|
|
44
45
|
if (i === 2 && item.layoutpos !== _constants.BASE_CABINET_LAYOUTPOS) continue;
|
|
45
46
|
}
|
|
@@ -128,7 +129,7 @@ function collectFaces(items, layer) {
|
|
|
128
129
|
return faces;
|
|
129
130
|
}
|
|
130
131
|
function isSnappedWithCornerCabient(srcItem, desItem) {
|
|
131
|
-
if (srcItem
|
|
132
|
+
if ((0, _cabinetCorner.isCornerCabinet)(srcItem) || (0, _cabinetCorner.isCornerCabinet)(desItem)) {
|
|
132
133
|
return true;
|
|
133
134
|
} else return false;
|
|
134
135
|
}
|