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
|
@@ -238,25 +238,38 @@ export default function Item(_ref, _ref2) {
|
|
|
238
238
|
*/
|
|
239
239
|
var getDistant = function getDistant(x, y, rotRad) {
|
|
240
240
|
var center_h = 3 * height / 8;
|
|
241
|
-
var center_x = x;
|
|
241
|
+
var center_x = x; // middle of front line of cabinet rect
|
|
242
242
|
var center_y = y;
|
|
243
|
-
var center_x1 = x - center_h * Math.sin(rotRad);
|
|
243
|
+
var center_x1 = x - center_h * Math.sin(rotRad); // center point of cabinet rect
|
|
244
244
|
var center_y1 = y + center_h * Math.cos(rotRad);
|
|
245
245
|
var PointArray = [];
|
|
246
|
-
|
|
247
|
-
var
|
|
246
|
+
var _loop = function _loop(i) {
|
|
247
|
+
var centerpoint = curiteminfo.rectCenterPoint[i];
|
|
248
|
+
// [rectCenterPoint] has four middle points of cabinet rect edges
|
|
249
|
+
var comparelength = []; // distance array from rectCenterPoint[i] to other lines(walls, other cabinet rect edges)
|
|
248
250
|
var a;
|
|
249
|
-
var RectLineFuction;
|
|
251
|
+
var RectLineFuction; // normal line of cabinet rect edge
|
|
250
252
|
if (centerpoint[1] === 180 || centerpoint[1] === 0) RectLineFuction = GeometryUtils.linePassingThroughTwoPoints(centerpoint[0].x, centerpoint[0].y, center_x1, center_y1);else RectLineFuction = GeometryUtils.linePassingThroughTwoPoints(centerpoint[0].x, centerpoint[0].y, center_x, center_y);
|
|
251
253
|
allRect.forEach(function (linerect) {
|
|
254
|
+
// calc distance to all other lines
|
|
252
255
|
var p0 = GeometryUtils.clone_point(linerect.rect[2]);
|
|
253
256
|
var p1 = GeometryUtils.clone_point(linerect.rect[3]);
|
|
254
|
-
var lineFunction = {};
|
|
257
|
+
var lineFunction = {}; // other line function
|
|
255
258
|
if (p0.x !== p1.x || p0.y !== p1.y) lineFunction = GeometryUtils.linePassingThroughTwoPoints(p0.x, p0.y, p1.x, p1.y);
|
|
259
|
+
// intersection between normal line and other line
|
|
256
260
|
var coordinatePoint = GeometryUtils.twoLinesIntersection(lineFunction.a, lineFunction.b, lineFunction.c, RectLineFuction.a, RectLineFuction.b, RectLineFuction.c);
|
|
257
261
|
if (coordinatePoint !== undefined) {
|
|
258
|
-
if (
|
|
259
|
-
|
|
262
|
+
if (
|
|
263
|
+
// intersection point is on the other line
|
|
264
|
+
GeometryUtils.pointsDistance(p0.x, p0.y, p1.x, p1.y) > GeometryUtils.pointsDistance(p0.x, p0.y, coordinatePoint.x, coordinatePoint.y) && GeometryUtils.pointsDistance(p0.x, p0.y, p1.x, p1.y) > GeometryUtils.pointsDistance(p1.x, p1.y, coordinatePoint.x, coordinatePoint.y)) {
|
|
265
|
+
// check the intersection point is outside direction of edge
|
|
266
|
+
var isOutside = true;
|
|
267
|
+
for (var j = 0; j < curiteminfo.rectCenterPoint.length; j++) {
|
|
268
|
+
if (j === i) continue;
|
|
269
|
+
var otherCenterPoint = curiteminfo.rectCenterPoint[j];
|
|
270
|
+
if (GeometryUtils.isPointOnLineSegment(centerpoint[0].x, centerpoint[0].y, coordinatePoint.x, coordinatePoint.y, otherCenterPoint[0].x, otherCenterPoint[0].y)) isOutside = false;
|
|
271
|
+
}
|
|
272
|
+
if (isOutside && GeometryUtils.pointsDistance(coordinatePoint.x, coordinatePoint.y, center_x, center_y) > GeometryUtils.pointsDistance(centerpoint[0].x, centerpoint[0].y, coordinatePoint.x, coordinatePoint.y)) {
|
|
260
273
|
comparelength.push(GeometryUtils.pointsDistance(centerpoint[0].x, centerpoint[0].y, coordinatePoint.x, coordinatePoint.y));
|
|
261
274
|
a = Math.min.apply(null, comparelength);
|
|
262
275
|
}
|
|
@@ -264,7 +277,10 @@ export default function Item(_ref, _ref2) {
|
|
|
264
277
|
}
|
|
265
278
|
});
|
|
266
279
|
PointArray.push([a, centerpoint[1]]);
|
|
267
|
-
}
|
|
280
|
+
};
|
|
281
|
+
for (var i = 0; i < curiteminfo.rectCenterPoint.length; i++) {
|
|
282
|
+
_loop(i);
|
|
283
|
+
}
|
|
268
284
|
return {
|
|
269
285
|
PointArray: PointArray
|
|
270
286
|
};
|
|
@@ -1386,7 +1386,7 @@ var Scene3DViewer = /*#__PURE__*/function (_React$Component) {
|
|
|
1386
1386
|
altitude = convert(altitude).from(unit).to(_this2.props.state.scene.unit);
|
|
1387
1387
|
}
|
|
1388
1388
|
scene3D.remove(angleObj);
|
|
1389
|
-
|
|
1389
|
+
scene3D.remove(toolObj);
|
|
1390
1390
|
if (!_this2.props.downloadFlag && !_this2.props.state.mode.includes('ING')) {
|
|
1391
1391
|
_this2.props.setToolbar('');
|
|
1392
1392
|
}
|
|
@@ -1460,7 +1460,8 @@ var Scene3DViewer = /*#__PURE__*/function (_React$Component) {
|
|
|
1460
1460
|
});
|
|
1461
1461
|
});
|
|
1462
1462
|
var intersects = raycaster.intersectObjects(meshes, true);
|
|
1463
|
-
var _i10;
|
|
1463
|
+
var _i10; // index of warning object in intersects
|
|
1464
|
+
|
|
1464
1465
|
if (intersects.length > 0 && !isNaN(intersects[0].distance)) {
|
|
1465
1466
|
for (_i10 = 0; _i10 < intersects.length; _i10++) {
|
|
1466
1467
|
if (intersects[_i10].object.name === 'warningObj') break;
|
|
@@ -1488,6 +1489,19 @@ var Scene3DViewer = /*#__PURE__*/function (_React$Component) {
|
|
|
1488
1489
|
}
|
|
1489
1490
|
}
|
|
1490
1491
|
gridMatrix.copy(gridPlane.matrixWorld).invert();
|
|
1492
|
+
var addItemToolObj = function addItemToolObj() {
|
|
1493
|
+
var _intersects$_i;
|
|
1494
|
+
var selectedItem = planData.sceneGraph.layers[selectedObject.layerID].items[selectedObject.itemID];
|
|
1495
|
+
if (isUndefined(selectedItem)) return;
|
|
1496
|
+
selectedElement = _this2.props.state.scene.layers.get(selectedObject.layerID).items.get(selectedObject.itemID);
|
|
1497
|
+
var itemPos = selectedItem.position.clone();
|
|
1498
|
+
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) {
|
|
1499
|
+
toolObj.position.set(intersects[_i10].point.x, intersects[_i10].point.y, intersects[_i10].point.z);
|
|
1500
|
+
} else {
|
|
1501
|
+
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);
|
|
1502
|
+
}
|
|
1503
|
+
scene3D.add(toolObj);
|
|
1504
|
+
};
|
|
1491
1505
|
if (Math.abs(mouse.x - _this2.lastMousePosition.x) <= 0.02 && Math.abs(mouse.y - _this2.lastMousePosition.y) <= 0.02 || bMove) {
|
|
1492
1506
|
if (intersects.length > 0 && !isNaN(intersects[0].distance)) {
|
|
1493
1507
|
if (intersects[_i10] === undefined) {
|
|
@@ -1511,16 +1525,7 @@ var Scene3DViewer = /*#__PURE__*/function (_React$Component) {
|
|
|
1511
1525
|
isSelected = true;
|
|
1512
1526
|
setTimeout(function () {
|
|
1513
1527
|
getDistances(layer);
|
|
1514
|
-
|
|
1515
|
-
if (isUndefined(selectedItem)) return;
|
|
1516
|
-
selectedElement = _this2.props.state.scene.layers.get(selectedObject.layerID).items.get(selectedObject.itemID);
|
|
1517
|
-
var itemPos = selectedItem.position.clone();
|
|
1518
|
-
if (intersects[_i10].object.parent && intersects[_i10].object.parent.parent.userData.itemId === selectedItem.userData.itemId) {
|
|
1519
|
-
toolObj.position.set(intersects[_i10].point.x, intersects[_i10].point.y, intersects[_i10].point.z);
|
|
1520
|
-
} else {
|
|
1521
|
-
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);
|
|
1522
|
-
}
|
|
1523
|
-
scene3D.add(toolObj);
|
|
1528
|
+
addItemToolObj();
|
|
1524
1529
|
_this2.setState({
|
|
1525
1530
|
toolObj: toolObj
|
|
1526
1531
|
});
|
|
@@ -1543,7 +1548,6 @@ var Scene3DViewer = /*#__PURE__*/function (_React$Component) {
|
|
|
1543
1548
|
case 'holeID' in selectedObject:
|
|
1544
1549
|
elementID = selectedObject.holeID;
|
|
1545
1550
|
elementPrototype = 'holes';
|
|
1546
|
-
scene3D.remove(toolObj);
|
|
1547
1551
|
if (_this2.props.state.mode === MODE_DRAGGING_HOLE_3D) {
|
|
1548
1552
|
actions.holesActions.endDraggingHole3D(sPoint.x, sPoint.y);
|
|
1549
1553
|
}
|
|
@@ -1551,12 +1555,10 @@ var Scene3DViewer = /*#__PURE__*/function (_React$Component) {
|
|
|
1551
1555
|
case 'lineID' in selectedObject:
|
|
1552
1556
|
elementID = selectedObject.lineID;
|
|
1553
1557
|
elementPrototype = 'lines';
|
|
1554
|
-
scene3D.remove(toolObj);
|
|
1555
1558
|
break;
|
|
1556
1559
|
case 'areaID' in selectedObject:
|
|
1557
1560
|
elementID = selectedObject.areaID;
|
|
1558
1561
|
elementPrototype = 'areas';
|
|
1559
|
-
scene3D.remove(toolObj);
|
|
1560
1562
|
break;
|
|
1561
1563
|
default:
|
|
1562
1564
|
break;
|
|
@@ -1566,24 +1568,22 @@ var Scene3DViewer = /*#__PURE__*/function (_React$Component) {
|
|
|
1566
1568
|
isSelected = false;
|
|
1567
1569
|
}
|
|
1568
1570
|
} else {
|
|
1569
|
-
|
|
1570
|
-
|
|
1571
|
-
|
|
1572
|
-
|
|
1573
|
-
|
|
1574
|
-
|
|
1575
|
-
|
|
1576
|
-
|
|
1577
|
-
|
|
1571
|
+
var selectedItem = planData.sceneGraph.layers[selectedObject.layerID].items[selectedObject.itemID];
|
|
1572
|
+
if (bMove && !isEmpty(selectedItem)) {
|
|
1573
|
+
addItemToolObj();
|
|
1574
|
+
} else {
|
|
1575
|
+
isSelected = false;
|
|
1576
|
+
_this2.context.projectActions.unselectAll();
|
|
1577
|
+
switch (true) {
|
|
1578
|
+
case 'holeID' in selectedObject:
|
|
1579
|
+
actions.holesActions.endDraggingHole3D(sPoint.x, sPoint.y);
|
|
1580
|
+
break;
|
|
1581
|
+
default:
|
|
1582
|
+
_this2.context.itemsActions.removeReplacingSupport();
|
|
1583
|
+
break;
|
|
1584
|
+
}
|
|
1578
1585
|
}
|
|
1579
1586
|
}
|
|
1580
|
-
var selectedItem = planData.sceneGraph.layers[selectedObject.layerID].items[selectedObject.itemID];
|
|
1581
|
-
if (selectedItem) {
|
|
1582
|
-
selectedElement = _this2.props.state.scene.layers.get(selectedObject.layerID).items.get(selectedObject.itemID);
|
|
1583
|
-
var itemPos = selectedItem.position.clone();
|
|
1584
|
-
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);
|
|
1585
|
-
scene3D.add(toolObj);
|
|
1586
|
-
}
|
|
1587
1587
|
bMove = false;
|
|
1588
1588
|
bRotate = false;
|
|
1589
1589
|
bMoveUP = false;
|
|
@@ -1602,35 +1602,15 @@ var Scene3DViewer = /*#__PURE__*/function (_React$Component) {
|
|
|
1602
1602
|
}
|
|
1603
1603
|
getPoint(event, alti);
|
|
1604
1604
|
if (bRotate) {
|
|
1605
|
-
|
|
1606
|
-
var _selectedItem = planData.sceneGraph.layers[selectedObject.layerID].items[selectedObject.itemID];
|
|
1607
|
-
if (isUndefined(_selectedItem)) return;
|
|
1608
|
-
selectedElement = _this2.props.state.scene.layers.get(selectedObject.layerID).items.get(selectedObject.itemID);
|
|
1609
|
-
var _itemPos = _selectedItem.position.clone();
|
|
1610
|
-
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) {
|
|
1611
|
-
toolObj.position.set(intersects[_i10].point.x, intersects[_i10].point.y, intersects[_i10].point.z);
|
|
1612
|
-
} else {
|
|
1613
|
-
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);
|
|
1614
|
-
}
|
|
1615
|
-
scene3D.add(toolObj);
|
|
1605
|
+
addItemToolObj();
|
|
1616
1606
|
_this2.setState({
|
|
1617
1607
|
toolObj: toolObj
|
|
1618
1608
|
});
|
|
1619
1609
|
_this2.context.itemsActions.endRotatingItem3D(Point.x, Point.y);
|
|
1620
1610
|
bRotate = false;
|
|
1621
|
-
}
|
|
1622
|
-
if (bMove) {
|
|
1611
|
+
} else if (bMove) {
|
|
1623
1612
|
bMove = false;
|
|
1624
|
-
|
|
1625
|
-
if (isUndefined(_selectedItem2)) return;
|
|
1626
|
-
selectedElement = _this2.props.state.scene.layers.get(selectedObject.layerID).items.get(selectedObject.itemID);
|
|
1627
|
-
var _itemPos2 = _selectedItem2.position.clone();
|
|
1628
|
-
if (intersects[_i10].object.parent.parent.userData.itemId === _selectedItem2.userData.itemId) {
|
|
1629
|
-
toolObj.position.set(intersects[_i10].point.x, intersects[_i10].point.y, intersects[_i10].point.z);
|
|
1630
|
-
} else {
|
|
1631
|
-
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);
|
|
1632
|
-
}
|
|
1633
|
-
scene3D.add(toolObj);
|
|
1613
|
+
addItemToolObj();
|
|
1634
1614
|
_this2.setState({
|
|
1635
1615
|
toolObj: toolObj
|
|
1636
1616
|
});
|
|
@@ -1650,7 +1630,7 @@ var Scene3DViewer = /*#__PURE__*/function (_React$Component) {
|
|
|
1650
1630
|
_item3D.position.z = targetPoint.z;
|
|
1651
1631
|
_item3D.visible = true;
|
|
1652
1632
|
}
|
|
1653
|
-
}
|
|
1633
|
+
} else {}
|
|
1654
1634
|
if (bMoveUP) {
|
|
1655
1635
|
bMoveUP = false;
|
|
1656
1636
|
}
|
package/es/constants.js
CHANGED
|
@@ -653,7 +653,7 @@ export var PROJECT_SETTING_OPTION = {
|
|
|
653
653
|
CHANGE_WINDOW_DOOR_MEASURE: CHANGE_WINDOW_DOOR_MEASURE
|
|
654
654
|
};
|
|
655
655
|
export var HOLE_NAMES = {
|
|
656
|
-
WINDOW_CLEAR: '
|
|
656
|
+
WINDOW_CLEAR: 'Window',
|
|
657
657
|
WINDOW_CROSS: 'Cross Window',
|
|
658
658
|
WINDOW_DOUBLE_HUNG: 'Double Hung Window',
|
|
659
659
|
WINDOW_VERTICAL: 'window-vertical',
|
package/es/devLiteRenderer.js
CHANGED
|
@@ -1,12 +1,13 @@
|
|
|
1
1
|
import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
|
|
2
2
|
import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
|
|
3
3
|
import _regeneratorRuntime from "@babel/runtime/regenerator";
|
|
4
|
-
import React, { useState, useEffect } from
|
|
5
|
-
import { Map } from
|
|
6
|
-
import ContainerDimensions from
|
|
4
|
+
import React, { useState, useEffect } from 'react';
|
|
5
|
+
import { Map } from 'immutable';
|
|
6
|
+
import ContainerDimensions from 'react-container-dimensions';
|
|
7
7
|
import projectItemsCatalog from "./mocks/projectItemsCatalog.json";
|
|
8
8
|
import mockProps from "./mocks/mockProps.json";
|
|
9
9
|
import cabinetPaylod from "./mocks/cabinetPayload2.json";
|
|
10
|
+
import cabinetW0940Payload from "./mocks/cabinetPayload.json";
|
|
10
11
|
import appliancePaylod from "./mocks/appliancePayload.json";
|
|
11
12
|
import doorStylePaylod2 from "./mocks/doorStylePayload2.json";
|
|
12
13
|
import roomShapePayload from "./mocks/roomShapePayload.json";
|
|
@@ -16,15 +17,15 @@ import furnishingPayload from "./mocks/furnishingPayload.json";
|
|
|
16
17
|
import rectangleData from "./mocks/rectangleShape.json";
|
|
17
18
|
import moldingPayload from "./mocks/moldingPayload.json";
|
|
18
19
|
import replaceCabinetPayload from "./mocks/replaceCabinetPayload.json";
|
|
19
|
-
import ReactDOM from
|
|
20
|
+
import ReactDOM from 'react-dom';
|
|
20
21
|
import LiteRenderer from "./LiteRenderer";
|
|
21
|
-
import { Button } from
|
|
22
|
+
import { Button } from 'antd';
|
|
22
23
|
import { LEFT, RIGHT, TOP, BOTTOM, EXTERNAL_EVENT_ADD_ITEM, EXTERNAL_EVENT_ADD_WALL, EXTERNAL_EVENT_TOGGLE_TO_3D, EXTERNAL_EVENT_TOGGLE_TO_2D, EXTERNAL_EVENT_TOGGLE_TO_ELEVATION, EXTERNAL_EVENT_MOVE_PAN, EXTERNAL_EVENT_NEW_PROJECT, EXTERNAL_EVENT_CHANGE_DOORSTYLE, EXTERNAL_EVENT_ADD_ROOM_SHAPE, EXTERNAL_EVENT_ZOOM_IN, EXTERNAL_EVENT_ZOOM_OUT, EXTERNAL_EVENT_UNDO, EXTERNAL_EVENT_REDO, EXTERNAL_EVENT_SET_MOLDING, EXTERNAL_EVENT_PROJECT_SETTING, PROJECT_SETTING_OPTION, EXTERNAL_EVENT_SYNC_SCENE, EXTERNAL_EVENT_UPDATE_ATTRIBUTE, BACK_DIST_ANG, ATT_ITEM_POS, ATT_ITEM_ROTATION, ATT_LINE_LENGTH, EXTERNAL_EVENT_UPDATE_PROPERTY, PROP_FLIP_DOOR_HANDLE, PROP_OPEN_DOORS, EXTERNAL_EVENT_LOAD_PROJECT, INTERNAL_EVENT_ITEMS_CATALOG, EXTERNAL_EVENT_ADD_HOLE, HOLE_NAMES, EXTERNAL_EVENT_CENTERING_2D, PROP_ALTITUDE, EXTERNAL_EVENT_DUPLICATE_ELEMENT, ELEMENT_ITEM, EXTERNAL_EVENT_DELETE_ELEMENT, PROP_RESIZE_WIDTH, EXTERNAL_EVENT_REPLACE_CABINET, EXTERNAL_EVENT_SET_FINISHING, FINISHING_TYPE } from "./constants";
|
|
23
24
|
import { convert } from "./utils/convert-units-lite";
|
|
24
25
|
|
|
25
26
|
// --- renderer props ---
|
|
26
27
|
var options = {
|
|
27
|
-
unit:
|
|
28
|
+
unit: 'in',
|
|
28
29
|
enable3D: true
|
|
29
30
|
};
|
|
30
31
|
var onInternalEvent = /*#__PURE__*/function () {
|
|
@@ -33,7 +34,7 @@ var onInternalEvent = /*#__PURE__*/function () {
|
|
|
33
34
|
return _regeneratorRuntime.wrap(function (_context) {
|
|
34
35
|
while (1) switch (_context.prev = _context.next) {
|
|
35
36
|
case 0:
|
|
36
|
-
console.log(
|
|
37
|
+
console.log('EVENT:', evt.type, evt.value);
|
|
37
38
|
_t = evt.type;
|
|
38
39
|
_context.next = _t === INTERNAL_EVENT_ITEMS_CATALOG ? 1 : 3;
|
|
39
40
|
break;
|
|
@@ -52,7 +53,7 @@ var onInternalEvent = /*#__PURE__*/function () {
|
|
|
52
53
|
return _ref.apply(this, arguments);
|
|
53
54
|
};
|
|
54
55
|
}();
|
|
55
|
-
document.getElementById(
|
|
56
|
+
document.getElementById('app').style.display = 'block';
|
|
56
57
|
function WorkSpace(props) {
|
|
57
58
|
var _useState = useState(null),
|
|
58
59
|
_useState2 = _slicedToArray(_useState, 2),
|
|
@@ -214,6 +215,15 @@ function WorkSpace(props) {
|
|
|
214
215
|
setExternalEvent(evt);
|
|
215
216
|
}
|
|
216
217
|
}, "Add B12 Cabinet"), /*#__PURE__*/React.createElement(Button, {
|
|
218
|
+
actionType: "danger",
|
|
219
|
+
onClick: function onClick() {
|
|
220
|
+
var evt = {
|
|
221
|
+
type: EXTERNAL_EVENT_ADD_ITEM,
|
|
222
|
+
payload: cabinetW0940Payload
|
|
223
|
+
};
|
|
224
|
+
setExternalEvent(evt);
|
|
225
|
+
}
|
|
226
|
+
}, "Add W0930 Cabinet"), /*#__PURE__*/React.createElement(Button, {
|
|
217
227
|
actionType: "danger",
|
|
218
228
|
onClick: function onClick() {
|
|
219
229
|
var evt = {
|
|
@@ -232,91 +242,91 @@ function WorkSpace(props) {
|
|
|
232
242
|
var evt = {
|
|
233
243
|
type: EXTERNAL_EVENT_ADD_ROOM_SHAPE,
|
|
234
244
|
payload: {
|
|
235
|
-
roomShapeType:
|
|
245
|
+
roomShapeType: 'rectangle',
|
|
236
246
|
width: 250,
|
|
237
247
|
height: 100,
|
|
238
248
|
doorStyle: {
|
|
239
249
|
id: 36,
|
|
240
|
-
type:
|
|
241
|
-
name:
|
|
242
|
-
thumbnail:
|
|
243
|
-
texture:
|
|
244
|
-
color:
|
|
250
|
+
type: 'door',
|
|
251
|
+
name: 'Brilliant White Shaker',
|
|
252
|
+
thumbnail: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/thumbnail/Brilliant%20White%20Shaker%20-%20RTA.jpg',
|
|
253
|
+
texture: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
|
|
254
|
+
color: '#ffffff',
|
|
245
255
|
glossness: 1,
|
|
246
256
|
door_style_id: 42,
|
|
247
257
|
brightness: 1,
|
|
248
|
-
sku:
|
|
249
|
-
color_family:
|
|
250
|
-
color_sku_alias:
|
|
251
|
-
door_style_name:
|
|
252
|
-
install:
|
|
258
|
+
sku: 'SW',
|
|
259
|
+
color_family: ',10,',
|
|
260
|
+
color_sku_alias: 'SW',
|
|
261
|
+
door_style_name: 'Shaker',
|
|
262
|
+
install: '',
|
|
253
263
|
doorStyles: {
|
|
254
|
-
base:
|
|
255
|
-
counttop:
|
|
256
|
-
interior:
|
|
257
|
-
base_door_1:
|
|
258
|
-
base_fixed_drawer_door_1:
|
|
259
|
-
base_drawer_1:
|
|
260
|
-
base_drawer_door_1:
|
|
261
|
-
door_handle_1:
|
|
262
|
-
fixed_drawer_door_handle_1:
|
|
263
|
-
drawer_door_handle_1:
|
|
264
|
-
base_door_2:
|
|
265
|
-
base_fixed_drawer_door_2:
|
|
266
|
-
base_drawer_2:
|
|
267
|
-
base_drawer_door_2:
|
|
268
|
-
door_handle_2:
|
|
269
|
-
fixed_drawer_door_handle_2:
|
|
270
|
-
drawer_door_handle_2:
|
|
271
|
-
base_door_3:
|
|
272
|
-
base_fixed_drawer_door_3:
|
|
273
|
-
base_drawer_3:
|
|
274
|
-
base_drawer_door_3:
|
|
275
|
-
door_handle_3:
|
|
276
|
-
fixed_drawer_door_handle_3:
|
|
277
|
-
drawer_door_handle_3:
|
|
278
|
-
base_door_4:
|
|
279
|
-
base_fixed_drawer_door_4:
|
|
280
|
-
base_drawer_4:
|
|
281
|
-
base_drawer_door_4:
|
|
282
|
-
door_handle_4:
|
|
283
|
-
fixed_drawer_door_handle_4:
|
|
284
|
-
drawer_door_handle_4:
|
|
285
|
-
base_door_5:
|
|
286
|
-
base_fixed_drawer_door_5:
|
|
287
|
-
base_drawer_5:
|
|
288
|
-
base_drawer_door_5:
|
|
289
|
-
door_handle_5:
|
|
290
|
-
fixed_drawer_door_handle_5:
|
|
291
|
-
drawer_door_handle_5:
|
|
292
|
-
base_door_6:
|
|
293
|
-
base_fixed_drawer_door_6:
|
|
294
|
-
base_drawer_6:
|
|
295
|
-
base_drawer_door_6:
|
|
296
|
-
door_handle_6:
|
|
297
|
-
fixed_drawer_door_handle_6:
|
|
298
|
-
drawer_door_handle_6:
|
|
299
|
-
base_door_7:
|
|
300
|
-
base_fixed_drawer_door_7:
|
|
301
|
-
base_drawer_7:
|
|
302
|
-
base_drawer_door_7:
|
|
303
|
-
door_handle_7:
|
|
304
|
-
fixed_drawer_door_handle_7:
|
|
305
|
-
drawer_door_handle_7:
|
|
306
|
-
base_door_8:
|
|
307
|
-
base_fixed_drawer_door_8:
|
|
308
|
-
base_drawer_8:
|
|
309
|
-
base_drawer_door_8:
|
|
310
|
-
door_handle_8:
|
|
311
|
-
fixed_drawer_door_handle_8:
|
|
312
|
-
drawer_door_handle_8:
|
|
313
|
-
base_door_9:
|
|
314
|
-
base_fixed_drawer_door_9:
|
|
315
|
-
base_drawer_9:
|
|
316
|
-
base_drawer_door_9:
|
|
317
|
-
door_handle_9:
|
|
318
|
-
fixed_drawer_door_handle_9:
|
|
319
|
-
drawer_door_handle_9:
|
|
264
|
+
base: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
|
|
265
|
+
counttop: 'https://media.test.diydesignspace.com/uploads/CountTop/202105074107_5/texture/Unique_Calcatta_texture.jpg',
|
|
266
|
+
interior: 'https://media.test.diydesignspace.com/uploads/assets/default/maple.jpg',
|
|
267
|
+
base_door_1: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
|
|
268
|
+
base_fixed_drawer_door_1: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
|
|
269
|
+
base_drawer_1: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
|
|
270
|
+
base_drawer_door_1: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
|
|
271
|
+
door_handle_1: 'https://media.test.diydesignspace.com/uploads/assets/default/steel.jpg',
|
|
272
|
+
fixed_drawer_door_handle_1: 'https://media.test.diydesignspace.com/uploads/assets/default/steel.jpg',
|
|
273
|
+
drawer_door_handle_1: 'https://media.test.diydesignspace.com/uploads/assets/default/steel.jpg',
|
|
274
|
+
base_door_2: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
|
|
275
|
+
base_fixed_drawer_door_2: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
|
|
276
|
+
base_drawer_2: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
|
|
277
|
+
base_drawer_door_2: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
|
|
278
|
+
door_handle_2: 'https://media.test.diydesignspace.com/uploads/assets/default/steel.jpg',
|
|
279
|
+
fixed_drawer_door_handle_2: 'https://media.test.diydesignspace.com/uploads/assets/default/steel.jpg',
|
|
280
|
+
drawer_door_handle_2: 'https://media.test.diydesignspace.com/uploads/assets/default/steel.jpg',
|
|
281
|
+
base_door_3: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
|
|
282
|
+
base_fixed_drawer_door_3: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
|
|
283
|
+
base_drawer_3: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
|
|
284
|
+
base_drawer_door_3: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
|
|
285
|
+
door_handle_3: 'https://media.test.diydesignspace.com/uploads/assets/default/steel.jpg',
|
|
286
|
+
fixed_drawer_door_handle_3: 'https://media.test.diydesignspace.com/uploads/assets/default/steel.jpg',
|
|
287
|
+
drawer_door_handle_3: 'https://media.test.diydesignspace.com/uploads/assets/default/steel.jpg',
|
|
288
|
+
base_door_4: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
|
|
289
|
+
base_fixed_drawer_door_4: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
|
|
290
|
+
base_drawer_4: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
|
|
291
|
+
base_drawer_door_4: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
|
|
292
|
+
door_handle_4: 'https://media.test.diydesignspace.com/uploads/assets/default/steel.jpg',
|
|
293
|
+
fixed_drawer_door_handle_4: 'https://media.test.diydesignspace.com/uploads/assets/default/steel.jpg',
|
|
294
|
+
drawer_door_handle_4: 'https://media.test.diydesignspace.com/uploads/assets/default/steel.jpg',
|
|
295
|
+
base_door_5: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
|
|
296
|
+
base_fixed_drawer_door_5: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
|
|
297
|
+
base_drawer_5: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
|
|
298
|
+
base_drawer_door_5: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
|
|
299
|
+
door_handle_5: 'https://media.test.diydesignspace.com/uploads/assets/default/steel.jpg',
|
|
300
|
+
fixed_drawer_door_handle_5: 'https://media.test.diydesignspace.com/uploads/assets/default/steel.jpg',
|
|
301
|
+
drawer_door_handle_5: 'https://media.test.diydesignspace.com/uploads/assets/default/steel.jpg',
|
|
302
|
+
base_door_6: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
|
|
303
|
+
base_fixed_drawer_door_6: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
|
|
304
|
+
base_drawer_6: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
|
|
305
|
+
base_drawer_door_6: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
|
|
306
|
+
door_handle_6: 'https://media.test.diydesignspace.com/uploads/assets/default/steel.jpg',
|
|
307
|
+
fixed_drawer_door_handle_6: 'https://media.test.diydesignspace.com/uploads/assets/default/steel.jpg',
|
|
308
|
+
drawer_door_handle_6: 'https://media.test.diydesignspace.com/uploads/assets/default/steel.jpg',
|
|
309
|
+
base_door_7: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
|
|
310
|
+
base_fixed_drawer_door_7: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
|
|
311
|
+
base_drawer_7: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
|
|
312
|
+
base_drawer_door_7: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
|
|
313
|
+
door_handle_7: 'https://media.test.diydesignspace.com/uploads/assets/default/steel.jpg',
|
|
314
|
+
fixed_drawer_door_handle_7: 'https://media.test.diydesignspace.com/uploads/assets/default/steel.jpg',
|
|
315
|
+
drawer_door_handle_7: 'https://media.test.diydesignspace.com/uploads/assets/default/steel.jpg',
|
|
316
|
+
base_door_8: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
|
|
317
|
+
base_fixed_drawer_door_8: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
|
|
318
|
+
base_drawer_8: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
|
|
319
|
+
base_drawer_door_8: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
|
|
320
|
+
door_handle_8: 'https://media.test.diydesignspace.com/uploads/assets/default/steel.jpg',
|
|
321
|
+
fixed_drawer_door_handle_8: 'https://media.test.diydesignspace.com/uploads/assets/default/steel.jpg',
|
|
322
|
+
drawer_door_handle_8: 'https://media.test.diydesignspace.com/uploads/assets/default/steel.jpg',
|
|
323
|
+
base_door_9: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
|
|
324
|
+
base_fixed_drawer_door_9: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
|
|
325
|
+
base_drawer_9: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
|
|
326
|
+
base_drawer_door_9: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
|
|
327
|
+
door_handle_9: 'https://media.test.diydesignspace.com/uploads/assets/default/steel.jpg',
|
|
328
|
+
fixed_drawer_door_handle_9: 'https://media.test.diydesignspace.com/uploads/assets/default/steel.jpg',
|
|
329
|
+
drawer_door_handle_9: 'https://media.test.diydesignspace.com/uploads/assets/default/steel.jpg'
|
|
320
330
|
},
|
|
321
331
|
installation_types: [125, 124]
|
|
322
332
|
}
|
|
@@ -475,7 +485,7 @@ function WorkSpace(props) {
|
|
|
475
485
|
// cm
|
|
476
486
|
_length: 10,
|
|
477
487
|
// inch
|
|
478
|
-
_unit:
|
|
488
|
+
_unit: 'in'
|
|
479
489
|
})
|
|
480
490
|
}
|
|
481
491
|
};
|
|
@@ -488,7 +498,7 @@ function WorkSpace(props) {
|
|
|
488
498
|
type: EXTERNAL_EVENT_DUPLICATE_ELEMENT,
|
|
489
499
|
payload: {
|
|
490
500
|
elementPrototype: ELEMENT_ITEM,
|
|
491
|
-
elementId:
|
|
501
|
+
elementId: '' // id of current operating element
|
|
492
502
|
}
|
|
493
503
|
};
|
|
494
504
|
setExternalEvent(evt);
|
|
@@ -500,7 +510,7 @@ function WorkSpace(props) {
|
|
|
500
510
|
type: EXTERNAL_EVENT_DELETE_ELEMENT,
|
|
501
511
|
payload: {
|
|
502
512
|
elementPrototype: ELEMENT_ITEM,
|
|
503
|
-
elementId:
|
|
513
|
+
elementId: '' // id of current operating element
|
|
504
514
|
}
|
|
505
515
|
};
|
|
506
516
|
setExternalEvent(evt);
|
|
@@ -561,7 +571,7 @@ function WorkSpace(props) {
|
|
|
561
571
|
type: EXTERNAL_EVENT_SET_FINISHING,
|
|
562
572
|
payload: {
|
|
563
573
|
category: FINISHING_TYPE.COUNTER_TOP,
|
|
564
|
-
texture:
|
|
574
|
+
texture: 'https://media.test.diydesignspace.com/uploads/CountTop/202111302746_7/texture/Arabescato_texture.jpg'
|
|
565
575
|
}
|
|
566
576
|
};
|
|
567
577
|
setExternalEvent(evt);
|
|
@@ -573,7 +583,7 @@ function WorkSpace(props) {
|
|
|
573
583
|
type: EXTERNAL_EVENT_SET_FINISHING,
|
|
574
584
|
payload: {
|
|
575
585
|
category: FINISHING_TYPE.BACKSPLASH,
|
|
576
|
-
texture:
|
|
586
|
+
texture: 'https://media.test.diydesignspace.com/uploads/CountTop/202305225249_14/texture/Unique_Marquina_texture.jpg'
|
|
577
587
|
}
|
|
578
588
|
};
|
|
579
589
|
setExternalEvent(evt);
|
|
@@ -585,7 +595,7 @@ function WorkSpace(props) {
|
|
|
585
595
|
type: EXTERNAL_EVENT_SET_FINISHING,
|
|
586
596
|
payload: {
|
|
587
597
|
category: FINISHING_TYPE.FLOOR_STYLE,
|
|
588
|
-
texture:
|
|
598
|
+
texture: 'https://media.test.diydesignspace.com/uploads/CountTop/202203163338_3/texture/oak-chestnut.webp'
|
|
589
599
|
}
|
|
590
600
|
};
|
|
591
601
|
setExternalEvent(evt);
|
|
@@ -597,7 +607,7 @@ function WorkSpace(props) {
|
|
|
597
607
|
type: EXTERNAL_EVENT_SET_FINISHING,
|
|
598
608
|
payload: {
|
|
599
609
|
category: FINISHING_TYPE.WALL_COLOR,
|
|
600
|
-
color:
|
|
610
|
+
color: '#bab863'
|
|
601
611
|
}
|
|
602
612
|
};
|
|
603
613
|
setExternalEvent(evt);
|
|
@@ -609,7 +619,7 @@ function WorkSpace(props) {
|
|
|
609
619
|
type: EXTERNAL_EVENT_SET_FINISHING,
|
|
610
620
|
payload: {
|
|
611
621
|
category: FINISHING_TYPE.DOOR_HANDLE,
|
|
612
|
-
gltf:
|
|
622
|
+
gltf: 'https://media.test.diydesignspace.com/uploads/DoorHandle/202107294150_29/gltf/Handle1.gltf'
|
|
613
623
|
}
|
|
614
624
|
};
|
|
615
625
|
setExternalEvent(evt);
|
|
@@ -636,7 +646,7 @@ function WorkSpace(props) {
|
|
|
636
646
|
// cm
|
|
637
647
|
_length: 27,
|
|
638
648
|
// inch
|
|
639
|
-
_unit:
|
|
649
|
+
_unit: 'in'
|
|
640
650
|
})
|
|
641
651
|
}
|
|
642
652
|
};
|
|
@@ -664,7 +674,7 @@ function WorkSpace(props) {
|
|
|
664
674
|
actionType: "danger",
|
|
665
675
|
onClick: function onClick() {
|
|
666
676
|
var _tl = Math.floor(Math.random() * 50);
|
|
667
|
-
var tl = convert(_tl).from(
|
|
677
|
+
var tl = convert(_tl).from('in').to('cm');
|
|
668
678
|
var evt = {
|
|
669
679
|
type: EXTERNAL_EVENT_UPDATE_PROPERTY,
|
|
670
680
|
payload: {
|
|
@@ -672,7 +682,7 @@ function WorkSpace(props) {
|
|
|
672
682
|
value: new Map({
|
|
673
683
|
_length: _tl,
|
|
674
684
|
// inch
|
|
675
|
-
_unit:
|
|
685
|
+
_unit: 'in',
|
|
676
686
|
length: tl // cm
|
|
677
687
|
})
|
|
678
688
|
}
|
|
@@ -697,7 +707,7 @@ function WorkSpace(props) {
|
|
|
697
707
|
// externalEvent: { id?, type, payload } | null,
|
|
698
708
|
// meta?: { filename?, lineno?, colno? }
|
|
699
709
|
// }
|
|
700
|
-
console.error(
|
|
710
|
+
console.error('TOOL ERROR:', payload);
|
|
701
711
|
}
|
|
702
712
|
}));
|
|
703
713
|
}
|
|
@@ -708,4 +718,4 @@ ReactDOM.render(/*#__PURE__*/React.createElement(ContainerDimensions, null, func
|
|
|
708
718
|
width: width,
|
|
709
719
|
height: height
|
|
710
720
|
});
|
|
711
|
-
}), document.getElementById(
|
|
721
|
+
}), document.getElementById('app') && document.getElementById('app'));
|