kitchen-simulator 3.1.12 → 3.1.13
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/factories/area-factory-3d.js +17 -17
- package/es/catalog/holes/window-clear/planner-element.js +2 -2
- package/es/catalog/utils/item-loader.js +197 -197
- package/es/components/viewer2d/item.js +25 -9
- package/es/components/viewer3d/viewer3d.js +35 -55
- package/es/constants.js +1 -1
- package/es/devLiteRenderer.js +108 -98
- package/es/utils/geometry.js +26 -10
- package/es/utils/isolate-event-handler.js +16 -4
- package/lib/catalog/factories/area-factory-3d.js +14 -14
- package/lib/catalog/holes/window-clear/planner-element.js +2 -2
- package/lib/catalog/utils/item-loader.js +194 -194
- package/lib/components/viewer2d/item.js +25 -9
- package/lib/components/viewer3d/viewer3d.js +35 -55
- package/lib/constants.js +1 -1
- package/lib/devLiteRenderer.js +103 -93
- package/lib/utils/geometry.js +26 -10
- package/lib/utils/isolate-event-handler.js +16 -4
- package/package.json +1 -1
|
@@ -247,25 +247,38 @@ function Item(_ref, _ref2) {
|
|
|
247
247
|
*/
|
|
248
248
|
var getDistant = function getDistant(x, y, rotRad) {
|
|
249
249
|
var center_h = 3 * height / 8;
|
|
250
|
-
var center_x = x;
|
|
250
|
+
var center_x = x; // middle of front line of cabinet rect
|
|
251
251
|
var center_y = y;
|
|
252
|
-
var center_x1 = x - center_h * Math.sin(rotRad);
|
|
252
|
+
var center_x1 = x - center_h * Math.sin(rotRad); // center point of cabinet rect
|
|
253
253
|
var center_y1 = y + center_h * Math.cos(rotRad);
|
|
254
254
|
var PointArray = [];
|
|
255
|
-
|
|
256
|
-
var
|
|
255
|
+
var _loop = function _loop(i) {
|
|
256
|
+
var centerpoint = curiteminfo.rectCenterPoint[i];
|
|
257
|
+
// [rectCenterPoint] has four middle points of cabinet rect edges
|
|
258
|
+
var comparelength = []; // distance array from rectCenterPoint[i] to other lines(walls, other cabinet rect edges)
|
|
257
259
|
var a;
|
|
258
|
-
var RectLineFuction;
|
|
260
|
+
var RectLineFuction; // normal line of cabinet rect edge
|
|
259
261
|
if (centerpoint[1] === 180 || centerpoint[1] === 0) RectLineFuction = _export.GeometryUtils.linePassingThroughTwoPoints(centerpoint[0].x, centerpoint[0].y, center_x1, center_y1);else RectLineFuction = _export.GeometryUtils.linePassingThroughTwoPoints(centerpoint[0].x, centerpoint[0].y, center_x, center_y);
|
|
260
262
|
allRect.forEach(function (linerect) {
|
|
263
|
+
// calc distance to all other lines
|
|
261
264
|
var p0 = _export.GeometryUtils.clone_point(linerect.rect[2]);
|
|
262
265
|
var p1 = _export.GeometryUtils.clone_point(linerect.rect[3]);
|
|
263
|
-
var lineFunction = {};
|
|
266
|
+
var lineFunction = {}; // other line function
|
|
264
267
|
if (p0.x !== p1.x || p0.y !== p1.y) lineFunction = _export.GeometryUtils.linePassingThroughTwoPoints(p0.x, p0.y, p1.x, p1.y);
|
|
268
|
+
// intersection between normal line and other line
|
|
265
269
|
var coordinatePoint = _export.GeometryUtils.twoLinesIntersection(lineFunction.a, lineFunction.b, lineFunction.c, RectLineFuction.a, RectLineFuction.b, RectLineFuction.c);
|
|
266
270
|
if (coordinatePoint !== undefined) {
|
|
267
|
-
if (
|
|
268
|
-
|
|
271
|
+
if (
|
|
272
|
+
// intersection point is on the other line
|
|
273
|
+
_export.GeometryUtils.pointsDistance(p0.x, p0.y, p1.x, p1.y) > _export.GeometryUtils.pointsDistance(p0.x, p0.y, coordinatePoint.x, coordinatePoint.y) && _export.GeometryUtils.pointsDistance(p0.x, p0.y, p1.x, p1.y) > _export.GeometryUtils.pointsDistance(p1.x, p1.y, coordinatePoint.x, coordinatePoint.y)) {
|
|
274
|
+
// check the intersection point is outside direction of edge
|
|
275
|
+
var isOutside = true;
|
|
276
|
+
for (var j = 0; j < curiteminfo.rectCenterPoint.length; j++) {
|
|
277
|
+
if (j === i) continue;
|
|
278
|
+
var otherCenterPoint = curiteminfo.rectCenterPoint[j];
|
|
279
|
+
if (_export.GeometryUtils.isPointOnLineSegment(centerpoint[0].x, centerpoint[0].y, coordinatePoint.x, coordinatePoint.y, otherCenterPoint[0].x, otherCenterPoint[0].y)) isOutside = false;
|
|
280
|
+
}
|
|
281
|
+
if (isOutside && _export.GeometryUtils.pointsDistance(coordinatePoint.x, coordinatePoint.y, center_x, center_y) > _export.GeometryUtils.pointsDistance(centerpoint[0].x, centerpoint[0].y, coordinatePoint.x, coordinatePoint.y)) {
|
|
269
282
|
comparelength.push(_export.GeometryUtils.pointsDistance(centerpoint[0].x, centerpoint[0].y, coordinatePoint.x, coordinatePoint.y));
|
|
270
283
|
a = Math.min.apply(null, comparelength);
|
|
271
284
|
}
|
|
@@ -273,7 +286,10 @@ function Item(_ref, _ref2) {
|
|
|
273
286
|
}
|
|
274
287
|
});
|
|
275
288
|
PointArray.push([a, centerpoint[1]]);
|
|
276
|
-
}
|
|
289
|
+
};
|
|
290
|
+
for (var i = 0; i < curiteminfo.rectCenterPoint.length; i++) {
|
|
291
|
+
_loop(i);
|
|
292
|
+
}
|
|
277
293
|
return {
|
|
278
294
|
PointArray: PointArray
|
|
279
295
|
};
|
|
@@ -1392,7 +1392,7 @@ var Scene3DViewer = exports["default"] = /*#__PURE__*/function (_React$Component
|
|
|
1392
1392
|
altitude = (0, _convertUnitsLite.convert)(altitude).from(unit).to(_this2.props.state.scene.unit);
|
|
1393
1393
|
}
|
|
1394
1394
|
scene3D.remove(angleObj);
|
|
1395
|
-
|
|
1395
|
+
scene3D.remove(toolObj);
|
|
1396
1396
|
if (!_this2.props.downloadFlag && !_this2.props.state.mode.includes('ING')) {
|
|
1397
1397
|
_this2.props.setToolbar('');
|
|
1398
1398
|
}
|
|
@@ -1466,7 +1466,8 @@ var Scene3DViewer = exports["default"] = /*#__PURE__*/function (_React$Component
|
|
|
1466
1466
|
});
|
|
1467
1467
|
});
|
|
1468
1468
|
var intersects = raycaster.intersectObjects(meshes, true);
|
|
1469
|
-
var _i10;
|
|
1469
|
+
var _i10; // index of warning object in intersects
|
|
1470
|
+
|
|
1470
1471
|
if (intersects.length > 0 && !isNaN(intersects[0].distance)) {
|
|
1471
1472
|
for (_i10 = 0; _i10 < intersects.length; _i10++) {
|
|
1472
1473
|
if (intersects[_i10].object.name === 'warningObj') break;
|
|
@@ -1494,6 +1495,19 @@ var Scene3DViewer = exports["default"] = /*#__PURE__*/function (_React$Component
|
|
|
1494
1495
|
}
|
|
1495
1496
|
}
|
|
1496
1497
|
gridMatrix.copy(gridPlane.matrixWorld).invert();
|
|
1498
|
+
var addItemToolObj = function addItemToolObj() {
|
|
1499
|
+
var _intersects$_i;
|
|
1500
|
+
var selectedItem = planData.sceneGraph.layers[selectedObject.layerID].items[selectedObject.itemID];
|
|
1501
|
+
if ((0, _util.isUndefined)(selectedItem)) return;
|
|
1502
|
+
selectedElement = _this2.props.state.scene.layers.get(selectedObject.layerID).items.get(selectedObject.itemID);
|
|
1503
|
+
var itemPos = selectedItem.position.clone();
|
|
1504
|
+
if (((_intersects$_i = intersects[_i10]) === null || _intersects$_i === void 0 || (_intersects$_i = _intersects$_i.object) === null || _intersects$_i === void 0 || (_intersects$_i = _intersects$_i.parent) === null || _intersects$_i === void 0 || (_intersects$_i = _intersects$_i.parent) === null || _intersects$_i === void 0 || (_intersects$_i = _intersects$_i.userData) === null || _intersects$_i === void 0 ? void 0 : _intersects$_i.itemId) === selectedItem.userData.itemId) {
|
|
1505
|
+
toolObj.position.set(intersects[_i10].point.x, intersects[_i10].point.y, intersects[_i10].point.z);
|
|
1506
|
+
} else {
|
|
1507
|
+
toolObj.position.set(planData.plan.position.x + itemPos.x, selectedElement.category === 'lighting' ? -planData.plan.position.y - selectedElement.properties.get('height').get('length') : planData.plan.position.y + selectedItem.children[0].position.y, planData.plan.position.z + itemPos.z);
|
|
1508
|
+
}
|
|
1509
|
+
scene3D.add(toolObj);
|
|
1510
|
+
};
|
|
1497
1511
|
if (Math.abs(mouse.x - _this2.lastMousePosition.x) <= 0.02 && Math.abs(mouse.y - _this2.lastMousePosition.y) <= 0.02 || bMove) {
|
|
1498
1512
|
if (intersects.length > 0 && !isNaN(intersects[0].distance)) {
|
|
1499
1513
|
if (intersects[_i10] === undefined) {
|
|
@@ -1517,16 +1531,7 @@ var Scene3DViewer = exports["default"] = /*#__PURE__*/function (_React$Component
|
|
|
1517
1531
|
isSelected = true;
|
|
1518
1532
|
setTimeout(function () {
|
|
1519
1533
|
(0, _sceneCreator.getDistances)(layer);
|
|
1520
|
-
|
|
1521
|
-
if ((0, _util.isUndefined)(selectedItem)) return;
|
|
1522
|
-
selectedElement = _this2.props.state.scene.layers.get(selectedObject.layerID).items.get(selectedObject.itemID);
|
|
1523
|
-
var itemPos = selectedItem.position.clone();
|
|
1524
|
-
if (intersects[_i10].object.parent && intersects[_i10].object.parent.parent.userData.itemId === selectedItem.userData.itemId) {
|
|
1525
|
-
toolObj.position.set(intersects[_i10].point.x, intersects[_i10].point.y, intersects[_i10].point.z);
|
|
1526
|
-
} else {
|
|
1527
|
-
toolObj.position.set(planData.plan.position.x + itemPos.x, selectedElement.category === 'lighting' ? -planData.plan.position.y - selectedElement.properties.get('height').get('length') : planData.plan.position.y + selectedItem.children[0].position.y, planData.plan.position.z + itemPos.z);
|
|
1528
|
-
}
|
|
1529
|
-
scene3D.add(toolObj);
|
|
1534
|
+
addItemToolObj();
|
|
1530
1535
|
_this2.setState({
|
|
1531
1536
|
toolObj: toolObj
|
|
1532
1537
|
});
|
|
@@ -1549,7 +1554,6 @@ var Scene3DViewer = exports["default"] = /*#__PURE__*/function (_React$Component
|
|
|
1549
1554
|
case 'holeID' in selectedObject:
|
|
1550
1555
|
elementID = selectedObject.holeID;
|
|
1551
1556
|
elementPrototype = 'holes';
|
|
1552
|
-
scene3D.remove(toolObj);
|
|
1553
1557
|
if (_this2.props.state.mode === _constants.MODE_DRAGGING_HOLE_3D) {
|
|
1554
1558
|
actions.holesActions.endDraggingHole3D(sPoint.x, sPoint.y);
|
|
1555
1559
|
}
|
|
@@ -1557,12 +1561,10 @@ var Scene3DViewer = exports["default"] = /*#__PURE__*/function (_React$Component
|
|
|
1557
1561
|
case 'lineID' in selectedObject:
|
|
1558
1562
|
elementID = selectedObject.lineID;
|
|
1559
1563
|
elementPrototype = 'lines';
|
|
1560
|
-
scene3D.remove(toolObj);
|
|
1561
1564
|
break;
|
|
1562
1565
|
case 'areaID' in selectedObject:
|
|
1563
1566
|
elementID = selectedObject.areaID;
|
|
1564
1567
|
elementPrototype = 'areas';
|
|
1565
|
-
scene3D.remove(toolObj);
|
|
1566
1568
|
break;
|
|
1567
1569
|
default:
|
|
1568
1570
|
break;
|
|
@@ -1572,24 +1574,22 @@ var Scene3DViewer = exports["default"] = /*#__PURE__*/function (_React$Component
|
|
|
1572
1574
|
isSelected = false;
|
|
1573
1575
|
}
|
|
1574
1576
|
} else {
|
|
1575
|
-
|
|
1576
|
-
|
|
1577
|
-
|
|
1578
|
-
|
|
1579
|
-
|
|
1580
|
-
|
|
1581
|
-
|
|
1582
|
-
|
|
1583
|
-
|
|
1577
|
+
var selectedItem = planData.sceneGraph.layers[selectedObject.layerID].items[selectedObject.itemID];
|
|
1578
|
+
if (bMove && !(0, _helper.isEmpty)(selectedItem)) {
|
|
1579
|
+
addItemToolObj();
|
|
1580
|
+
} else {
|
|
1581
|
+
isSelected = false;
|
|
1582
|
+
_this2.context.projectActions.unselectAll();
|
|
1583
|
+
switch (true) {
|
|
1584
|
+
case 'holeID' in selectedObject:
|
|
1585
|
+
actions.holesActions.endDraggingHole3D(sPoint.x, sPoint.y);
|
|
1586
|
+
break;
|
|
1587
|
+
default:
|
|
1588
|
+
_this2.context.itemsActions.removeReplacingSupport();
|
|
1589
|
+
break;
|
|
1590
|
+
}
|
|
1584
1591
|
}
|
|
1585
1592
|
}
|
|
1586
|
-
var selectedItem = planData.sceneGraph.layers[selectedObject.layerID].items[selectedObject.itemID];
|
|
1587
|
-
if (selectedItem) {
|
|
1588
|
-
selectedElement = _this2.props.state.scene.layers.get(selectedObject.layerID).items.get(selectedObject.itemID);
|
|
1589
|
-
var itemPos = selectedItem.position.clone();
|
|
1590
|
-
toolObj.position.set(planData.plan.position.x + itemPos.x, selectedElement.category === 'lighting' ? -planData.plan.position.y - selectedElement.properties.get('height').get('length') : planData.plan.position.y + selectedItem.children[0].position.y, planData.plan.position.z + itemPos.z);
|
|
1591
|
-
scene3D.add(toolObj);
|
|
1592
|
-
}
|
|
1593
1593
|
bMove = false;
|
|
1594
1594
|
bRotate = false;
|
|
1595
1595
|
bMoveUP = false;
|
|
@@ -1608,35 +1608,15 @@ var Scene3DViewer = exports["default"] = /*#__PURE__*/function (_React$Component
|
|
|
1608
1608
|
}
|
|
1609
1609
|
getPoint(event, alti);
|
|
1610
1610
|
if (bRotate) {
|
|
1611
|
-
|
|
1612
|
-
var _selectedItem = planData.sceneGraph.layers[selectedObject.layerID].items[selectedObject.itemID];
|
|
1613
|
-
if ((0, _util.isUndefined)(_selectedItem)) return;
|
|
1614
|
-
selectedElement = _this2.props.state.scene.layers.get(selectedObject.layerID).items.get(selectedObject.itemID);
|
|
1615
|
-
var _itemPos = _selectedItem.position.clone();
|
|
1616
|
-
if (((_intersects$_i = intersects[_i10]) === null || _intersects$_i === void 0 || (_intersects$_i = _intersects$_i.object) === null || _intersects$_i === void 0 || (_intersects$_i = _intersects$_i.parent) === null || _intersects$_i === void 0 || (_intersects$_i = _intersects$_i.parent) === null || _intersects$_i === void 0 || (_intersects$_i = _intersects$_i.userData) === null || _intersects$_i === void 0 ? void 0 : _intersects$_i.itemId) === _selectedItem.userData.itemId) {
|
|
1617
|
-
toolObj.position.set(intersects[_i10].point.x, intersects[_i10].point.y, intersects[_i10].point.z);
|
|
1618
|
-
} else {
|
|
1619
|
-
toolObj.position.set(planData.plan.position.x + _itemPos.x, selectedElement.category === 'lighting' ? -planData.plan.position.y - selectedElement.properties.get('height').get('length') : planData.plan.position.y + _selectedItem.children[0].position.y, planData.plan.position.z + _itemPos.z);
|
|
1620
|
-
}
|
|
1621
|
-
scene3D.add(toolObj);
|
|
1611
|
+
addItemToolObj();
|
|
1622
1612
|
_this2.setState({
|
|
1623
1613
|
toolObj: toolObj
|
|
1624
1614
|
});
|
|
1625
1615
|
_this2.context.itemsActions.endRotatingItem3D(Point.x, Point.y);
|
|
1626
1616
|
bRotate = false;
|
|
1627
|
-
}
|
|
1628
|
-
if (bMove) {
|
|
1617
|
+
} else if (bMove) {
|
|
1629
1618
|
bMove = false;
|
|
1630
|
-
|
|
1631
|
-
if ((0, _util.isUndefined)(_selectedItem2)) return;
|
|
1632
|
-
selectedElement = _this2.props.state.scene.layers.get(selectedObject.layerID).items.get(selectedObject.itemID);
|
|
1633
|
-
var _itemPos2 = _selectedItem2.position.clone();
|
|
1634
|
-
if (intersects[_i10].object.parent.parent.userData.itemId === _selectedItem2.userData.itemId) {
|
|
1635
|
-
toolObj.position.set(intersects[_i10].point.x, intersects[_i10].point.y, intersects[_i10].point.z);
|
|
1636
|
-
} else {
|
|
1637
|
-
toolObj.position.set(planData.plan.position.x + _itemPos2.x, selectedElement.category === 'lighting' ? -planData.plan.position.y - selectedElement.properties.get('height').get('length') : planData.plan.position.y + _selectedItem2.children[0].position.y, planData.plan.position.z + _itemPos2.z);
|
|
1638
|
-
}
|
|
1639
|
-
scene3D.add(toolObj);
|
|
1619
|
+
addItemToolObj();
|
|
1640
1620
|
_this2.setState({
|
|
1641
1621
|
toolObj: toolObj
|
|
1642
1622
|
});
|
|
@@ -1656,7 +1636,7 @@ var Scene3DViewer = exports["default"] = /*#__PURE__*/function (_React$Component
|
|
|
1656
1636
|
_item3D.position.z = targetPoint.z;
|
|
1657
1637
|
_item3D.visible = true;
|
|
1658
1638
|
}
|
|
1659
|
-
}
|
|
1639
|
+
} else {}
|
|
1660
1640
|
if (bMoveUP) {
|
|
1661
1641
|
bMoveUP = false;
|
|
1662
1642
|
}
|
package/lib/constants.js
CHANGED
|
@@ -663,7 +663,7 @@ var PROJECT_SETTING_OPTION = exports.PROJECT_SETTING_OPTION = {
|
|
|
663
663
|
CHANGE_WINDOW_DOOR_MEASURE: CHANGE_WINDOW_DOOR_MEASURE
|
|
664
664
|
};
|
|
665
665
|
var HOLE_NAMES = exports.HOLE_NAMES = {
|
|
666
|
-
WINDOW_CLEAR: '
|
|
666
|
+
WINDOW_CLEAR: 'Window',
|
|
667
667
|
WINDOW_CROSS: 'Cross Window',
|
|
668
668
|
WINDOW_DOUBLE_HUNG: 'Double Hung Window',
|
|
669
669
|
WINDOW_VERTICAL: 'window-vertical',
|
package/lib/devLiteRenderer.js
CHANGED
|
@@ -11,6 +11,7 @@ var _reactContainerDimensions = _interopRequireDefault(require("react-container-
|
|
|
11
11
|
var _projectItemsCatalog = _interopRequireDefault(require("./mocks/projectItemsCatalog.json"));
|
|
12
12
|
var _mockProps = _interopRequireDefault(require("./mocks/mockProps.json"));
|
|
13
13
|
var _cabinetPayload = _interopRequireDefault(require("./mocks/cabinetPayload2.json"));
|
|
14
|
+
var _cabinetPayload2 = _interopRequireDefault(require("./mocks/cabinetPayload.json"));
|
|
14
15
|
var _appliancePayload = _interopRequireDefault(require("./mocks/appliancePayload.json"));
|
|
15
16
|
var _doorStylePayload = _interopRequireDefault(require("./mocks/doorStylePayload2.json"));
|
|
16
17
|
var _roomShapePayload = _interopRequireDefault(require("./mocks/roomShapePayload.json"));
|
|
@@ -28,7 +29,7 @@ var _convertUnitsLite = require("./utils/convert-units-lite");
|
|
|
28
29
|
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 _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); }
|
|
29
30
|
// --- renderer props ---
|
|
30
31
|
var options = {
|
|
31
|
-
unit:
|
|
32
|
+
unit: 'in',
|
|
32
33
|
enable3D: true
|
|
33
34
|
};
|
|
34
35
|
var onInternalEvent = /*#__PURE__*/function () {
|
|
@@ -37,7 +38,7 @@ var onInternalEvent = /*#__PURE__*/function () {
|
|
|
37
38
|
return _regenerator["default"].wrap(function (_context) {
|
|
38
39
|
while (1) switch (_context.prev = _context.next) {
|
|
39
40
|
case 0:
|
|
40
|
-
console.log(
|
|
41
|
+
console.log('EVENT:', evt.type, evt.value);
|
|
41
42
|
_t = evt.type;
|
|
42
43
|
_context.next = _t === _constants.INTERNAL_EVENT_ITEMS_CATALOG ? 1 : 3;
|
|
43
44
|
break;
|
|
@@ -56,7 +57,7 @@ var onInternalEvent = /*#__PURE__*/function () {
|
|
|
56
57
|
return _ref.apply(this, arguments);
|
|
57
58
|
};
|
|
58
59
|
}();
|
|
59
|
-
document.getElementById(
|
|
60
|
+
document.getElementById('app').style.display = 'block';
|
|
60
61
|
function WorkSpace(props) {
|
|
61
62
|
var _useState = (0, _react.useState)(null),
|
|
62
63
|
_useState2 = (0, _slicedToArray2["default"])(_useState, 2),
|
|
@@ -218,6 +219,15 @@ function WorkSpace(props) {
|
|
|
218
219
|
setExternalEvent(evt);
|
|
219
220
|
}
|
|
220
221
|
}, "Add B12 Cabinet"), /*#__PURE__*/_react["default"].createElement(_antd.Button, {
|
|
222
|
+
actionType: "danger",
|
|
223
|
+
onClick: function onClick() {
|
|
224
|
+
var evt = {
|
|
225
|
+
type: _constants.EXTERNAL_EVENT_ADD_ITEM,
|
|
226
|
+
payload: _cabinetPayload2["default"]
|
|
227
|
+
};
|
|
228
|
+
setExternalEvent(evt);
|
|
229
|
+
}
|
|
230
|
+
}, "Add W0930 Cabinet"), /*#__PURE__*/_react["default"].createElement(_antd.Button, {
|
|
221
231
|
actionType: "danger",
|
|
222
232
|
onClick: function onClick() {
|
|
223
233
|
var evt = {
|
|
@@ -236,91 +246,91 @@ function WorkSpace(props) {
|
|
|
236
246
|
var evt = {
|
|
237
247
|
type: _constants.EXTERNAL_EVENT_ADD_ROOM_SHAPE,
|
|
238
248
|
payload: {
|
|
239
|
-
roomShapeType:
|
|
249
|
+
roomShapeType: 'rectangle',
|
|
240
250
|
width: 250,
|
|
241
251
|
height: 100,
|
|
242
252
|
doorStyle: {
|
|
243
253
|
id: 36,
|
|
244
|
-
type:
|
|
245
|
-
name:
|
|
246
|
-
thumbnail:
|
|
247
|
-
texture:
|
|
248
|
-
color:
|
|
254
|
+
type: 'door',
|
|
255
|
+
name: 'Brilliant White Shaker',
|
|
256
|
+
thumbnail: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/thumbnail/Brilliant%20White%20Shaker%20-%20RTA.jpg',
|
|
257
|
+
texture: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
|
|
258
|
+
color: '#ffffff',
|
|
249
259
|
glossness: 1,
|
|
250
260
|
door_style_id: 42,
|
|
251
261
|
brightness: 1,
|
|
252
|
-
sku:
|
|
253
|
-
color_family:
|
|
254
|
-
color_sku_alias:
|
|
255
|
-
door_style_name:
|
|
256
|
-
install:
|
|
262
|
+
sku: 'SW',
|
|
263
|
+
color_family: ',10,',
|
|
264
|
+
color_sku_alias: 'SW',
|
|
265
|
+
door_style_name: 'Shaker',
|
|
266
|
+
install: '',
|
|
257
267
|
doorStyles: {
|
|
258
|
-
base:
|
|
259
|
-
counttop:
|
|
260
|
-
interior:
|
|
261
|
-
base_door_1:
|
|
262
|
-
base_fixed_drawer_door_1:
|
|
263
|
-
base_drawer_1:
|
|
264
|
-
base_drawer_door_1:
|
|
265
|
-
door_handle_1:
|
|
266
|
-
fixed_drawer_door_handle_1:
|
|
267
|
-
drawer_door_handle_1:
|
|
268
|
-
base_door_2:
|
|
269
|
-
base_fixed_drawer_door_2:
|
|
270
|
-
base_drawer_2:
|
|
271
|
-
base_drawer_door_2:
|
|
272
|
-
door_handle_2:
|
|
273
|
-
fixed_drawer_door_handle_2:
|
|
274
|
-
drawer_door_handle_2:
|
|
275
|
-
base_door_3:
|
|
276
|
-
base_fixed_drawer_door_3:
|
|
277
|
-
base_drawer_3:
|
|
278
|
-
base_drawer_door_3:
|
|
279
|
-
door_handle_3:
|
|
280
|
-
fixed_drawer_door_handle_3:
|
|
281
|
-
drawer_door_handle_3:
|
|
282
|
-
base_door_4:
|
|
283
|
-
base_fixed_drawer_door_4:
|
|
284
|
-
base_drawer_4:
|
|
285
|
-
base_drawer_door_4:
|
|
286
|
-
door_handle_4:
|
|
287
|
-
fixed_drawer_door_handle_4:
|
|
288
|
-
drawer_door_handle_4:
|
|
289
|
-
base_door_5:
|
|
290
|
-
base_fixed_drawer_door_5:
|
|
291
|
-
base_drawer_5:
|
|
292
|
-
base_drawer_door_5:
|
|
293
|
-
door_handle_5:
|
|
294
|
-
fixed_drawer_door_handle_5:
|
|
295
|
-
drawer_door_handle_5:
|
|
296
|
-
base_door_6:
|
|
297
|
-
base_fixed_drawer_door_6:
|
|
298
|
-
base_drawer_6:
|
|
299
|
-
base_drawer_door_6:
|
|
300
|
-
door_handle_6:
|
|
301
|
-
fixed_drawer_door_handle_6:
|
|
302
|
-
drawer_door_handle_6:
|
|
303
|
-
base_door_7:
|
|
304
|
-
base_fixed_drawer_door_7:
|
|
305
|
-
base_drawer_7:
|
|
306
|
-
base_drawer_door_7:
|
|
307
|
-
door_handle_7:
|
|
308
|
-
fixed_drawer_door_handle_7:
|
|
309
|
-
drawer_door_handle_7:
|
|
310
|
-
base_door_8:
|
|
311
|
-
base_fixed_drawer_door_8:
|
|
312
|
-
base_drawer_8:
|
|
313
|
-
base_drawer_door_8:
|
|
314
|
-
door_handle_8:
|
|
315
|
-
fixed_drawer_door_handle_8:
|
|
316
|
-
drawer_door_handle_8:
|
|
317
|
-
base_door_9:
|
|
318
|
-
base_fixed_drawer_door_9:
|
|
319
|
-
base_drawer_9:
|
|
320
|
-
base_drawer_door_9:
|
|
321
|
-
door_handle_9:
|
|
322
|
-
fixed_drawer_door_handle_9:
|
|
323
|
-
drawer_door_handle_9:
|
|
268
|
+
base: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
|
|
269
|
+
counttop: 'https://media.test.diydesignspace.com/uploads/CountTop/202105074107_5/texture/Unique_Calcatta_texture.jpg',
|
|
270
|
+
interior: 'https://media.test.diydesignspace.com/uploads/assets/default/maple.jpg',
|
|
271
|
+
base_door_1: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
|
|
272
|
+
base_fixed_drawer_door_1: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
|
|
273
|
+
base_drawer_1: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
|
|
274
|
+
base_drawer_door_1: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
|
|
275
|
+
door_handle_1: 'https://media.test.diydesignspace.com/uploads/assets/default/steel.jpg',
|
|
276
|
+
fixed_drawer_door_handle_1: 'https://media.test.diydesignspace.com/uploads/assets/default/steel.jpg',
|
|
277
|
+
drawer_door_handle_1: 'https://media.test.diydesignspace.com/uploads/assets/default/steel.jpg',
|
|
278
|
+
base_door_2: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
|
|
279
|
+
base_fixed_drawer_door_2: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
|
|
280
|
+
base_drawer_2: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
|
|
281
|
+
base_drawer_door_2: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
|
|
282
|
+
door_handle_2: 'https://media.test.diydesignspace.com/uploads/assets/default/steel.jpg',
|
|
283
|
+
fixed_drawer_door_handle_2: 'https://media.test.diydesignspace.com/uploads/assets/default/steel.jpg',
|
|
284
|
+
drawer_door_handle_2: 'https://media.test.diydesignspace.com/uploads/assets/default/steel.jpg',
|
|
285
|
+
base_door_3: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
|
|
286
|
+
base_fixed_drawer_door_3: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
|
|
287
|
+
base_drawer_3: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
|
|
288
|
+
base_drawer_door_3: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
|
|
289
|
+
door_handle_3: 'https://media.test.diydesignspace.com/uploads/assets/default/steel.jpg',
|
|
290
|
+
fixed_drawer_door_handle_3: 'https://media.test.diydesignspace.com/uploads/assets/default/steel.jpg',
|
|
291
|
+
drawer_door_handle_3: 'https://media.test.diydesignspace.com/uploads/assets/default/steel.jpg',
|
|
292
|
+
base_door_4: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
|
|
293
|
+
base_fixed_drawer_door_4: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
|
|
294
|
+
base_drawer_4: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
|
|
295
|
+
base_drawer_door_4: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
|
|
296
|
+
door_handle_4: 'https://media.test.diydesignspace.com/uploads/assets/default/steel.jpg',
|
|
297
|
+
fixed_drawer_door_handle_4: 'https://media.test.diydesignspace.com/uploads/assets/default/steel.jpg',
|
|
298
|
+
drawer_door_handle_4: 'https://media.test.diydesignspace.com/uploads/assets/default/steel.jpg',
|
|
299
|
+
base_door_5: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
|
|
300
|
+
base_fixed_drawer_door_5: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
|
|
301
|
+
base_drawer_5: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
|
|
302
|
+
base_drawer_door_5: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
|
|
303
|
+
door_handle_5: 'https://media.test.diydesignspace.com/uploads/assets/default/steel.jpg',
|
|
304
|
+
fixed_drawer_door_handle_5: 'https://media.test.diydesignspace.com/uploads/assets/default/steel.jpg',
|
|
305
|
+
drawer_door_handle_5: 'https://media.test.diydesignspace.com/uploads/assets/default/steel.jpg',
|
|
306
|
+
base_door_6: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
|
|
307
|
+
base_fixed_drawer_door_6: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
|
|
308
|
+
base_drawer_6: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
|
|
309
|
+
base_drawer_door_6: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
|
|
310
|
+
door_handle_6: 'https://media.test.diydesignspace.com/uploads/assets/default/steel.jpg',
|
|
311
|
+
fixed_drawer_door_handle_6: 'https://media.test.diydesignspace.com/uploads/assets/default/steel.jpg',
|
|
312
|
+
drawer_door_handle_6: 'https://media.test.diydesignspace.com/uploads/assets/default/steel.jpg',
|
|
313
|
+
base_door_7: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
|
|
314
|
+
base_fixed_drawer_door_7: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
|
|
315
|
+
base_drawer_7: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
|
|
316
|
+
base_drawer_door_7: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
|
|
317
|
+
door_handle_7: 'https://media.test.diydesignspace.com/uploads/assets/default/steel.jpg',
|
|
318
|
+
fixed_drawer_door_handle_7: 'https://media.test.diydesignspace.com/uploads/assets/default/steel.jpg',
|
|
319
|
+
drawer_door_handle_7: 'https://media.test.diydesignspace.com/uploads/assets/default/steel.jpg',
|
|
320
|
+
base_door_8: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
|
|
321
|
+
base_fixed_drawer_door_8: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
|
|
322
|
+
base_drawer_8: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
|
|
323
|
+
base_drawer_door_8: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
|
|
324
|
+
door_handle_8: 'https://media.test.diydesignspace.com/uploads/assets/default/steel.jpg',
|
|
325
|
+
fixed_drawer_door_handle_8: 'https://media.test.diydesignspace.com/uploads/assets/default/steel.jpg',
|
|
326
|
+
drawer_door_handle_8: 'https://media.test.diydesignspace.com/uploads/assets/default/steel.jpg',
|
|
327
|
+
base_door_9: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
|
|
328
|
+
base_fixed_drawer_door_9: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
|
|
329
|
+
base_drawer_9: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
|
|
330
|
+
base_drawer_door_9: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
|
|
331
|
+
door_handle_9: 'https://media.test.diydesignspace.com/uploads/assets/default/steel.jpg',
|
|
332
|
+
fixed_drawer_door_handle_9: 'https://media.test.diydesignspace.com/uploads/assets/default/steel.jpg',
|
|
333
|
+
drawer_door_handle_9: 'https://media.test.diydesignspace.com/uploads/assets/default/steel.jpg'
|
|
324
334
|
},
|
|
325
335
|
installation_types: [125, 124]
|
|
326
336
|
}
|
|
@@ -479,7 +489,7 @@ function WorkSpace(props) {
|
|
|
479
489
|
// cm
|
|
480
490
|
_length: 10,
|
|
481
491
|
// inch
|
|
482
|
-
_unit:
|
|
492
|
+
_unit: 'in'
|
|
483
493
|
})
|
|
484
494
|
}
|
|
485
495
|
};
|
|
@@ -492,7 +502,7 @@ function WorkSpace(props) {
|
|
|
492
502
|
type: _constants.EXTERNAL_EVENT_DUPLICATE_ELEMENT,
|
|
493
503
|
payload: {
|
|
494
504
|
elementPrototype: _constants.ELEMENT_ITEM,
|
|
495
|
-
elementId:
|
|
505
|
+
elementId: '' // id of current operating element
|
|
496
506
|
}
|
|
497
507
|
};
|
|
498
508
|
setExternalEvent(evt);
|
|
@@ -504,7 +514,7 @@ function WorkSpace(props) {
|
|
|
504
514
|
type: _constants.EXTERNAL_EVENT_DELETE_ELEMENT,
|
|
505
515
|
payload: {
|
|
506
516
|
elementPrototype: _constants.ELEMENT_ITEM,
|
|
507
|
-
elementId:
|
|
517
|
+
elementId: '' // id of current operating element
|
|
508
518
|
}
|
|
509
519
|
};
|
|
510
520
|
setExternalEvent(evt);
|
|
@@ -565,7 +575,7 @@ function WorkSpace(props) {
|
|
|
565
575
|
type: _constants.EXTERNAL_EVENT_SET_FINISHING,
|
|
566
576
|
payload: {
|
|
567
577
|
category: _constants.FINISHING_TYPE.COUNTER_TOP,
|
|
568
|
-
texture:
|
|
578
|
+
texture: 'https://media.test.diydesignspace.com/uploads/CountTop/202111302746_7/texture/Arabescato_texture.jpg'
|
|
569
579
|
}
|
|
570
580
|
};
|
|
571
581
|
setExternalEvent(evt);
|
|
@@ -577,7 +587,7 @@ function WorkSpace(props) {
|
|
|
577
587
|
type: _constants.EXTERNAL_EVENT_SET_FINISHING,
|
|
578
588
|
payload: {
|
|
579
589
|
category: _constants.FINISHING_TYPE.BACKSPLASH,
|
|
580
|
-
texture:
|
|
590
|
+
texture: 'https://media.test.diydesignspace.com/uploads/CountTop/202305225249_14/texture/Unique_Marquina_texture.jpg'
|
|
581
591
|
}
|
|
582
592
|
};
|
|
583
593
|
setExternalEvent(evt);
|
|
@@ -589,7 +599,7 @@ function WorkSpace(props) {
|
|
|
589
599
|
type: _constants.EXTERNAL_EVENT_SET_FINISHING,
|
|
590
600
|
payload: {
|
|
591
601
|
category: _constants.FINISHING_TYPE.FLOOR_STYLE,
|
|
592
|
-
texture:
|
|
602
|
+
texture: 'https://media.test.diydesignspace.com/uploads/CountTop/202203163338_3/texture/oak-chestnut.webp'
|
|
593
603
|
}
|
|
594
604
|
};
|
|
595
605
|
setExternalEvent(evt);
|
|
@@ -601,7 +611,7 @@ function WorkSpace(props) {
|
|
|
601
611
|
type: _constants.EXTERNAL_EVENT_SET_FINISHING,
|
|
602
612
|
payload: {
|
|
603
613
|
category: _constants.FINISHING_TYPE.WALL_COLOR,
|
|
604
|
-
color:
|
|
614
|
+
color: '#bab863'
|
|
605
615
|
}
|
|
606
616
|
};
|
|
607
617
|
setExternalEvent(evt);
|
|
@@ -613,7 +623,7 @@ function WorkSpace(props) {
|
|
|
613
623
|
type: _constants.EXTERNAL_EVENT_SET_FINISHING,
|
|
614
624
|
payload: {
|
|
615
625
|
category: _constants.FINISHING_TYPE.DOOR_HANDLE,
|
|
616
|
-
gltf:
|
|
626
|
+
gltf: 'https://media.test.diydesignspace.com/uploads/DoorHandle/202107294150_29/gltf/Handle1.gltf'
|
|
617
627
|
}
|
|
618
628
|
};
|
|
619
629
|
setExternalEvent(evt);
|
|
@@ -640,7 +650,7 @@ function WorkSpace(props) {
|
|
|
640
650
|
// cm
|
|
641
651
|
_length: 27,
|
|
642
652
|
// inch
|
|
643
|
-
_unit:
|
|
653
|
+
_unit: 'in'
|
|
644
654
|
})
|
|
645
655
|
}
|
|
646
656
|
};
|
|
@@ -668,7 +678,7 @@ function WorkSpace(props) {
|
|
|
668
678
|
actionType: "danger",
|
|
669
679
|
onClick: function onClick() {
|
|
670
680
|
var _tl = Math.floor(Math.random() * 50);
|
|
671
|
-
var tl = (0, _convertUnitsLite.convert)(_tl).from(
|
|
681
|
+
var tl = (0, _convertUnitsLite.convert)(_tl).from('in').to('cm');
|
|
672
682
|
var evt = {
|
|
673
683
|
type: _constants.EXTERNAL_EVENT_UPDATE_PROPERTY,
|
|
674
684
|
payload: {
|
|
@@ -676,7 +686,7 @@ function WorkSpace(props) {
|
|
|
676
686
|
value: new _immutable.Map({
|
|
677
687
|
_length: _tl,
|
|
678
688
|
// inch
|
|
679
|
-
_unit:
|
|
689
|
+
_unit: 'in',
|
|
680
690
|
length: tl // cm
|
|
681
691
|
})
|
|
682
692
|
}
|
|
@@ -701,7 +711,7 @@ function WorkSpace(props) {
|
|
|
701
711
|
// externalEvent: { id?, type, payload } | null,
|
|
702
712
|
// meta?: { filename?, lineno?, colno? }
|
|
703
713
|
// }
|
|
704
|
-
console.error(
|
|
714
|
+
console.error('TOOL ERROR:', payload);
|
|
705
715
|
}
|
|
706
716
|
}));
|
|
707
717
|
}
|
|
@@ -712,4 +722,4 @@ _reactDom["default"].render(/*#__PURE__*/_react["default"].createElement(_reactC
|
|
|
712
722
|
width: width,
|
|
713
723
|
height: height
|
|
714
724
|
});
|
|
715
|
-
}), document.getElementById(
|
|
725
|
+
}), document.getElementById('app') && document.getElementById('app'));
|