kitchen-simulator 1.1.1-test.7 → 1.1.1-test.70
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/@history.js +8 -2
- package/es/AppContext.js +8 -3
- package/es/KitchenConfigurator.js +93 -106
- package/es/KitchenConfiguratorApp.js +143 -154
- package/es/actions/area-actions.js +10 -5
- package/es/actions/export.js +27 -12
- package/es/actions/groups-actions.js +43 -27
- package/es/actions/holes-actions.js +53 -34
- package/es/actions/items-actions.js +143 -94
- package/es/actions/lines-actions.js +34 -21
- package/es/actions/project-actions.js +143 -94
- package/es/actions/scene-actions.js +19 -11
- package/es/actions/vertices-actions.js +13 -7
- package/es/actions/viewer2d-actions.js +34 -21
- package/es/actions/viewer3d-actions.js +16 -9
- package/es/catalog/areas/area/planner-element.js +16 -8
- package/es/catalog/catalog.js +19 -24
- package/es/catalog/factories/area-factory-3d.js +29 -22
- package/es/catalog/factories/area-factory.js +18 -14
- package/es/catalog/factories/export.js +12 -6
- package/es/catalog/factories/wall-factory-3d.js +39 -31
- package/es/catalog/factories/wall-factory.js +29 -21
- package/es/catalog/holes/door-closet/planner-element.js +22 -15
- package/es/catalog/holes/door-double/planner-element.js +22 -15
- package/es/catalog/holes/door-exterior/planner-element.js +23 -16
- package/es/catalog/holes/door-interior/planner-element.js +23 -16
- package/es/catalog/holes/door-panic/planner-element.js +14 -7
- package/es/catalog/holes/door-panic-double/planner-element.js +22 -15
- package/es/catalog/holes/door-sliding/planner-element.js +23 -16
- package/es/catalog/holes/doorway-framed/planner-element.js +18 -11
- package/es/catalog/holes/doorway-frameless/planner-element.js +14 -7
- package/es/catalog/holes/export.js +31 -13
- package/es/catalog/holes/window-clear/planner-element.js +17 -10
- package/es/catalog/holes/window-cross/planner-element.js +17 -10
- package/es/catalog/holes/window-double-hung/planner-element.js +17 -10
- package/es/catalog/holes/window-vertical/planner-element.js +17 -10
- package/es/catalog/lines/wall/planner-element.js +19 -11
- package/es/catalog/molding/molding-dcm/planner-element.js +12 -5
- package/es/catalog/molding/molding-fbm/planner-element.js +12 -5
- package/es/catalog/molding/molding-lrm/planner-element.js +12 -5
- package/es/catalog/properties/export.js +33 -20
- package/es/catalog/properties/property-checkbox.js +82 -35
- package/es/catalog/properties/property-color.js +21 -16
- package/es/catalog/properties/property-enum.js +70 -28
- package/es/catalog/properties/property-hidden.js +14 -9
- package/es/catalog/properties/property-lenght-measure.js +43 -39
- package/es/catalog/properties/property-length-measure.js +82 -34
- package/es/catalog/properties/property-length-measure_hole.js +43 -39
- package/es/catalog/properties/property-number.js +22 -17
- package/es/catalog/properties/property-read-only.js +21 -16
- package/es/catalog/properties/property-string.js +21 -16
- package/es/catalog/properties/property-toggle.js +21 -16
- package/es/catalog/properties/shared-property-style.js +5 -1
- package/es/catalog/utils/FuseUtils.js +13 -11
- package/es/catalog/utils/exporter.js +13 -11
- package/es/catalog/utils/geom-utils.js +27 -13
- package/es/catalog/utils/item-loader.js +95 -91
- package/es/catalog/utils/load-obj.js +26 -20
- package/es/catalog/utils/mtl-loader.js +7 -3
- package/es/catalog/utils/obj-loader.js +7 -3
- package/es/class/FuseUtils.js +13 -11
- package/es/class/area.js +26 -26
- package/es/class/export.js +38 -23
- package/es/class/group.js +57 -62
- package/es/class/guide.js +19 -19
- package/es/class/hole.js +87 -88
- package/es/class/item.js +148 -155
- package/es/class/layer.js +63 -63
- package/es/class/line.js +141 -144
- package/es/class/project.js +96 -94
- package/es/class/vertex.js +33 -33
- package/es/components/content.js +27 -19
- package/es/components/disclaimer/disclaimer.js +79 -93
- package/es/components/export.js +15 -8
- package/es/components/style/button.js +29 -30
- package/es/components/style/cancel-button.js +12 -8
- package/es/components/style/content-container.js +14 -12
- package/es/components/style/content-title.js +18 -15
- package/es/components/style/delete-button.js +15 -9
- package/es/components/style/export.js +48 -30
- package/es/components/style/form-block.js +13 -12
- package/es/components/style/form-color-input.js +12 -8
- package/es/components/style/form-label.js +13 -12
- package/es/components/style/form-number-input.js +71 -47
- package/es/components/style/form-number-input_2.js +42 -42
- package/es/components/style/form-select.js +58 -14
- package/es/components/style/form-slider.js +36 -16
- package/es/components/style/form-submit-button.js +15 -9
- package/es/components/style/form-text-input.js +55 -37
- package/es/components/viewer2d/area.js +22 -17
- package/es/components/viewer2d/export.js +48 -30
- package/es/components/viewer2d/grids/grid-horizontal-streak.js +15 -11
- package/es/components/viewer2d/grids/grid-streak.js +15 -11
- package/es/components/viewer2d/grids/grid-vertical-streak.js +15 -11
- package/es/components/viewer2d/grids/grids.js +17 -15
- package/es/components/viewer2d/group.js +22 -15
- package/es/components/viewer2d/item.js +68 -68
- package/es/components/viewer2d/layer.js +28 -23
- package/es/components/viewer2d/line.js +109 -104
- package/es/components/viewer2d/ruler.js +27 -23
- package/es/components/viewer2d/rulerDist.js +26 -21
- package/es/components/viewer2d/rulerX.js +45 -45
- package/es/components/viewer2d/rulerY.js +43 -43
- package/es/components/viewer2d/scene.js +40 -46
- package/es/components/viewer2d/snap.js +20 -13
- package/es/components/viewer2d/state.js +25 -23
- package/es/components/viewer2d/utils.js +63 -21
- package/es/components/viewer2d/vertex.js +15 -8
- package/es/components/viewer2d/viewer2d.js +169 -166
- package/es/components/viewer3d/camera-controls-module/camera-controls.module.js +21 -24
- package/es/components/viewer3d/dcm.js +5 -1
- package/es/components/viewer3d/fbm.js +5 -1
- package/es/components/viewer3d/front3D.js +19 -17
- package/es/components/viewer3d/grid-creator.js +15 -8
- package/es/components/viewer3d/grids/grid-horizontal-streak.js +12 -6
- package/es/components/viewer3d/grids/grid-streak.js +11 -5
- package/es/components/viewer3d/grids/grid-vertical-streak.js +12 -6
- package/es/components/viewer3d/libs/first-person-controls.js +7 -2
- package/es/components/viewer3d/libs/helvetiker_regular.typeface.js +5 -1
- package/es/components/viewer3d/libs/mtl-loader.js +6 -2
- package/es/components/viewer3d/libs/obj-loader.js +6 -2
- package/es/components/viewer3d/libs/orbit-controls.js +10 -5
- package/es/components/viewer3d/libs/pointer-lock-controls.js +9 -4
- package/es/components/viewer3d/lrm.js +5 -1
- package/es/components/viewer3d/model.js +5 -1
- package/es/components/viewer3d/pointer-lock-navigation.js +8 -3
- package/es/components/viewer3d/ruler-utils/itemRect.js +23 -18
- package/es/components/viewer3d/ruler-utils/layer3D.js +64 -59
- package/es/components/viewer3d/ruler-utils/ruler3D.js +44 -42
- package/es/components/viewer3d/ruler-utils/scene3D.js +16 -11
- package/es/components/viewer3d/ruler-utils/state3D.js +9 -4
- package/es/components/viewer3d/scene-creator.js +225 -198
- package/es/components/viewer3d/three-memory-cleaner.js +10 -3
- package/es/components/viewer3d/viewer3d-first-person.js +44 -46
- package/es/components/viewer3d/viewer3d.js +206 -209
- package/es/constants.js +356 -349
- package/es/index.js +20 -15
- package/es/models.js +183 -183
- package/es/plugins/SVGLoader.js +51 -48
- package/es/plugins/autosave.js +7 -3
- package/es/plugins/console-debugger.js +10 -8
- package/es/plugins/export.js +15 -8
- package/es/plugins/keyboard.js +33 -29
- package/es/reducers/areas-reducer.js +11 -7
- package/es/reducers/export.js +39 -24
- package/es/reducers/groups-reducer.js +35 -31
- package/es/reducers/holes-reducer.js +47 -43
- package/es/reducers/items-reducer.js +110 -109
- package/es/reducers/lines-reducer.js +32 -28
- package/es/reducers/project-reducer.js +109 -105
- package/es/reducers/reducer.js +21 -16
- package/es/reducers/scene-reducer.js +19 -15
- package/es/reducers/user-reducer.js +9 -6
- package/es/reducers/vertices-reducer.js +15 -11
- package/es/reducers/viewer2d-reducer.js +22 -18
- package/es/reducers/viewer3d-reducer.js +20 -16
- package/es/shared-style.js +14 -10
- package/es/styles/export.js +9 -3
- package/es/translator/en.js +5 -1
- package/es/translator/it.js +5 -1
- package/es/translator/ru.js +5 -1
- package/es/translator/translator.js +17 -17
- package/es/utils/browser.js +7 -2
- package/es/utils/convert-units-lite.js +33 -0
- package/es/utils/email-validator.js +5 -1
- package/es/utils/export.js +32 -15
- package/es/utils/geometry.js +277 -191
- package/es/utils/get-edges-of-subgraphs.js +7 -1
- package/es/utils/graph-cycles.js +9 -9
- package/es/utils/graph-inner-cycles.js +16 -10
- package/es/utils/graph.js +15 -12
- package/es/utils/helper.js +61 -109
- package/es/utils/history.js +13 -8
- package/es/utils/id-broker.js +13 -12
- package/es/utils/logger.js +5 -1
- package/es/utils/math.js +10 -5
- package/es/utils/molding.js +175 -158
- package/es/utils/name-generator.js +11 -11
- package/es/utils/objects-utils.js +17 -7
- package/es/utils/phone-validator.js +5 -1
- package/es/utils/process-black-list.js +8 -6
- package/es/utils/react-if.js +10 -6
- package/es/utils/snap-scene.js +32 -32
- package/es/utils/snap.js +57 -51
- package/es/utils/summarizeCart.js +5 -1
- package/es/utils/threeCSG.es6.js +20 -17
- package/es/version.js +5 -1
- package/lib/@history.js +3 -2
- package/lib/AppContext.js +3 -2
- package/lib/KitchenConfigurator.js +70 -88
- package/lib/KitchenConfiguratorApp.js +98 -113
- package/lib/actions/export.js +1 -1
- package/lib/catalog/areas/area/planner-element.js +13 -8
- package/lib/catalog/catalog.js +9 -16
- package/lib/catalog/factories/area-factory-3d.js +1 -1
- package/lib/catalog/factories/area-factory.js +6 -7
- package/lib/catalog/factories/export.js +1 -1
- package/lib/catalog/factories/wall-factory-3d.js +4 -4
- package/lib/catalog/factories/wall-factory.js +4 -3
- package/lib/catalog/holes/door-closet/planner-element.js +4 -3
- package/lib/catalog/holes/door-double/planner-element.js +4 -3
- package/lib/catalog/holes/door-exterior/planner-element.js +4 -3
- package/lib/catalog/holes/door-interior/planner-element.js +4 -3
- package/lib/catalog/holes/door-panic/planner-element.js +4 -3
- package/lib/catalog/holes/door-panic-double/planner-element.js +4 -3
- package/lib/catalog/holes/door-sliding/planner-element.js +4 -3
- package/lib/catalog/holes/doorway-framed/planner-element.js +4 -3
- package/lib/catalog/holes/doorway-frameless/planner-element.js +4 -3
- package/lib/catalog/holes/export.js +14 -14
- package/lib/catalog/holes/window-clear/planner-element.js +4 -3
- package/lib/catalog/holes/window-cross/planner-element.js +4 -3
- package/lib/catalog/holes/window-double-hung/planner-element.js +4 -3
- package/lib/catalog/holes/window-vertical/planner-element.js +4 -3
- package/lib/catalog/lines/wall/planner-element.js +16 -11
- package/lib/catalog/molding/molding-dcm/planner-element.js +4 -3
- package/lib/catalog/molding/molding-fbm/planner-element.js +4 -3
- package/lib/catalog/molding/molding-lrm/planner-element.js +4 -3
- package/lib/catalog/properties/export.js +1 -1
- package/lib/catalog/properties/property-checkbox.js +68 -25
- package/lib/catalog/properties/property-color.js +3 -2
- package/lib/catalog/properties/property-enum.js +54 -16
- package/lib/catalog/properties/property-hidden.js +3 -2
- package/lib/catalog/properties/property-lenght-measure.js +10 -10
- package/lib/catalog/properties/property-length-measure.js +61 -17
- package/lib/catalog/properties/property-length-measure_hole.js +10 -10
- package/lib/catalog/properties/property-number.js +3 -2
- package/lib/catalog/properties/property-read-only.js +3 -2
- package/lib/catalog/properties/property-string.js +3 -2
- package/lib/catalog/properties/property-toggle.js +3 -2
- package/lib/catalog/properties/shared-property-style.js +2 -1
- package/lib/catalog/utils/FuseUtils.js +10 -11
- package/lib/catalog/utils/exporter.js +10 -12
- package/lib/catalog/utils/geom-utils.js +1 -1
- package/lib/catalog/utils/item-loader.js +29 -35
- package/lib/catalog/utils/mtl-loader.js +7 -3
- package/lib/catalog/utils/obj-loader.js +7 -3
- package/lib/class/FuseUtils.js +10 -11
- package/lib/class/area.js +9 -11
- package/lib/class/export.js +1 -1
- package/lib/class/group.js +13 -20
- package/lib/class/guide.js +9 -12
- package/lib/class/hole.js +7 -9
- package/lib/class/item.js +25 -35
- package/lib/class/layer.js +7 -9
- package/lib/class/line.js +14 -20
- package/lib/class/project.js +10 -11
- package/lib/class/vertex.js +9 -11
- package/lib/components/content.js +5 -3
- package/lib/components/disclaimer/disclaimer.js +69 -88
- package/lib/components/export.js +1 -1
- package/lib/components/style/button.js +17 -22
- package/lib/components/style/cancel-button.js +7 -7
- package/lib/components/style/content-container.js +5 -7
- package/lib/components/style/content-title.js +10 -12
- package/lib/components/style/delete-button.js +8 -8
- package/lib/components/style/export.js +1 -1
- package/lib/components/style/form-block.js +9 -12
- package/lib/components/style/form-color-input.js +7 -7
- package/lib/components/style/form-label.js +9 -12
- package/lib/components/style/form-number-input.js +43 -23
- package/lib/components/style/form-number-input_2.js +15 -19
- package/lib/components/style/form-select.js +53 -15
- package/lib/components/style/form-slider.js +28 -12
- package/lib/components/style/form-submit-button.js +8 -8
- package/lib/components/style/form-text-input.js +46 -32
- package/lib/components/viewer2d/area.js +8 -7
- package/lib/components/viewer2d/export.js +1 -1
- package/lib/components/viewer2d/grids/grid-horizontal-streak.js +3 -3
- package/lib/components/viewer2d/grids/grid-streak.js +3 -3
- package/lib/components/viewer2d/grids/grid-vertical-streak.js +3 -3
- package/lib/components/viewer2d/grids/grids.js +6 -10
- package/lib/components/viewer2d/group.js +4 -3
- package/lib/components/viewer2d/item.js +14 -19
- package/lib/components/viewer2d/layer.js +3 -2
- package/lib/components/viewer2d/line.js +4 -7
- package/lib/components/viewer2d/ruler.js +9 -9
- package/lib/components/viewer2d/rulerDist.js +7 -6
- package/lib/components/viewer2d/rulerX.js +15 -19
- package/lib/components/viewer2d/rulerY.js +15 -19
- package/lib/components/viewer2d/scene.js +24 -34
- package/lib/components/viewer2d/snap.js +4 -3
- package/lib/components/viewer2d/state.js +7 -11
- package/lib/components/viewer2d/utils.js +35 -2
- package/lib/components/viewer2d/vertex.js +4 -3
- package/lib/components/viewer2d/viewer2d.js +40 -41
- package/lib/components/viewer3d/camera-controls-module/camera-controls.module.js +14 -20
- package/lib/components/viewer3d/dcm.js +2 -1
- package/lib/components/viewer3d/fbm.js +2 -1
- package/lib/components/viewer3d/front3D.js +6 -10
- package/lib/components/viewer3d/grid-creator.js +4 -3
- package/lib/components/viewer3d/grids/grid-horizontal-streak.js +3 -2
- package/lib/components/viewer3d/grids/grid-streak.js +3 -2
- package/lib/components/viewer3d/grids/grid-vertical-streak.js +3 -2
- package/lib/components/viewer3d/libs/mtl-loader.js +7 -2
- package/lib/components/viewer3d/libs/obj-loader.js +7 -2
- package/lib/components/viewer3d/libs/orbit-controls.js +10 -5
- package/lib/components/viewer3d/libs/pointer-lock-controls.js +9 -4
- package/lib/components/viewer3d/lrm.js +2 -1
- package/lib/components/viewer3d/pointer-lock-navigation.js +1 -1
- package/lib/components/viewer3d/ruler-utils/itemRect.js +10 -9
- package/lib/components/viewer3d/ruler-utils/layer3D.js +35 -34
- package/lib/components/viewer3d/ruler-utils/ruler3D.js +5 -7
- package/lib/components/viewer3d/ruler-utils/scene3D.js +4 -5
- package/lib/components/viewer3d/ruler-utils/state3D.js +3 -2
- package/lib/components/viewer3d/scene-creator.js +40 -45
- package/lib/components/viewer3d/three-memory-cleaner.js +1 -1
- package/lib/components/viewer3d/viewer3d-first-person.js +13 -17
- package/lib/components/viewer3d/viewer3d.js +34 -38
- package/lib/index.js +16 -88
- package/lib/models.js +58 -63
- package/lib/plugins/autosave.js +2 -1
- package/lib/plugins/console-debugger.js +5 -7
- package/lib/plugins/export.js +1 -1
- package/lib/plugins/keyboard.js +2 -1
- package/lib/reducers/areas-reducer.js +2 -1
- package/lib/reducers/export.js +1 -1
- package/lib/reducers/groups-reducer.js +2 -1
- package/lib/reducers/holes-reducer.js +2 -1
- package/lib/reducers/items-reducer.js +2 -1
- package/lib/reducers/lines-reducer.js +2 -1
- package/lib/reducers/project-reducer.js +2 -1
- package/lib/reducers/scene-reducer.js +2 -1
- package/lib/reducers/user-reducer.js +2 -2
- package/lib/reducers/vertices-reducer.js +2 -1
- package/lib/reducers/viewer2d-reducer.js +5 -5
- package/lib/reducers/viewer3d-reducer.js +5 -5
- package/lib/styles/export.js +1 -1
- package/lib/translator/en.js +2 -1
- package/lib/translator/it.js +2 -1
- package/lib/translator/ru.js +2 -1
- package/lib/translator/translator.js +7 -10
- package/lib/utils/convert-units-lite.js +35 -0
- package/lib/utils/export.js +2 -2
- package/lib/utils/geometry.js +20 -28
- package/lib/utils/get-edges-of-subgraphs.js +7 -1
- package/lib/utils/graph-cycles.js +9 -9
- package/lib/utils/graph-inner-cycles.js +1 -1
- package/lib/utils/graph.js +15 -12
- package/lib/utils/helper.js +14 -83
- package/lib/utils/history.js +1 -1
- package/lib/utils/id-broker.js +7 -10
- package/lib/utils/molding.js +66 -71
- package/lib/utils/name-generator.js +7 -9
- package/lib/utils/objects-utils.js +5 -3
- package/lib/utils/process-black-list.js +3 -5
- package/lib/utils/react-if.js +3 -2
- package/lib/utils/snap-scene.js +3 -7
- package/lib/utils/snap.js +22 -26
- package/lib/utils/threeCSG.es6.js +16 -15
- package/package.json +26 -54
- package/es/analytics/ga4.js +0 -191
- package/es/analytics/posthog.js +0 -60
- package/lib/analytics/ga4.js +0 -197
- package/lib/analytics/posthog.js +0 -68
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
|
-
|
|
3
|
+
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
|
|
4
|
+
var _typeof = require("@babel/runtime/helpers/typeof");
|
|
4
5
|
Object.defineProperty(exports, "__esModule", {
|
|
5
6
|
value: true
|
|
6
7
|
});
|
|
@@ -31,33 +32,27 @@ exports.updateDoorHandleMesh = updateDoorHandleMesh;
|
|
|
31
32
|
exports.updateMoldingGroupArray = updateMoldingGroupArray;
|
|
32
33
|
exports.updateScene = updateScene;
|
|
33
34
|
exports.visibleTransformBox = visibleTransformBox;
|
|
35
|
+
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
|
|
36
|
+
var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
|
|
34
37
|
var _three = _interopRequireWildcard(require("three"));
|
|
35
38
|
var Three = _three;
|
|
36
39
|
var _gridCreator = _interopRequireDefault(require("./grid-creator"));
|
|
37
40
|
var _threeMemoryCleaner = require("./three-memory-cleaner");
|
|
38
41
|
var _constants = require("../../constants");
|
|
39
42
|
var _export = require("../../utils/export");
|
|
40
|
-
var
|
|
43
|
+
var _convertUnitsLite = require("../../utils/convert-units-lite");
|
|
41
44
|
var _geometry2 = require("../../utils/geometry");
|
|
42
45
|
var GeomUtils = _interopRequireWildcard(require("../../catalog/utils/geom-utils"));
|
|
43
46
|
var _itemLoader = require("../../catalog/utils/item-loader");
|
|
44
47
|
var _utils = require("../viewer2d/utils");
|
|
45
48
|
var _helper = require("../../utils/helper");
|
|
46
49
|
var _math = require("../../utils/math");
|
|
47
|
-
function _interopRequireDefault(e) { return e && e.__esModule ? e : { "default": e }; }
|
|
48
50
|
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); }
|
|
49
51
|
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; } } }; }
|
|
50
|
-
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; }
|
|
51
|
-
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) { _defineProperty(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; }
|
|
52
|
-
function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
|
|
53
|
-
function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
|
|
54
|
-
function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
|
|
55
|
-
function _toConsumableArray(r) { return _arrayWithoutHoles(r) || _iterableToArray(r) || _unsupportedIterableToArray(r) || _nonIterableSpread(); }
|
|
56
|
-
function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
|
|
57
52
|
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; } }
|
|
58
|
-
function _iterableToArray(r) { if ("undefined" != typeof Symbol && null != r[Symbol.iterator] || null != r["@@iterator"]) return Array.from(r); }
|
|
59
|
-
function _arrayWithoutHoles(r) { if (Array.isArray(r)) return _arrayLikeToArray(r); }
|
|
60
53
|
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; }
|
|
54
|
+
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; }
|
|
55
|
+
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; }
|
|
61
56
|
var transformBox;
|
|
62
57
|
var fVLine = exports.fVLine = [];
|
|
63
58
|
var scene_mode = null;
|
|
@@ -470,7 +465,7 @@ function replaceObject(modifiedPath, layer, planData, actions, sceneData, oldSce
|
|
|
470
465
|
case 'items':
|
|
471
466
|
var item = layer.getIn(['items', modifiedPath[4]]);
|
|
472
467
|
deleteCountertop(planData.sceneGraph.layers[layer.id].countertops, item, planData, layer);
|
|
473
|
-
var tmpMoldings =
|
|
468
|
+
var tmpMoldings = (0, _toConsumableArray2["default"])(planData.sceneGraph.layers[layer.id].moldingGroups);
|
|
474
469
|
if (catalog.getElement(item.type).updateRender3D) {
|
|
475
470
|
promises.push(updateItem(sceneData, oldSceneData, planData, layer, modifiedPath[4], modifiedPath.slice(5), catalog, actions.itemsActions, function () {
|
|
476
471
|
return removeItem(planData, layer.id, modifiedPath[4], oldSceneData.getIn(['layers', layer.id]), layer);
|
|
@@ -546,16 +541,16 @@ function replaceObject(modifiedPath, layer, planData, actions, sceneData, oldSce
|
|
|
546
541
|
var posVec = new Three.Vector3(object.position.x, object.position.y, object.position.z);
|
|
547
542
|
var newAltitude = item.properties.get('altitude').get('_length');
|
|
548
543
|
var newUnit = item.properties.get('altitude').get('_unit') || 'in';
|
|
549
|
-
newAltitude = (0,
|
|
544
|
+
newAltitude = (0, _convertUnitsLite.convert)(newAltitude).from(newUnit).to(sceneData.unit);
|
|
550
545
|
var newWidth = item.properties.get('width').get('_length');
|
|
551
546
|
var newWidthUnit = item.properties.get('width').get('_unit') || 'in';
|
|
552
|
-
newWidth = (0,
|
|
547
|
+
newWidth = (0, _convertUnitsLite.convert)(newWidth).from(newWidthUnit).to('in');
|
|
553
548
|
var newHeight = item.properties.get('height').get('_length');
|
|
554
549
|
var newHeightUnit = item.properties.get('height').get('_unit') || 'in';
|
|
555
|
-
newHeight = (0,
|
|
550
|
+
newHeight = (0, _convertUnitsLite.convert)(newHeight).from(newHeightUnit).to('in');
|
|
556
551
|
var newDepth = item.properties.get('depth').get('_length');
|
|
557
552
|
var newDepthUnit = item.properties.get('depth').get('_unit') || 'in';
|
|
558
|
-
newDepth = (0,
|
|
553
|
+
newDepth = (0, _convertUnitsLite.convert)(newDepth).from(newDepthUnit).to('in');
|
|
559
554
|
var sizeinfo = !!catalog.elements[item.type] ? catalog.elements[item.type].info.sizeinfo : catalog.elements[(0, _utils.returnReplaceableDeepSearchType)(item.type)].info.sizeinfo;
|
|
560
555
|
object.scale.set(1 * newWidth / sizeinfo.width, 1 * newHeight / sizeinfo.height, 1 * newDepth / sizeinfo.depth);
|
|
561
556
|
object.position.set(0, 0, 0);
|
|
@@ -864,7 +859,7 @@ function replaceObject(modifiedPath, layer, planData, actions, sceneData, oldSce
|
|
|
864
859
|
addCountertop(planData.sceneGraph.layers[layer.id].countertops, item, planData, layer);
|
|
865
860
|
// Toggle selection should not update molding
|
|
866
861
|
if (item.category === 'cabinet' && modifiedPath[modifiedPath.length - 1] !== 'selected') {
|
|
867
|
-
planData.sceneGraph.layers[layer.id].moldingGroups = addMolding(tmpMoldings, item, planData, layer, actions.itemsActions, mode) ||
|
|
862
|
+
planData.sceneGraph.layers[layer.id].moldingGroups = addMolding(tmpMoldings, item, planData, layer, actions.itemsActions, mode) || (0, _toConsumableArray2["default"])(tmpMoldings);
|
|
868
863
|
}
|
|
869
864
|
break;
|
|
870
865
|
case 'visible':
|
|
@@ -960,7 +955,7 @@ function getLineDistance(obj, layer, isCalcWall, index) {
|
|
|
960
955
|
obj.geometry.attributes.position.needsUpdate = true;
|
|
961
956
|
obj.geometry.computeBoundingSphere();
|
|
962
957
|
obj.geometry.computeBoundingBox();
|
|
963
|
-
var dist = (0, _math.formatNumber)((0,
|
|
958
|
+
var dist = (0, _math.formatNumber)((0, _convertUnitsLite.convert)(intersects[i].distance).from('cm').to('in'), _constants.DECIMAL_PLACES_2);
|
|
964
959
|
if (dist > 3) {
|
|
965
960
|
var _canvas = getTextCanvas(dist);
|
|
966
961
|
var wid = _canvas.width / window.innerWidth * 30;
|
|
@@ -1814,7 +1809,7 @@ function addArea(sceneData, planData, layer, areaID, catalog, areaActions, mode)
|
|
|
1814
1809
|
realVec.push(vec);
|
|
1815
1810
|
});
|
|
1816
1811
|
if (vertices.includes(realVec[0]) && vertices.includes(realVec[1])) {
|
|
1817
|
-
height = (0,
|
|
1812
|
+
height = (0, _convertUnitsLite.convert)(layer.ceilHeight).from(layer.unit).to(_constants.UNIT_CENTIMETER);
|
|
1818
1813
|
// height = data.properties.getIn(["height", "length"]);
|
|
1819
1814
|
return 1; // break
|
|
1820
1815
|
}
|
|
@@ -1822,7 +1817,7 @@ function addArea(sceneData, planData, layer, areaID, catalog, areaActions, mode)
|
|
|
1822
1817
|
for (var i = 0; i < lines.length; i++) {
|
|
1823
1818
|
if (_loop2()) break;
|
|
1824
1819
|
}
|
|
1825
|
-
ceil.translateZ((0,
|
|
1820
|
+
ceil.translateZ((0, _convertUnitsLite.convert)(layer.ceilHeight).from(layer.unit).to(_constants.UNIT_CENTIMETER));
|
|
1826
1821
|
pivot.name = 'pivot';
|
|
1827
1822
|
pivot.add(area3D);
|
|
1828
1823
|
pivot.add(area3D.userData.floorSupport);
|
|
@@ -1986,9 +1981,9 @@ function addItem(sceneData, planData, layer, itemID, catalog, itemsActions) {
|
|
|
1986
1981
|
var catid = item.type;
|
|
1987
1982
|
var cat = catalog.elements[catid];
|
|
1988
1983
|
if (!cat) cat = catalog.elements[(0, _utils.returnReplaceableDeepSearchType)(catid)];
|
|
1989
|
-
var width = (0,
|
|
1990
|
-
var height = (0,
|
|
1991
|
-
var depth = (0,
|
|
1984
|
+
var width = (0, _convertUnitsLite.convert)(item.properties.getIn(['width', '_length'])).from('in').to(sceneData.unit);
|
|
1985
|
+
var height = (0, _convertUnitsLite.convert)(item.properties.getIn(['height', '_length'])).from('in').to(sceneData.unit);
|
|
1986
|
+
var depth = (0, _convertUnitsLite.convert)(item.properties.getIn(['depth', '_length'])).from('in').to(sceneData.unit);
|
|
1992
1987
|
val.size = {
|
|
1993
1988
|
width: width,
|
|
1994
1989
|
height: height,
|
|
@@ -2233,13 +2228,13 @@ function createCTFromItems(items, unit, catalog) {
|
|
|
2233
2228
|
// let height = convert(item0.properties.getIn(['height', '_length'])).from('in').to('cm');
|
|
2234
2229
|
var width = item0.properties.get('width').get('_length');
|
|
2235
2230
|
var widthUnit = item0.properties.get('width').get('_unit') || 'cm';
|
|
2236
|
-
width = (0,
|
|
2231
|
+
width = (0, _convertUnitsLite.convert)(width).from(widthUnit).to('cm');
|
|
2237
2232
|
var depth = item0.properties.get('depth').get('_length');
|
|
2238
2233
|
var depthUnit = item0.properties.get('depth').get('_unit') || 'cm';
|
|
2239
|
-
depth = (0,
|
|
2234
|
+
depth = (0, _convertUnitsLite.convert)(depth).from(depthUnit).to('cm');
|
|
2240
2235
|
var height = item0.properties.get('height').get('_length');
|
|
2241
2236
|
var heightUnit = item0.properties.get('height').get('_unit') || 'cm';
|
|
2242
|
-
height = (0,
|
|
2237
|
+
height = (0, _convertUnitsLite.convert)(height).from(heightUnit).to('cm');
|
|
2243
2238
|
var size = {
|
|
2244
2239
|
width: width * items.length,
|
|
2245
2240
|
depth: depth,
|
|
@@ -2259,10 +2254,10 @@ function createMDFromItem(item, lines, molding) {
|
|
|
2259
2254
|
var MDId = _export.IDBroker.acquireID();
|
|
2260
2255
|
var z = item.properties.get('altitude').get('_length');
|
|
2261
2256
|
var zUnit = item.properties.get('altitude').get('_unit') || 'cm';
|
|
2262
|
-
z = (0,
|
|
2257
|
+
z = (0, _convertUnitsLite.convert)(z).from(zUnit).to('cm');
|
|
2263
2258
|
var height = item.properties.get('height').get('_length');
|
|
2264
2259
|
var heightUnit = item.properties.get('height').get('_unit') || 'cm';
|
|
2265
|
-
height = (0,
|
|
2260
|
+
height = (0, _convertUnitsLite.convert)(height).from(heightUnit).to('cm');
|
|
2266
2261
|
switch (molding.location_type) {
|
|
2267
2262
|
case _constants.TOP_MOLDING_LOCATION:
|
|
2268
2263
|
z += height;
|
|
@@ -2321,7 +2316,7 @@ function tryAdjacent(ct1, ct2) {
|
|
|
2321
2316
|
height: ct1.size.height
|
|
2322
2317
|
};
|
|
2323
2318
|
var CTId = _export.IDBroker.acquireID();
|
|
2324
|
-
var items = _export.GeometryUtils.compareVertices(ct1.pos, ct2.pos) > 0 ? [].concat(
|
|
2319
|
+
var items = _export.GeometryUtils.compareVertices(ct1.pos, ct2.pos) > 0 ? [].concat((0, _toConsumableArray2["default"])(ct1.items), (0, _toConsumableArray2["default"])(ct2.items)) : [].concat((0, _toConsumableArray2["default"])(ct2.items), (0, _toConsumableArray2["default"])(ct1.items));
|
|
2325
2320
|
var ct3d = null;
|
|
2326
2321
|
var catid = ct1.catid;
|
|
2327
2322
|
return {
|
|
@@ -2416,11 +2411,11 @@ function tryAdjacentMD(md1, md2, molding) {
|
|
|
2416
2411
|
if (!isMerge) return false;
|
|
2417
2412
|
return {
|
|
2418
2413
|
id: _export.IDBroker.acquireID(),
|
|
2419
|
-
items: [].concat(
|
|
2414
|
+
items: [].concat((0, _toConsumableArray2["default"])(md2.items.filter(function (item) {
|
|
2420
2415
|
return md1.items.findIndex(function (it) {
|
|
2421
2416
|
return it.id === item.id;
|
|
2422
2417
|
}) === -1;
|
|
2423
|
-
})),
|
|
2418
|
+
})), (0, _toConsumableArray2["default"])(md1.items)),
|
|
2424
2419
|
meshes: [],
|
|
2425
2420
|
pos: md1.pos,
|
|
2426
2421
|
size: md1.size,
|
|
@@ -2521,7 +2516,7 @@ function addCTMesh(countertop, planData, layer) {
|
|
|
2521
2516
|
var unit_width = countertop.items.find(function (ct) {
|
|
2522
2517
|
return !ct.type.includes('Dishwasher') && !ct.type.includes('BF');
|
|
2523
2518
|
}).properties.get('width').get('_unit') || 'cm';
|
|
2524
|
-
width = (0,
|
|
2519
|
+
width = (0, _convertUnitsLite.convert)(width).from(unit_width).to('cm');
|
|
2525
2520
|
pivotMat.scale(new Three.Vector3(countertop.size.width / width, 1, 1));
|
|
2526
2521
|
var finalMat = objMat.premultiply(pivotMat);
|
|
2527
2522
|
_ct3d.applyMatrix4(finalMat);
|
|
@@ -2852,7 +2847,7 @@ function createBacksplash(item, layer, planData, scene) {
|
|
|
2852
2847
|
|
|
2853
2848
|
var altitude = item.itemInfo.properties.get('altitude').get('_length');
|
|
2854
2849
|
var altitudeUnit = item.itemInfo.properties.get('altitude').get('_unit') || 'cm';
|
|
2855
|
-
altitude = (0,
|
|
2850
|
+
altitude = (0, _convertUnitsLite.convert)(altitude).from(altitudeUnit).to('cm');
|
|
2856
2851
|
var thickness = 1,
|
|
2857
2852
|
/** Height --- altitude */depth;
|
|
2858
2853
|
|
|
@@ -2867,7 +2862,7 @@ function createBacksplash(item, layer, planData, scene) {
|
|
|
2867
2862
|
wallItems.map(function (wallItem) {
|
|
2868
2863
|
var altitude = wallItem.itemInfo.properties.get('altitude').get('_length');
|
|
2869
2864
|
var altitudeUnit = wallItem.itemInfo.properties.get('altitude').get('_unit') || 'cm';
|
|
2870
|
-
altitude = (0,
|
|
2865
|
+
altitude = (0, _convertUnitsLite.convert)(altitude).from(altitudeUnit).to('cm');
|
|
2871
2866
|
altItems.push({
|
|
2872
2867
|
x: wallItem.pos.x,
|
|
2873
2868
|
width: wallItem.size.width,
|
|
@@ -3059,17 +3054,17 @@ function _addMGMesh(molding, planData, layer, data, svg_width, svg_height, flag)
|
|
|
3059
3054
|
var length = data.length; //point array
|
|
3060
3055
|
var temp_unit = child.height_unit;
|
|
3061
3056
|
if (temp_unit === 'inch') {
|
|
3062
|
-
child.height = (0,
|
|
3057
|
+
child.height = (0, _convertUnitsLite.convert)(child.height).from('in').to('cm');
|
|
3063
3058
|
child.height_unit = 'cm';
|
|
3064
3059
|
}
|
|
3065
3060
|
temp_unit = child.width_unit;
|
|
3066
3061
|
if (temp_unit === 'inch') {
|
|
3067
|
-
child.width = (0,
|
|
3062
|
+
child.width = (0, _convertUnitsLite.convert)(child.width).from('in').to('cm');
|
|
3068
3063
|
child.width_unit = 'cm';
|
|
3069
3064
|
}
|
|
3070
3065
|
temp_unit = child.length_unit;
|
|
3071
3066
|
if (temp_unit === 'inch') {
|
|
3072
|
-
child.length = (0,
|
|
3067
|
+
child.length = (0, _convertUnitsLite.convert)(child.length).from('in').to('cm');
|
|
3073
3068
|
child.length_unit = 'cm';
|
|
3074
3069
|
}
|
|
3075
3070
|
geometry.needsUpdate = true;
|
|
@@ -3129,7 +3124,7 @@ function _addMGMesh(molding, planData, layer, data, svg_width, svg_height, flag)
|
|
|
3129
3124
|
var uvs_item = [];
|
|
3130
3125
|
for (var _i4 = 0; _i4 < uvs_element_array.length - 1; _i4++) {
|
|
3131
3126
|
uvs_item = [0, uvs_element_array[_i4], 1, uvs_element_array[_i4], 1, uvs_element_array[_i4 + 1], 1, uvs_element_array[_i4 + 1], 0, uvs_element_array[_i4 + 1], 0, uvs_element_array[_i4]];
|
|
3132
|
-
uvs.push.apply(uvs,
|
|
3127
|
+
uvs.push.apply(uvs, (0, _toConsumableArray2["default"])(uvs_item));
|
|
3133
3128
|
}
|
|
3134
3129
|
var all_uvs = [];
|
|
3135
3130
|
for (var _i5 = 0; _i5 < pointGroup.length; _i5++) {
|
|
@@ -3183,7 +3178,7 @@ function log() {
|
|
|
3183
3178
|
// console.log(...arguments);
|
|
3184
3179
|
}
|
|
3185
3180
|
function addCountertop(CTArray, addItem, planData, layer) {
|
|
3186
|
-
log('addCountertop',
|
|
3181
|
+
log('addCountertop', (0, _toConsumableArray2["default"])(CTArray), addItem.id);
|
|
3187
3182
|
var tmp = planData;
|
|
3188
3183
|
tmp = tmp && tmp.catalog.getElement(addItem.type);
|
|
3189
3184
|
if (!tmp) tmp = planData.catalog.getElement((0, _utils.returnReplaceableDeepSearchType)(addItem.type));
|
|
@@ -3213,7 +3208,7 @@ function deleteCountertop(CTArray, delItem, planData, layer) {
|
|
|
3213
3208
|
if (delItem == undefined) {
|
|
3214
3209
|
return;
|
|
3215
3210
|
}
|
|
3216
|
-
log('deleteCountertop',
|
|
3211
|
+
log('deleteCountertop', (0, _toConsumableArray2["default"])(CTArray), delItem.id);
|
|
3217
3212
|
var delCT = null;
|
|
3218
3213
|
var delItemIndex = -1;
|
|
3219
3214
|
var delCTIndex = CTArray.findIndex(function (el) {
|
|
@@ -3237,7 +3232,7 @@ function deleteCountertop(CTArray, delItem, planData, layer) {
|
|
|
3237
3232
|
}
|
|
3238
3233
|
}
|
|
3239
3234
|
function deleteAllMolding(MGArray, delItem, planData, oldSceneLayer, newSceneLayer) {
|
|
3240
|
-
var tempMGArray =
|
|
3235
|
+
var tempMGArray = (0, _toConsumableArray2["default"])(MGArray);
|
|
3241
3236
|
if ((0, _helper.isEmpty)(delItem)) {
|
|
3242
3237
|
return tempMGArray;
|
|
3243
3238
|
}
|
|
@@ -3320,7 +3315,7 @@ function updateMoldingGroupArray(MGArray, selItem, planData, layer) {
|
|
|
3320
3315
|
console.log('updateMoldingGroupArray has limited!');
|
|
3321
3316
|
return MGArray;
|
|
3322
3317
|
}
|
|
3323
|
-
var temp_MGArray =
|
|
3318
|
+
var temp_MGArray = (0, _toConsumableArray2["default"])(MGArray);
|
|
3324
3319
|
if ((0, _helper.isEmpty)(selItem)) return temp_MGArray;
|
|
3325
3320
|
var isEnableMolding = _export.MoldingUtils.isEnableItemForMolding(layer, selItem);
|
|
3326
3321
|
// Make a items group with selItem to create the new MG(molding group) array of selItem
|
|
@@ -3596,7 +3591,7 @@ function addWarningBox(itemId, altitude, planData) {
|
|
|
3596
3591
|
deleteSpecifiedMeshObjects('WarningBox' + itemId);
|
|
3597
3592
|
var item3D = planData.sceneGraph.layers[planData.sceneData.selectedLayer].items[itemId];
|
|
3598
3593
|
if (item3D == undefined) return;
|
|
3599
|
-
var altitudeLength = (0,
|
|
3594
|
+
var altitudeLength = (0, _convertUnitsLite.convert)(altitude).from('in').to('cm');
|
|
3600
3595
|
var sBounding = item3D.children[0].userData;
|
|
3601
3596
|
var width = sBounding.max.x - sBounding.min.x;
|
|
3602
3597
|
var height = sBounding.max.y - sBounding.min.y;
|
|
@@ -3635,7 +3630,7 @@ function checkCabinetOverlap(itemPos, itemRect, holeItems, planData) {
|
|
|
3635
3630
|
if (i != holeItems.length) {
|
|
3636
3631
|
var altitude = itemRect.itemInfo.properties.get('altitude').get('_length');
|
|
3637
3632
|
var altitudeUnit = itemRect.itemInfo.properties.get('altitude').get('_unit') || 'cm';
|
|
3638
|
-
altitude = (0,
|
|
3633
|
+
altitude = (0, _convertUnitsLite.convert)(altitude).from(altitudeUnit).to('cm');
|
|
3639
3634
|
addWarningBox(itemRect.itemInfo.id, altitude, planData);
|
|
3640
3635
|
}
|
|
3641
3636
|
}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
|
-
|
|
3
|
+
var _typeof = require("@babel/runtime/helpers/typeof");
|
|
4
4
|
Object.defineProperty(exports, "__esModule", {
|
|
5
5
|
value: true
|
|
6
6
|
});
|
|
@@ -1,10 +1,16 @@
|
|
|
1
1
|
'use strict';
|
|
2
2
|
|
|
3
|
-
|
|
3
|
+
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
|
|
4
|
+
var _typeof = require("@babel/runtime/helpers/typeof");
|
|
4
5
|
Object.defineProperty(exports, "__esModule", {
|
|
5
6
|
value: true
|
|
6
7
|
});
|
|
7
8
|
exports["default"] = void 0;
|
|
9
|
+
var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
|
|
10
|
+
var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
|
|
11
|
+
var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
|
|
12
|
+
var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
|
|
13
|
+
var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
|
|
8
14
|
var _react = _interopRequireDefault(require("react"));
|
|
9
15
|
var _propTypes = _interopRequireDefault(require("prop-types"));
|
|
10
16
|
var _reactDom = _interopRequireDefault(require("react-dom"));
|
|
@@ -16,23 +22,12 @@ var _pointerLockNavigation = require("./pointer-lock-navigation");
|
|
|
16
22
|
var _firstPersonControls = require("./libs/first-person-controls");
|
|
17
23
|
var SharedStyle = _interopRequireWildcard(require("../../shared-style"));
|
|
18
24
|
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); }
|
|
19
|
-
function
|
|
20
|
-
function _classCallCheck(a, n) { if (!(a instanceof n)) throw new TypeError("Cannot call a class as a function"); }
|
|
21
|
-
function _defineProperties(e, r) { for (var t = 0; t < r.length; t++) { var o = r[t]; o.enumerable = o.enumerable || !1, o.configurable = !0, "value" in o && (o.writable = !0), Object.defineProperty(e, _toPropertyKey(o.key), o); } }
|
|
22
|
-
function _createClass(e, r, t) { return r && _defineProperties(e.prototype, r), t && _defineProperties(e, t), Object.defineProperty(e, "prototype", { writable: !1 }), e; }
|
|
23
|
-
function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
|
|
24
|
-
function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
|
|
25
|
-
function _callSuper(t, o, e) { return o = _getPrototypeOf(o), _possibleConstructorReturn(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], _getPrototypeOf(t).constructor) : o.apply(t, e)); }
|
|
26
|
-
function _possibleConstructorReturn(t, e) { if (e && ("object" == _typeof(e) || "function" == typeof e)) return e; if (void 0 !== e) throw new TypeError("Derived constructors may only return object or undefined"); return _assertThisInitialized(t); }
|
|
27
|
-
function _assertThisInitialized(e) { if (void 0 === e) throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); return e; }
|
|
25
|
+
function _callSuper(t, o, e) { return o = (0, _getPrototypeOf2["default"])(o), (0, _possibleConstructorReturn2["default"])(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], (0, _getPrototypeOf2["default"])(t).constructor) : o.apply(t, e)); }
|
|
28
26
|
function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
|
|
29
|
-
function _getPrototypeOf(t) { return _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function (t) { return t.__proto__ || Object.getPrototypeOf(t); }, _getPrototypeOf(t); }
|
|
30
|
-
function _inherits(t, e) { if ("function" != typeof e && null !== e) throw new TypeError("Super expression must either be null or a function"); t.prototype = Object.create(e && e.prototype, { constructor: { value: t, writable: !0, configurable: !0 } }), Object.defineProperty(t, "prototype", { writable: !1 }), e && _setPrototypeOf(t, e); }
|
|
31
|
-
function _setPrototypeOf(t, e) { return _setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function (t, e) { return t.__proto__ = e, t; }, _setPrototypeOf(t, e); }
|
|
32
27
|
var Viewer3DFirstPerson = exports["default"] = /*#__PURE__*/function (_React$Component) {
|
|
33
28
|
function Viewer3DFirstPerson(props) {
|
|
34
29
|
var _this;
|
|
35
|
-
|
|
30
|
+
(0, _classCallCheck2["default"])(this, Viewer3DFirstPerson);
|
|
36
31
|
_this = _callSuper(this, Viewer3DFirstPerson, [props]);
|
|
37
32
|
_this.width = props.width;
|
|
38
33
|
_this.height = props.height;
|
|
@@ -43,8 +38,8 @@ var Viewer3DFirstPerson = exports["default"] = /*#__PURE__*/function (_React$Com
|
|
|
43
38
|
window.__threeRenderer = _this.renderer;
|
|
44
39
|
return _this;
|
|
45
40
|
}
|
|
46
|
-
|
|
47
|
-
return
|
|
41
|
+
(0, _inherits2["default"])(Viewer3DFirstPerson, _React$Component);
|
|
42
|
+
return (0, _createClass2["default"])(Viewer3DFirstPerson, [{
|
|
48
43
|
key: "componentDidMount",
|
|
49
44
|
value: function componentDidMount() {
|
|
50
45
|
var _this2 = this;
|
|
@@ -317,4 +312,5 @@ Viewer3DFirstPerson.contextTypes = {
|
|
|
317
312
|
linesActions: _propTypes["default"].object.isRequired,
|
|
318
313
|
projectActions: _propTypes["default"].object.isRequired,
|
|
319
314
|
catalog: _propTypes["default"].object
|
|
320
|
-
};
|
|
315
|
+
};
|
|
316
|
+
module.exports = exports.default;
|
|
@@ -1,10 +1,18 @@
|
|
|
1
1
|
'use strict';
|
|
2
2
|
|
|
3
|
-
|
|
3
|
+
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
|
|
4
|
+
var _typeof = require("@babel/runtime/helpers/typeof");
|
|
4
5
|
Object.defineProperty(exports, "__esModule", {
|
|
5
6
|
value: true
|
|
6
7
|
});
|
|
7
8
|
exports["default"] = void 0;
|
|
9
|
+
var _readOnlyError2 = _interopRequireDefault(require("@babel/runtime/helpers/readOnlyError"));
|
|
10
|
+
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
|
|
11
|
+
var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
|
|
12
|
+
var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
|
|
13
|
+
var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
|
|
14
|
+
var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
|
|
15
|
+
var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
|
|
8
16
|
var _react = _interopRequireDefault(require("react"));
|
|
9
17
|
var _propTypes = _interopRequireDefault(require("prop-types"));
|
|
10
18
|
var _reactDom = _interopRequireDefault(require("react-dom"));
|
|
@@ -14,9 +22,8 @@ var _threeMemoryCleaner = require("./three-memory-cleaner");
|
|
|
14
22
|
var _immutablediff = _interopRequireDefault(require("immutablediff"));
|
|
15
23
|
var SharedStyle = _interopRequireWildcard(require("../../shared-style"));
|
|
16
24
|
var _constants = require("../../constants");
|
|
17
|
-
var _util = require("util");
|
|
18
25
|
var _geometry = require("../../utils/geometry");
|
|
19
|
-
var
|
|
26
|
+
var _convertUnitsLite = require("../../utils/convert-units-lite");
|
|
20
27
|
var _export = require("../../utils/export");
|
|
21
28
|
var _helper = require("../../utils/helper");
|
|
22
29
|
var _RGBELoader = require("three/examples/jsm/loaders/RGBELoader");
|
|
@@ -24,30 +31,17 @@ var _cameraControls = _interopRequireDefault(require("camera-controls"));
|
|
|
24
31
|
var _utils = require("../viewer2d/utils");
|
|
25
32
|
var _objectsUtils = require("../../utils/objects-utils");
|
|
26
33
|
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); }
|
|
27
|
-
function _interopRequireDefault(e) { return e && e.__esModule ? e : { "default": e }; }
|
|
28
|
-
function _readOnlyError(r) { throw new TypeError('"' + r + '" is read-only'); }
|
|
29
34
|
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; }
|
|
30
|
-
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) {
|
|
31
|
-
function
|
|
32
|
-
function _classCallCheck(a, n) { if (!(a instanceof n)) throw new TypeError("Cannot call a class as a function"); }
|
|
33
|
-
function _defineProperties(e, r) { for (var t = 0; t < r.length; t++) { var o = r[t]; o.enumerable = o.enumerable || !1, o.configurable = !0, "value" in o && (o.writable = !0), Object.defineProperty(e, _toPropertyKey(o.key), o); } }
|
|
34
|
-
function _createClass(e, r, t) { return r && _defineProperties(e.prototype, r), t && _defineProperties(e, t), Object.defineProperty(e, "prototype", { writable: !1 }), e; }
|
|
35
|
-
function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
|
|
36
|
-
function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
|
|
37
|
-
function _callSuper(t, o, e) { return o = _getPrototypeOf(o), _possibleConstructorReturn(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], _getPrototypeOf(t).constructor) : o.apply(t, e)); }
|
|
38
|
-
function _possibleConstructorReturn(t, e) { if (e && ("object" == _typeof(e) || "function" == typeof e)) return e; if (void 0 !== e) throw new TypeError("Derived constructors may only return object or undefined"); return _assertThisInitialized(t); }
|
|
39
|
-
function _assertThisInitialized(e) { if (void 0 === e) throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); return e; }
|
|
35
|
+
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; }
|
|
36
|
+
function _callSuper(t, o, e) { return o = (0, _getPrototypeOf2["default"])(o), (0, _possibleConstructorReturn2["default"])(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], (0, _getPrototypeOf2["default"])(t).constructor) : o.apply(t, e)); }
|
|
40
37
|
function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
|
|
41
|
-
function _getPrototypeOf(t) { return _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function (t) { return t.__proto__ || Object.getPrototypeOf(t); }, _getPrototypeOf(t); }
|
|
42
|
-
function _inherits(t, e) { if ("function" != typeof e && null !== e) throw new TypeError("Super expression must either be null or a function"); t.prototype = Object.create(e && e.prototype, { constructor: { value: t, writable: !0, configurable: !0 } }), Object.defineProperty(t, "prototype", { writable: !1 }), e && _setPrototypeOf(t, e); }
|
|
43
|
-
function _setPrototypeOf(t, e) { return _setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function (t, e) { return t.__proto__ = e, t; }, _setPrototypeOf(t, e); }
|
|
44
38
|
_cameraControls["default"].install({
|
|
45
39
|
THREE: Three
|
|
46
40
|
});
|
|
47
41
|
var Scene3DViewer = exports["default"] = /*#__PURE__*/function (_React$Component) {
|
|
48
42
|
function Scene3DViewer(props) {
|
|
49
43
|
var _this;
|
|
50
|
-
|
|
44
|
+
(0, _classCallCheck2["default"])(this, Scene3DViewer);
|
|
51
45
|
_this = _callSuper(this, Scene3DViewer, [props]);
|
|
52
46
|
_this.state = {
|
|
53
47
|
isLoading: false,
|
|
@@ -109,8 +103,8 @@ var Scene3DViewer = exports["default"] = /*#__PURE__*/function (_React$Component
|
|
|
109
103
|
_this.renderer.domElement.style.display = 'none';
|
|
110
104
|
return _this;
|
|
111
105
|
}
|
|
112
|
-
|
|
113
|
-
return
|
|
106
|
+
(0, _inherits2["default"])(Scene3DViewer, _React$Component);
|
|
107
|
+
return (0, _createClass2["default"])(Scene3DViewer, [{
|
|
114
108
|
key: "componentDidMount",
|
|
115
109
|
value: function componentDidMount(nextProps) {
|
|
116
110
|
var _this2 = this;
|
|
@@ -289,7 +283,7 @@ var Scene3DViewer = exports["default"] = /*#__PURE__*/function (_React$Component
|
|
|
289
283
|
realVec.push(vec);
|
|
290
284
|
});
|
|
291
285
|
if (aVertices.includes(realVec[0]) && aVertices.includes(realVec[1])) {
|
|
292
|
-
height = (0,
|
|
286
|
+
height = (0, _convertUnitsLite.convert)(layer.ceilHeight).from(layer.unit).to(_constants.UNIT_CENTIMETER);
|
|
293
287
|
// height = data.properties.getIn(['height', 'length']);
|
|
294
288
|
return 1; // break
|
|
295
289
|
}
|
|
@@ -662,6 +656,7 @@ var Scene3DViewer = exports["default"] = /*#__PURE__*/function (_React$Component
|
|
|
662
656
|
item: _item2,
|
|
663
657
|
cat: ocat
|
|
664
658
|
};
|
|
659
|
+
console.log('currentItem =>', currentItem);
|
|
665
660
|
if (_export.GeometryUtils.needSnap(currentItem, otherItem) && otherItem.cat.type != 'cabinet') {
|
|
666
661
|
var tRot = _item2.rotation;
|
|
667
662
|
var tPos = new Three.Vector2(_item2.x, _item2.y);
|
|
@@ -834,7 +829,7 @@ var Scene3DViewer = exports["default"] = /*#__PURE__*/function (_React$Component
|
|
|
834
829
|
var tRot = layer.getIn(['items', target.userData.itemId]) ? layer.getIn(['items', target.userData.itemId]).rotation : 0;
|
|
835
830
|
var item = layer.getIn(['items', source.userData.itemId]);
|
|
836
831
|
var layoutType = item.layoutpos;
|
|
837
|
-
var altitudeLength = (0,
|
|
832
|
+
var altitudeLength = (0, _convertUnitsLite.convert)(item.properties.getIn(['altitude', '_length'])).from('in').to('cm');
|
|
838
833
|
var sBounding = source.children[0].userData;
|
|
839
834
|
var tBounding = target.children[0].userData;
|
|
840
835
|
var tPos = target.position.clone();
|
|
@@ -935,7 +930,7 @@ var Scene3DViewer = exports["default"] = /*#__PURE__*/function (_React$Component
|
|
|
935
930
|
return;
|
|
936
931
|
} else {
|
|
937
932
|
var _layoutType = _item3.layoutpos;
|
|
938
|
-
var _altitudeLength = (0,
|
|
933
|
+
var _altitudeLength = (0, _convertUnitsLite.convert)(_item3.properties.getIn(['altitude', '_length'])).from('in').to('cm');
|
|
939
934
|
var _sBounding = source.children[0].userData;
|
|
940
935
|
var _width = _sBounding.max.x - _sBounding.min.x;
|
|
941
936
|
var _height = _sBounding.max.y - _sBounding.min.y;
|
|
@@ -1200,7 +1195,7 @@ var Scene3DViewer = exports["default"] = /*#__PURE__*/function (_React$Component
|
|
|
1200
1195
|
var properties = allItemRect.cur.itemInfo.properties;
|
|
1201
1196
|
altitude = properties.getIn(['altitude', '_length']);
|
|
1202
1197
|
var unit = properties.getIn(['altitude', '_unit']) || 'in';
|
|
1203
|
-
altitude = (0,
|
|
1198
|
+
altitude = (0, _convertUnitsLite.convert)(altitude).from(unit).to(_this2.props.state.scene.unit);
|
|
1204
1199
|
}
|
|
1205
1200
|
getPoint(event, altitude);
|
|
1206
1201
|
var state = _this2.props.state;
|
|
@@ -1292,13 +1287,13 @@ var Scene3DViewer = exports["default"] = /*#__PURE__*/function (_React$Component
|
|
|
1292
1287
|
var _properties = allItemRect.cur.itemInfo.properties;
|
|
1293
1288
|
alti = _properties.getIn(['altitude', '_length']);
|
|
1294
1289
|
var _unit = _properties.getIn(['altitude', '_unit']) || 'in';
|
|
1295
|
-
alti = (0,
|
|
1290
|
+
alti = (0, _convertUnitsLite.convert)(alti).from(_unit).to(_this2.props.state.scene.unit);
|
|
1296
1291
|
}
|
|
1297
1292
|
getPoint({
|
|
1298
1293
|
offsetX: event.offsetX - 50,
|
|
1299
1294
|
offsetY: event.offsetY
|
|
1300
1295
|
}, alti);
|
|
1301
|
-
if (
|
|
1296
|
+
if (!selectedItem) return;
|
|
1302
1297
|
var selItem = _this2.props.state.scene.layers.get(selectedObject.layerID).items.get(selectedObject.itemID);
|
|
1303
1298
|
lastAngle = 0;
|
|
1304
1299
|
angleObj.position.set(planData.plan.position.x + Point.x, selItem.category === 'lighting' ? -planData.plan.position.y - selItem.properties.get('height').get('length') : selItem.properties.get('altitude').get('length') + planData.plan.position.y, planData.plan.position.z - Point.y);
|
|
@@ -1356,7 +1351,7 @@ var Scene3DViewer = exports["default"] = /*#__PURE__*/function (_React$Component
|
|
|
1356
1351
|
var properties = allItemRect.cur.itemInfo.properties;
|
|
1357
1352
|
altitude = properties.getIn(['altitude', '_length']);
|
|
1358
1353
|
var unit = properties.getIn(['altitude', '_unit']) || 'in';
|
|
1359
|
-
altitude = (0,
|
|
1354
|
+
altitude = (0, _convertUnitsLite.convert)(altitude).from(unit).to(_this2.props.state.scene.unit);
|
|
1360
1355
|
}
|
|
1361
1356
|
scene3D.remove(angleObj);
|
|
1362
1357
|
scene3D.remove(toolObj);
|
|
@@ -1469,7 +1464,7 @@ var Scene3DViewer = exports["default"] = /*#__PURE__*/function (_React$Component
|
|
|
1469
1464
|
setTimeout(function () {
|
|
1470
1465
|
(0, _sceneCreator.getDistances)(layer);
|
|
1471
1466
|
var selectedItem = planData.sceneGraph.layers[selectedObject.layerID].items[selectedObject.itemID];
|
|
1472
|
-
if (
|
|
1467
|
+
if (!selectedItem) return;
|
|
1473
1468
|
var selItem = _this2.props.state.scene.layers.get(selectedObject.layerID).items.get(selectedObject.itemID);
|
|
1474
1469
|
var itemPos = selectedItem.position.clone();
|
|
1475
1470
|
if (intersects[_i10].object.parent && intersects[_i10].object.parent.parent.userData.itemId === selectedItem.userData.itemId) {
|
|
@@ -1545,13 +1540,13 @@ var Scene3DViewer = exports["default"] = /*#__PURE__*/function (_React$Component
|
|
|
1545
1540
|
var _properties2 = allItemRect.cur.itemInfo.properties;
|
|
1546
1541
|
alti = _properties2.getIn(['altitude', '_length']);
|
|
1547
1542
|
var _unit2 = _properties2.getIn(['altitude', '_unit']) || 'in';
|
|
1548
|
-
alti = (0,
|
|
1543
|
+
alti = (0, _convertUnitsLite.convert)(alti).from(_unit2).to(_this2.props.state.scene.unit);
|
|
1549
1544
|
}
|
|
1550
1545
|
getPoint(event, alti);
|
|
1551
1546
|
if (bRotate) {
|
|
1552
1547
|
var _intersects$_i;
|
|
1553
1548
|
var selectedItem = planData.sceneGraph.layers[selectedObject.layerID].items[selectedObject.itemID];
|
|
1554
|
-
if (
|
|
1549
|
+
if (!selectedItem) return;
|
|
1555
1550
|
var selItem = _this2.props.state.scene.layers.get(selectedObject.layerID).items.get(selectedObject.itemID);
|
|
1556
1551
|
var itemPos = selectedItem.position.clone();
|
|
1557
1552
|
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) {
|
|
@@ -1569,7 +1564,7 @@ var Scene3DViewer = exports["default"] = /*#__PURE__*/function (_React$Component
|
|
|
1569
1564
|
if (bMove) {
|
|
1570
1565
|
bMove = false;
|
|
1571
1566
|
var _selectedItem = planData.sceneGraph.layers[selectedObject.layerID].items[selectedObject.itemID];
|
|
1572
|
-
if (
|
|
1567
|
+
if (!_selectedItem) return;
|
|
1573
1568
|
var _selItem = _this2.props.state.scene.layers.get(selectedObject.layerID).items.get(selectedObject.itemID);
|
|
1574
1569
|
var _itemPos = _selectedItem.position.clone();
|
|
1575
1570
|
if (intersects[_i10].object.parent.parent.userData.itemId === _selectedItem.userData.itemId) {
|
|
@@ -1618,7 +1613,7 @@ var Scene3DViewer = exports["default"] = /*#__PURE__*/function (_React$Component
|
|
|
1618
1613
|
var properties = allItemRect.cur.itemInfo.properties;
|
|
1619
1614
|
altitude = properties.getIn(['altitude', '_length']);
|
|
1620
1615
|
var unit = properties.getIn(['altitude', '_unit']) || 'in';
|
|
1621
|
-
altitude = (0,
|
|
1616
|
+
altitude = (0, _convertUnitsLite.convert)(altitude).from(unit).to(_this2.props.state.scene.unit);
|
|
1622
1617
|
}
|
|
1623
1618
|
if (_this2.props.state.mode === _constants.MODE_DRAWING_HOLE_3D) {
|
|
1624
1619
|
gridPlanOrigin = gridPlane.position;
|
|
@@ -2049,7 +2044,7 @@ var Scene3DViewer = exports["default"] = /*#__PURE__*/function (_React$Component
|
|
|
2049
2044
|
setTimeout(function () {
|
|
2050
2045
|
try {
|
|
2051
2046
|
currentObject = planData.sceneGraph.layers[selectedObject.layerID].items[selectedObject.itemID];
|
|
2052
|
-
if (
|
|
2047
|
+
if (!currentObject) return;
|
|
2053
2048
|
var selItem = _this2.props.state.scene.layers.get(selectedObject.layerID).items.get(selectedObject.itemID);
|
|
2054
2049
|
var itemPos = currentObject.position.clone();
|
|
2055
2050
|
toolObj.position.set(planData.plan.position.x + itemPos.x, selItem.category === 'lighting' ? -planData.plan.position.y - selItem.properties.get('height').get('length') : planData.plan.position.y + currentObject.children[0].position.y, planData.plan.position.z + itemPos.z);
|
|
@@ -2078,7 +2073,7 @@ var Scene3DViewer = exports["default"] = /*#__PURE__*/function (_React$Component
|
|
|
2078
2073
|
// In elevation view, set Orthographic camera's position, angle and rotation about selected line
|
|
2079
2074
|
var layers = scene.layers;
|
|
2080
2075
|
var selectedLayer = layers.get(scene.selectedLayer);
|
|
2081
|
-
var ceilHeight = (0,
|
|
2076
|
+
var ceilHeight = (0, _convertUnitsLite.convert)(selectedLayer.ceilHeight).from(selectedLayer.unit).to(scene.unit);
|
|
2082
2077
|
var lines = [];
|
|
2083
2078
|
var selectedLine = selectedLayer.lines.get(selectedLayer.selected.lines.toJS()[0]);
|
|
2084
2079
|
var vertex0 = selectedLayer.vertices.get(selectedLine.vertices.get(0));
|
|
@@ -2215,7 +2210,7 @@ var Scene3DViewer = exports["default"] = /*#__PURE__*/function (_React$Component
|
|
|
2215
2210
|
var indexAttribute = line.geometry.getIndex();
|
|
2216
2211
|
var firstFaceIndices = undefined;
|
|
2217
2212
|
if (indexAttribute && indexAttribute.length > 0) {
|
|
2218
|
-
[indexAttribute.getX(0), indexAttribute.getX(1), indexAttribute.getX(2)],
|
|
2213
|
+
[indexAttribute.getX(0), indexAttribute.getX(1), indexAttribute.getX(2)], (0, _readOnlyError2["default"])("firstFaceIndices");
|
|
2219
2214
|
}
|
|
2220
2215
|
if (firstFaceIndices == undefined) return;
|
|
2221
2216
|
// normal vector of the line
|
|
@@ -2312,7 +2307,7 @@ var Scene3DViewer = exports["default"] = /*#__PURE__*/function (_React$Component
|
|
|
2312
2307
|
var width = nextProps.width,
|
|
2313
2308
|
height = nextProps.height;
|
|
2314
2309
|
var selectedLayer = nextProps.state.getIn(['scene', 'layers', nextProps.state.scene.selectedLayer]);
|
|
2315
|
-
var ceilHeight = (0,
|
|
2310
|
+
var ceilHeight = (0, _convertUnitsLite.convert)(selectedLayer.ceilHeight).from(selectedLayer.unit).to(nextProps.state.scene.unit);
|
|
2316
2311
|
var actions = {
|
|
2317
2312
|
areaActions: this.context.areaActions,
|
|
2318
2313
|
holesActions: this.context.holesActions,
|
|
@@ -2530,4 +2525,5 @@ Scene3DViewer.contextTypes = {
|
|
|
2530
2525
|
sceneActions: _propTypes["default"].object.isRequired,
|
|
2531
2526
|
projectActions: _propTypes["default"].object.isRequired,
|
|
2532
2527
|
catalog: _propTypes["default"].object
|
|
2533
|
-
};
|
|
2528
|
+
};
|
|
2529
|
+
module.exports = exports.default;
|