kitchen-simulator 1.1.1-test.70 → 1.1.1-test.71
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 +2 -8
- package/es/AppContext.js +3 -8
- package/es/KitchenConfigurator.js +70 -77
- package/es/KitchenConfiguratorApp.js +98 -105
- package/es/actions/area-actions.js +5 -10
- package/es/actions/export.js +12 -27
- package/es/actions/groups-actions.js +27 -43
- package/es/actions/holes-actions.js +34 -53
- package/es/actions/items-actions.js +94 -143
- package/es/actions/lines-actions.js +21 -34
- package/es/actions/project-actions.js +94 -143
- package/es/actions/scene-actions.js +11 -19
- package/es/actions/vertices-actions.js +7 -13
- package/es/actions/viewer2d-actions.js +21 -34
- package/es/actions/viewer3d-actions.js +9 -16
- package/es/catalog/areas/area/planner-element.js +2 -7
- package/es/catalog/catalog.js +15 -19
- package/es/catalog/factories/area-factory-3d.js +22 -29
- package/es/catalog/factories/area-factory.js +11 -18
- package/es/catalog/factories/export.js +6 -12
- package/es/catalog/factories/wall-factory-3d.js +31 -39
- package/es/catalog/factories/wall-factory.js +21 -29
- package/es/catalog/holes/door-closet/planner-element.js +15 -22
- package/es/catalog/holes/door-double/planner-element.js +15 -22
- package/es/catalog/holes/door-exterior/planner-element.js +16 -23
- package/es/catalog/holes/door-interior/planner-element.js +16 -23
- package/es/catalog/holes/door-panic/planner-element.js +7 -14
- package/es/catalog/holes/door-panic-double/planner-element.js +15 -22
- package/es/catalog/holes/door-sliding/planner-element.js +16 -23
- package/es/catalog/holes/doorway-framed/planner-element.js +11 -18
- package/es/catalog/holes/doorway-frameless/planner-element.js +7 -14
- package/es/catalog/holes/export.js +13 -31
- package/es/catalog/holes/window-clear/planner-element.js +10 -17
- package/es/catalog/holes/window-cross/planner-element.js +10 -17
- package/es/catalog/holes/window-double-hung/planner-element.js +10 -17
- package/es/catalog/holes/window-vertical/planner-element.js +10 -17
- package/es/catalog/lines/wall/planner-element.js +2 -7
- package/es/catalog/molding/molding-dcm/planner-element.js +5 -12
- package/es/catalog/molding/molding-fbm/planner-element.js +5 -12
- package/es/catalog/molding/molding-lrm/planner-element.js +5 -12
- package/es/catalog/properties/export.js +20 -33
- package/es/catalog/properties/property-checkbox.js +24 -29
- package/es/catalog/properties/property-color.js +16 -21
- package/es/catalog/properties/property-enum.js +24 -29
- package/es/catalog/properties/property-hidden.js +9 -14
- package/es/catalog/properties/property-lenght-measure.js +38 -43
- package/es/catalog/properties/property-length-measure.js +36 -41
- package/es/catalog/properties/property-length-measure_hole.js +38 -43
- package/es/catalog/properties/property-number.js +17 -22
- package/es/catalog/properties/property-read-only.js +16 -21
- package/es/catalog/properties/property-string.js +16 -21
- package/es/catalog/properties/property-toggle.js +16 -21
- package/es/catalog/properties/shared-property-style.js +1 -5
- package/es/catalog/utils/FuseUtils.js +8 -13
- package/es/catalog/utils/exporter.js +8 -13
- package/es/catalog/utils/geom-utils.js +13 -27
- package/es/catalog/utils/item-loader.js +84 -95
- package/es/catalog/utils/load-obj.js +20 -26
- package/es/catalog/utils/mtl-loader.js +3 -6
- package/es/catalog/utils/obj-loader.js +3 -6
- package/es/class/FuseUtils.js +8 -13
- package/es/class/area.js +22 -26
- package/es/class/export.js +23 -38
- package/es/class/group.js +53 -57
- package/es/class/guide.js +15 -19
- package/es/class/hole.js +83 -87
- package/es/class/item.js +141 -145
- package/es/class/layer.js +59 -63
- package/es/class/line.js +135 -141
- package/es/class/project.js +90 -96
- package/es/class/vertex.js +29 -33
- package/es/components/content.js +19 -26
- package/es/components/disclaimer/disclaimer.js +10 -16
- package/es/components/export.js +8 -15
- package/es/components/style/button.js +23 -29
- package/es/components/style/cancel-button.js +7 -12
- package/es/components/style/content-container.js +9 -14
- package/es/components/style/content-title.js +11 -18
- package/es/components/style/delete-button.js +8 -15
- package/es/components/style/export.js +30 -48
- package/es/components/style/form-block.js +8 -13
- package/es/components/style/form-color-input.js +7 -12
- package/es/components/style/form-label.js +8 -13
- package/es/components/style/form-number-input.js +41 -47
- package/es/components/style/form-number-input_2.js +36 -42
- package/es/components/style/form-select.js +17 -22
- package/es/components/style/form-slider.js +10 -15
- package/es/components/style/form-submit-button.js +8 -15
- package/es/components/style/form-text-input.js +26 -32
- package/es/components/viewer2d/area.js +17 -22
- package/es/components/viewer2d/export.js +30 -48
- package/es/components/viewer2d/grids/grid-horizontal-streak.js +10 -15
- package/es/components/viewer2d/grids/grid-streak.js +10 -15
- package/es/components/viewer2d/grids/grid-vertical-streak.js +10 -15
- package/es/components/viewer2d/grids/grids.js +10 -17
- package/es/components/viewer2d/group.js +15 -22
- package/es/components/viewer2d/item.js +61 -68
- package/es/components/viewer2d/layer.js +23 -28
- package/es/components/viewer2d/line.js +101 -109
- package/es/components/viewer2d/ruler.js +22 -27
- package/es/components/viewer2d/rulerDist.js +21 -26
- package/es/components/viewer2d/rulerX.js +39 -45
- package/es/components/viewer2d/rulerY.js +37 -43
- package/es/components/viewer2d/scene.js +30 -36
- package/es/components/viewer2d/snap.js +13 -20
- package/es/components/viewer2d/state.js +18 -25
- package/es/components/viewer2d/utils.js +24 -35
- package/es/components/viewer2d/vertex.js +8 -15
- package/es/components/viewer2d/viewer2d.js +153 -161
- package/es/components/viewer3d/camera-controls-module/camera-controls.module.js +17 -21
- package/es/components/viewer3d/dcm.js +1 -5
- package/es/components/viewer3d/fbm.js +1 -5
- package/es/components/viewer3d/front3D.js +12 -19
- package/es/components/viewer3d/grid-creator.js +8 -15
- package/es/components/viewer3d/grids/grid-horizontal-streak.js +6 -12
- package/es/components/viewer3d/grids/grid-streak.js +5 -11
- package/es/components/viewer3d/grids/grid-vertical-streak.js +6 -12
- package/es/components/viewer3d/libs/first-person-controls.js +2 -7
- package/es/components/viewer3d/libs/helvetiker_regular.typeface.js +1 -5
- package/es/components/viewer3d/libs/mtl-loader.js +1 -5
- package/es/components/viewer3d/libs/obj-loader.js +1 -5
- package/es/components/viewer3d/libs/orbit-controls.js +2 -6
- package/es/components/viewer3d/libs/pointer-lock-controls.js +2 -6
- package/es/components/viewer3d/lrm.js +1 -5
- package/es/components/viewer3d/model.js +1 -5
- package/es/components/viewer3d/pointer-lock-navigation.js +3 -8
- package/es/components/viewer3d/ruler-utils/itemRect.js +18 -23
- package/es/components/viewer3d/ruler-utils/layer3D.js +59 -64
- package/es/components/viewer3d/ruler-utils/ruler3D.js +39 -44
- package/es/components/viewer3d/ruler-utils/scene3D.js +9 -15
- package/es/components/viewer3d/ruler-utils/state3D.js +4 -9
- package/es/components/viewer3d/scene-creator.js +191 -224
- package/es/components/viewer3d/three-memory-cleaner.js +3 -10
- package/es/components/viewer3d/viewer3d-first-person.js +40 -44
- package/es/components/viewer3d/viewer3d.js +196 -200
- package/es/constants.js +349 -356
- package/es/index.js +7 -13
- package/es/models.js +177 -182
- package/es/plugins/SVGLoader.js +48 -51
- package/es/plugins/autosave.js +3 -7
- package/es/plugins/console-debugger.js +5 -10
- package/es/plugins/export.js +8 -15
- package/es/plugins/keyboard.js +29 -33
- package/es/reducers/areas-reducer.js +7 -11
- package/es/reducers/export.js +24 -39
- package/es/reducers/groups-reducer.js +31 -35
- package/es/reducers/holes-reducer.js +43 -47
- package/es/reducers/items-reducer.js +106 -110
- package/es/reducers/lines-reducer.js +28 -32
- package/es/reducers/project-reducer.js +105 -109
- package/es/reducers/reducer.js +16 -21
- package/es/reducers/scene-reducer.js +15 -19
- package/es/reducers/user-reducer.js +5 -9
- package/es/reducers/vertices-reducer.js +11 -15
- package/es/reducers/viewer2d-reducer.js +18 -22
- package/es/reducers/viewer3d-reducer.js +16 -20
- package/es/shared-style.js +10 -14
- package/es/styles/export.js +3 -9
- package/es/translator/en.js +1 -5
- package/es/translator/it.js +1 -5
- package/es/translator/ru.js +1 -5
- package/es/translator/translator.js +13 -17
- package/es/utils/browser.js +2 -7
- package/es/utils/convert-units-lite.js +1 -5
- package/es/utils/email-validator.js +1 -5
- package/es/utils/export.js +15 -32
- package/es/utils/geometry.js +181 -276
- package/es/utils/get-edges-of-subgraphs.js +2 -7
- package/es/utils/graph-cycles.js +8 -9
- package/es/utils/graph-inner-cycles.js +10 -16
- package/es/utils/graph.js +9 -15
- package/es/utils/helper.js +39 -61
- package/es/utils/history.js +8 -13
- package/es/utils/id-broker.js +8 -13
- package/es/utils/logger.js +1 -5
- package/es/utils/math.js +5 -10
- package/es/utils/molding.js +119 -142
- package/es/utils/name-generator.js +7 -11
- package/es/utils/objects-utils.js +7 -17
- package/es/utils/phone-validator.js +1 -5
- package/es/utils/process-black-list.js +3 -8
- package/es/utils/react-if.js +6 -10
- package/es/utils/snap-scene.js +27 -32
- package/es/utils/snap.js +45 -57
- package/es/utils/summarizeCart.js +1 -5
- package/es/utils/threeCSG.es6.js +13 -20
- package/es/version.js +1 -5
- package/package.json +1 -1
|
@@ -1,71 +1,58 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
exports.__esModule = true;
|
|
4
|
-
exports.changeBaseCabinetMeasure = changeBaseCabinetMeasure;
|
|
5
|
-
exports.changeWallCabinetMeasure = changeWallCabinetMeasure;
|
|
6
|
-
exports.changeWallLengthMeasure = changeWallLengthMeasure;
|
|
7
|
-
exports.changeWindowDoorMeasure = changeWindowDoorMeasure;
|
|
8
|
-
exports.selectToolPan = selectToolPan;
|
|
9
|
-
exports.selectToolZoomIn = selectToolZoomIn;
|
|
10
|
-
exports.selectToolZoomOut = selectToolZoomOut;
|
|
11
|
-
exports.updateCameraView = updateCameraView;
|
|
12
|
-
exports.updateCeilHeight = updateCeilHeight;
|
|
13
|
-
exports.updateCeilHeightUnit = updateCeilHeightUnit;
|
|
14
|
-
var _constants = require("../constants");
|
|
15
|
-
function updateCeilHeight(value) {
|
|
1
|
+
import { CHANGE_BASE_CABINET_MEASURE, CHANGE_WALL_CABINET_MEASURE, CHANGE_WALL_LENGTH_MEASURE, CHANGE_WINDOW_DOOR_MEASURE, SELECT_TOOL_PAN, SELECT_TOOL_ZOOM_IN, SELECT_TOOL_ZOOM_OUT, UPDATE_2D_CAMERA, UPDATE_CEIL_HEIGHT, UPDATE_CEIL_HEIGHT_UNIT } from "../constants";
|
|
2
|
+
export function updateCeilHeight(value) {
|
|
16
3
|
return {
|
|
17
|
-
type:
|
|
4
|
+
type: UPDATE_CEIL_HEIGHT,
|
|
18
5
|
value: value
|
|
19
6
|
};
|
|
20
7
|
}
|
|
21
|
-
function updateCeilHeightUnit(value) {
|
|
8
|
+
export function updateCeilHeightUnit(value) {
|
|
22
9
|
return {
|
|
23
|
-
type:
|
|
10
|
+
type: UPDATE_CEIL_HEIGHT_UNIT,
|
|
24
11
|
value: value
|
|
25
12
|
};
|
|
26
13
|
}
|
|
27
|
-
function updateCameraView(value) {
|
|
14
|
+
export function updateCameraView(value) {
|
|
28
15
|
return {
|
|
29
|
-
type:
|
|
16
|
+
type: UPDATE_2D_CAMERA,
|
|
30
17
|
value: value
|
|
31
18
|
};
|
|
32
19
|
}
|
|
33
|
-
function changeWallLengthMeasure(value) {
|
|
20
|
+
export function changeWallLengthMeasure(value) {
|
|
34
21
|
return {
|
|
35
|
-
type:
|
|
22
|
+
type: CHANGE_WALL_LENGTH_MEASURE,
|
|
36
23
|
value: value
|
|
37
24
|
};
|
|
38
25
|
}
|
|
39
|
-
function changeBaseCabinetMeasure(value) {
|
|
26
|
+
export function changeBaseCabinetMeasure(value) {
|
|
40
27
|
return {
|
|
41
|
-
type:
|
|
28
|
+
type: CHANGE_BASE_CABINET_MEASURE,
|
|
42
29
|
value: value
|
|
43
30
|
};
|
|
44
31
|
}
|
|
45
|
-
function changeWallCabinetMeasure(value) {
|
|
32
|
+
export function changeWallCabinetMeasure(value) {
|
|
46
33
|
return {
|
|
47
|
-
type:
|
|
34
|
+
type: CHANGE_WALL_CABINET_MEASURE,
|
|
48
35
|
value: value
|
|
49
36
|
};
|
|
50
37
|
}
|
|
51
|
-
function changeWindowDoorMeasure(value) {
|
|
38
|
+
export function changeWindowDoorMeasure(value) {
|
|
52
39
|
return {
|
|
53
|
-
type:
|
|
40
|
+
type: CHANGE_WINDOW_DOOR_MEASURE,
|
|
54
41
|
value: value
|
|
55
42
|
};
|
|
56
43
|
}
|
|
57
|
-
function selectToolPan() {
|
|
44
|
+
export function selectToolPan() {
|
|
58
45
|
return {
|
|
59
|
-
type:
|
|
46
|
+
type: SELECT_TOOL_PAN
|
|
60
47
|
};
|
|
61
48
|
}
|
|
62
|
-
function selectToolZoomOut() {
|
|
49
|
+
export function selectToolZoomOut() {
|
|
63
50
|
return {
|
|
64
|
-
type:
|
|
51
|
+
type: SELECT_TOOL_ZOOM_OUT
|
|
65
52
|
};
|
|
66
53
|
}
|
|
67
|
-
function selectToolZoomIn() {
|
|
54
|
+
export function selectToolZoomIn() {
|
|
68
55
|
return {
|
|
69
|
-
type:
|
|
56
|
+
type: SELECT_TOOL_ZOOM_IN
|
|
70
57
|
};
|
|
71
58
|
}
|
|
@@ -1,30 +1,23 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
exports.__esModule = true;
|
|
4
|
-
exports.selectTool3DFirstPerson = selectTool3DFirstPerson;
|
|
5
|
-
exports.selectTool3DView = selectTool3DView;
|
|
6
|
-
exports.update3DCeilHeight = update3DCeilHeight;
|
|
7
|
-
exports.update3DCeilHeightUnit = update3DCeilHeightUnit;
|
|
8
|
-
var _constants = require("../constants");
|
|
9
|
-
function selectTool3DView() {
|
|
1
|
+
import { SELECT_TOOL_3D_FIRST_PERSON, SELECT_TOOL_3D_VIEW, UPDATE_3D_CEIL_HEIGHT, UPDATE_3D_CEIL_HEIGHT_UNIT } from "../constants";
|
|
2
|
+
export function selectTool3DView() {
|
|
10
3
|
return {
|
|
11
|
-
type:
|
|
4
|
+
type: SELECT_TOOL_3D_VIEW
|
|
12
5
|
};
|
|
13
6
|
}
|
|
14
|
-
function selectTool3DFirstPerson() {
|
|
7
|
+
export function selectTool3DFirstPerson() {
|
|
15
8
|
return {
|
|
16
|
-
type:
|
|
9
|
+
type: SELECT_TOOL_3D_FIRST_PERSON
|
|
17
10
|
};
|
|
18
11
|
}
|
|
19
|
-
function update3DCeilHeight(value) {
|
|
12
|
+
export function update3DCeilHeight(value) {
|
|
20
13
|
return {
|
|
21
|
-
type:
|
|
14
|
+
type: UPDATE_3D_CEIL_HEIGHT,
|
|
22
15
|
value: value
|
|
23
16
|
};
|
|
24
17
|
}
|
|
25
|
-
function update3DCeilHeightUnit(value) {
|
|
18
|
+
export function update3DCeilHeightUnit(value) {
|
|
26
19
|
return {
|
|
27
|
-
type:
|
|
20
|
+
type: UPDATE_3D_CEIL_HEIGHT_UNIT,
|
|
28
21
|
value: value
|
|
29
22
|
};
|
|
30
23
|
}
|
|
@@ -1,9 +1,4 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
|
|
4
|
-
exports.__esModule = true;
|
|
5
|
-
exports["default"] = void 0;
|
|
6
|
-
var _export = _interopRequireDefault(require("../../factories/export"));
|
|
1
|
+
import ElementsFactories from "../../factories/export";
|
|
7
2
|
var textureUrl = function textureUrl(file) {
|
|
8
3
|
return new URL("./textures/".concat(file), import.meta.url).href;
|
|
9
4
|
};
|
|
@@ -45,4 +40,4 @@ var textures = {
|
|
|
45
40
|
heightRepeatScale: 0.01
|
|
46
41
|
}
|
|
47
42
|
};
|
|
48
|
-
|
|
43
|
+
export default ElementsFactories.AreaFactory('area', info, textures);
|
package/es/catalog/catalog.js
CHANGED
|
@@ -1,18 +1,13 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
var
|
|
8
|
-
var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/createClass"));
|
|
9
|
-
var _export = require("./properties/export");
|
|
10
|
-
var _constants = require("../constants");
|
|
11
|
-
var _utils = require("../components/viewer2d/utils");
|
|
12
|
-
var Catalog = exports["default"] = /*#__PURE__*/function () {
|
|
1
|
+
import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
|
|
2
|
+
import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
|
|
3
|
+
import _createClass from "@babel/runtime/helpers/esm/createClass";
|
|
4
|
+
import { PropertyColor, PropertyEnum, PropertyString, PropertyNumber, PropertyLengthMeasure, PropertyToggle, PropertyCheckbox, PropertyHidden, PropertyReadOnly } from "./properties/export";
|
|
5
|
+
import { UNIT_CENTIMETER, UNIT_INCH } from "../constants";
|
|
6
|
+
import { returnReplaceableDeepSearchType } from "../components/viewer2d/utils";
|
|
7
|
+
var Catalog = /*#__PURE__*/function () {
|
|
13
8
|
function Catalog() {
|
|
14
|
-
var unit = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] :
|
|
15
|
-
(
|
|
9
|
+
var unit = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : UNIT_CENTIMETER;
|
|
10
|
+
_classCallCheck(this, Catalog);
|
|
16
11
|
this.elements = {};
|
|
17
12
|
this.categories = {
|
|
18
13
|
root: {
|
|
@@ -24,7 +19,7 @@ var Catalog = exports["default"] = /*#__PURE__*/function () {
|
|
|
24
19
|
};
|
|
25
20
|
this.propertyTypes = {};
|
|
26
21
|
this.unit = unit;
|
|
27
|
-
this.registerMultiplePropertyType([['color',
|
|
22
|
+
this.registerMultiplePropertyType([['color', PropertyColor, PropertyColor], ['enum', PropertyEnum, PropertyEnum], ['string', PropertyString, PropertyString], ['number', PropertyNumber, PropertyNumber], ['length-measure', PropertyLengthMeasure, PropertyLengthMeasure], ['toggle', PropertyToggle, PropertyToggle], ['checkbox', PropertyCheckbox, PropertyCheckbox], ['hidden', PropertyHidden, PropertyHidden], ['read-only', PropertyReadOnly, PropertyReadOnly]]);
|
|
28
23
|
}
|
|
29
24
|
|
|
30
25
|
/**
|
|
@@ -32,13 +27,13 @@ var Catalog = exports["default"] = /*#__PURE__*/function () {
|
|
|
32
27
|
* @param {string} type Element's type
|
|
33
28
|
* @return {?object} Element
|
|
34
29
|
*/
|
|
35
|
-
return (
|
|
30
|
+
return _createClass(Catalog, [{
|
|
36
31
|
key: "getElement",
|
|
37
32
|
value: function getElement(type) {
|
|
38
33
|
if (this.hasElement(type)) {
|
|
39
34
|
return this.elements[type];
|
|
40
35
|
} else {
|
|
41
|
-
var deepSearchType =
|
|
36
|
+
var deepSearchType = returnReplaceableDeepSearchType(type);
|
|
42
37
|
var element = this.elements[deepSearchType];
|
|
43
38
|
if (element) return element;
|
|
44
39
|
if (!element) return false;
|
|
@@ -131,7 +126,7 @@ var Catalog = exports["default"] = /*#__PURE__*/function () {
|
|
|
131
126
|
value: function registerMultiplePropertyType(propertyTypeArray) {
|
|
132
127
|
var _this2 = this;
|
|
133
128
|
propertyTypeArray.forEach(function (el) {
|
|
134
|
-
return _this2.registerPropertyType.apply(_this2, (
|
|
129
|
+
return _this2.registerPropertyType.apply(_this2, _toConsumableArray(el));
|
|
135
130
|
});
|
|
136
131
|
}
|
|
137
132
|
|
|
@@ -269,4 +264,5 @@ var Catalog = exports["default"] = /*#__PURE__*/function () {
|
|
|
269
264
|
return this.categories.hasOwnProperty(categoryName);
|
|
270
265
|
}
|
|
271
266
|
}]);
|
|
272
|
-
}();
|
|
267
|
+
}();
|
|
268
|
+
export { Catalog as default };
|
|
@@ -1,14 +1,7 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
exports.createArea = createArea;
|
|
6
|
-
exports.updatedArea = updatedArea;
|
|
7
|
-
var _three = _interopRequireWildcard(require("three"));
|
|
8
|
-
var Three = _three;
|
|
9
|
-
var SharedStyle = _interopRequireWildcard(require("../../shared-style"));
|
|
10
|
-
var _RGBELoader = require("three/examples/jsm/loaders/RGBELoader");
|
|
11
|
-
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); }
|
|
1
|
+
import * as Three from 'three';
|
|
2
|
+
import { Box3, Mesh, MeshBasicMaterial, MeshPhysicalMaterial, RepeatWrapping, Shape, TextureLoader, Vector2 } from 'three';
|
|
3
|
+
import * as SharedStyle from "../../shared-style";
|
|
4
|
+
import { RGBELoader } from 'three/examples/jsm/loaders/RGBELoader';
|
|
12
5
|
var params = {
|
|
13
6
|
envMap: 'HDR',
|
|
14
7
|
roughness: 0.9,
|
|
@@ -25,19 +18,19 @@ var params = {
|
|
|
25
18
|
* @param height: The height of the face
|
|
26
19
|
*/
|
|
27
20
|
var applyTexture = function applyTexture(material, texture, length, height) {
|
|
28
|
-
var loader = new
|
|
21
|
+
var loader = new TextureLoader();
|
|
29
22
|
if (texture) {
|
|
30
23
|
material.map = loader.load(texture.uri);
|
|
31
24
|
material.map.colorSpace = Three.SRGBColorSpace;
|
|
32
25
|
material.needsUpdate = true;
|
|
33
|
-
material.map.wrapS =
|
|
34
|
-
material.map.wrapT =
|
|
26
|
+
material.map.wrapS = RepeatWrapping;
|
|
27
|
+
material.map.wrapT = RepeatWrapping;
|
|
35
28
|
material.map.repeat.set(length * texture.lengthRepeatScale, height * texture.heightRepeatScale);
|
|
36
29
|
if (texture.normal) {
|
|
37
30
|
material.normalMap = loader.load(texture.normal.uri);
|
|
38
|
-
material.normalScale = new
|
|
39
|
-
material.normalMap.wrapS =
|
|
40
|
-
material.normalMap.wrapT =
|
|
31
|
+
material.normalScale = new Vector2(texture.normal.normalScaleX, texture.normal.normalScaleY);
|
|
32
|
+
material.normalMap.wrapS = RepeatWrapping;
|
|
33
|
+
material.normalMap.wrapT = RepeatWrapping;
|
|
41
34
|
material.normalMap.repeat.set(length * texture.normal.lengthRepeatScale, height * texture.normal.heightRepeatScale);
|
|
42
35
|
}
|
|
43
36
|
}
|
|
@@ -52,8 +45,8 @@ var assignUVs = function assignUVs(geometry) {
|
|
|
52
45
|
var _geometry$boundingBox = geometry.boundingBox,
|
|
53
46
|
min = _geometry$boundingBox.min,
|
|
54
47
|
max = _geometry$boundingBox.max;
|
|
55
|
-
var offset = new
|
|
56
|
-
var range = new
|
|
48
|
+
var offset = new Vector2(0 - min.x, 0 - min.y);
|
|
49
|
+
var range = new Vector2(max.x - min.x, max.y - min.y);
|
|
57
50
|
var uvArray = [];
|
|
58
51
|
var position = geometry.attributes.position;
|
|
59
52
|
for (var i = 0; i < position.count; i += 3) {
|
|
@@ -68,7 +61,7 @@ var assignUVs = function assignUVs(geometry) {
|
|
|
68
61
|
geometry.setAttribute('uv', new Three.BufferAttribute(new Float32Array(uvArray), 2));
|
|
69
62
|
geometry.needsUpdate = true;
|
|
70
63
|
};
|
|
71
|
-
function createArea(element, layer, scene, textures) {
|
|
64
|
+
export function createArea(element, layer, scene, textures) {
|
|
72
65
|
var vertices = [];
|
|
73
66
|
element.vertices.forEach(function (vertexID) {
|
|
74
67
|
vertices.push(layer.vertices.get(vertexID));
|
|
@@ -85,20 +78,20 @@ function createArea(element, layer, scene, textures) {
|
|
|
85
78
|
if (texture.uri === undefined || texture.uri == '') {
|
|
86
79
|
texture.uri = layer.floorStyle.uri;
|
|
87
80
|
}
|
|
88
|
-
var shape = new
|
|
81
|
+
var shape = new Shape();
|
|
89
82
|
shape.moveTo(vertices[0].x, vertices[0].y);
|
|
90
83
|
for (var i = 1; i < vertices.length; i++) {
|
|
91
84
|
shape.lineTo(vertices[i].x, vertices[i].y);
|
|
92
85
|
}
|
|
93
86
|
function loadFloorENV() {
|
|
94
|
-
return new
|
|
87
|
+
return new RGBELoader().load('/assets/Window.hdr', function (texture) {
|
|
95
88
|
texture.mapping = Three.EquirectangularReflectionMapping;
|
|
96
89
|
return texture;
|
|
97
90
|
});
|
|
98
91
|
}
|
|
99
92
|
var floorENV = loadFloorENV();
|
|
100
|
-
var loader = new
|
|
101
|
-
var areaMaterial = new
|
|
93
|
+
var loader = new TextureLoader();
|
|
94
|
+
var areaMaterial = new MeshPhysicalMaterial({
|
|
102
95
|
side: Three.DoubleSide,
|
|
103
96
|
metalness: texture.metalness,
|
|
104
97
|
roughness: 0.3,
|
|
@@ -130,20 +123,20 @@ function createArea(element, layer, scene, textures) {
|
|
|
130
123
|
};
|
|
131
124
|
var shapeGeometry = new Three.ExtrudeGeometry(shape, extrudeSettings);
|
|
132
125
|
assignUVs(shapeGeometry);
|
|
133
|
-
var boundingBox = new
|
|
126
|
+
var boundingBox = new Box3().setFromObject(new Mesh(shapeGeometry, new MeshBasicMaterial()));
|
|
134
127
|
var width = boundingBox.max.x - boundingBox.min.x;
|
|
135
128
|
var height = boundingBox.max.y - boundingBox.min.y;
|
|
136
129
|
var texture_unit = 70 * 2.54; // 70 inch
|
|
137
130
|
|
|
138
131
|
applyTexture(areaMaterial, texture, width / texture_unit * 100, height / texture_unit * 100);
|
|
139
|
-
var area = new
|
|
132
|
+
var area = new Mesh(shapeGeometry, areaMaterial);
|
|
140
133
|
area.rotation.x -= Math.PI / 2;
|
|
141
134
|
area.receiveShadow = true;
|
|
142
135
|
area.name = 'floor';
|
|
143
136
|
// This mesh is use for creating ceiling mesh
|
|
144
137
|
|
|
145
138
|
var shapeGeometry2 = new Three.ShapeGeometry(shape);
|
|
146
|
-
var area2 = new
|
|
139
|
+
var area2 = new Mesh(shapeGeometry2, new MeshBasicMaterial({
|
|
147
140
|
transparent: true,
|
|
148
141
|
opacity: 0.0
|
|
149
142
|
}));
|
|
@@ -155,7 +148,7 @@ function createArea(element, layer, scene, textures) {
|
|
|
155
148
|
area.userData.floorSupport = floorSupport;
|
|
156
149
|
return Promise.resolve(area);
|
|
157
150
|
}
|
|
158
|
-
function updatedArea(element, layer, scene, textures, mesh, oldElement, differences, selfDestroy, selfBuild) {
|
|
151
|
+
export function updatedArea(element, layer, scene, textures, mesh, oldElement, differences, selfDestroy, selfBuild) {
|
|
159
152
|
var noPerf = function noPerf() {
|
|
160
153
|
selfDestroy();
|
|
161
154
|
return selfBuild();
|
|
@@ -179,7 +172,7 @@ function updatedArea(element, layer, scene, textures, mesh, oldElement, differen
|
|
|
179
172
|
* @returns {Shape}
|
|
180
173
|
*/
|
|
181
174
|
var createShape = function createShape(shapeCoords) {
|
|
182
|
-
var shape = new
|
|
175
|
+
var shape = new Shape();
|
|
183
176
|
shape.moveTo(shapeCoords[0][0], shapeCoords[0][1]);
|
|
184
177
|
for (var i = 1; i < shapeCoords.length; i++) {
|
|
185
178
|
shape.lineTo(shapeCoords[i][0], shapeCoords[i][1]);
|
|
@@ -1,19 +1,12 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
|
|
4
|
-
var _typeof = require("@babel/runtime/helpers/typeof");
|
|
5
|
-
exports.__esModule = true;
|
|
6
|
-
exports["default"] = AreaFactory;
|
|
7
|
-
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/defineProperty"));
|
|
8
|
-
var _react = _interopRequireDefault(require("react"));
|
|
9
|
-
var _areaFactory3d = require("./area-factory-3d");
|
|
10
|
-
var SharedStyle = _interopRequireWildcard(require("../../shared-style"));
|
|
11
|
-
var _translator = _interopRequireDefault(require("../../translator/translator"));
|
|
12
|
-
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); }
|
|
1
|
+
import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
|
|
13
2
|
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; }
|
|
14
|
-
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) { (
|
|
15
|
-
|
|
16
|
-
|
|
3
|
+
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; }
|
|
4
|
+
import React from 'react';
|
|
5
|
+
import { createArea, updatedArea } from "./area-factory-3d";
|
|
6
|
+
import * as SharedStyle from "../../shared-style";
|
|
7
|
+
import Translator from "../../translator/translator";
|
|
8
|
+
var translator = new Translator();
|
|
9
|
+
export default function AreaFactory(name, info, textures) {
|
|
17
10
|
var areaElement = {
|
|
18
11
|
name: name,
|
|
19
12
|
prototype: 'areas',
|
|
@@ -55,16 +48,16 @@ function AreaFactory(name, info, textures) {
|
|
|
55
48
|
});
|
|
56
49
|
});
|
|
57
50
|
var fill = element.selected ? SharedStyle.AREA_MESH_COLOR.selected : SharedStyle.AREA_MESH_COLOR.unselected;
|
|
58
|
-
return /*#__PURE__*/
|
|
51
|
+
return /*#__PURE__*/React.createElement("path", {
|
|
59
52
|
d: path,
|
|
60
53
|
fill: fill
|
|
61
54
|
});
|
|
62
55
|
},
|
|
63
56
|
render3D: function render3D(element, layer, scene) {
|
|
64
|
-
return
|
|
57
|
+
return createArea(element, layer, scene, textures);
|
|
65
58
|
},
|
|
66
59
|
updateRender3D: function updateRender3D(element, layer, scene, mesh, oldElement, differences, selfDestroy, selfBuild) {
|
|
67
|
-
return
|
|
60
|
+
return updatedArea(element, layer, scene, textures, mesh, oldElement, differences, selfDestroy, selfBuild);
|
|
68
61
|
}
|
|
69
62
|
};
|
|
70
63
|
if (textures && textures !== {}) {
|
|
@@ -1,13 +1,7 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
exports.WallFactory = _wallFactory["default"];
|
|
8
|
-
var _areaFactory = _interopRequireDefault(require("./area-factory"));
|
|
9
|
-
exports.AreaFactory = _areaFactory["default"];
|
|
10
|
-
var _default = exports["default"] = {
|
|
11
|
-
WallFactory: _wallFactory["default"],
|
|
12
|
-
AreaFactory: _areaFactory["default"]
|
|
1
|
+
import WallFactory from "./wall-factory";
|
|
2
|
+
import AreaFactory from "./area-factory";
|
|
3
|
+
export { WallFactory, AreaFactory };
|
|
4
|
+
export default {
|
|
5
|
+
WallFactory: WallFactory,
|
|
6
|
+
AreaFactory: AreaFactory
|
|
13
7
|
};
|
|
@@ -1,19 +1,11 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
var Three = _three;
|
|
10
|
-
var _geometry = require("../../utils/geometry");
|
|
11
|
-
var _helper = require("../../utils/helper");
|
|
12
|
-
var SharedStyle = _interopRequireWildcard(require("../../shared-style"));
|
|
13
|
-
var _constants = require("../../constants");
|
|
14
|
-
var _convertUnitsLite = require("../../utils/convert-units-lite");
|
|
15
|
-
var _threeCSG = _interopRequireDefault(require("../../utils/threeCSG.es6"));
|
|
16
|
-
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); }
|
|
1
|
+
import * as Three from 'three';
|
|
2
|
+
import { BoxGeometry, Group, Mesh, MeshBasicMaterial, MeshStandardMaterial, RepeatWrapping, TextureLoader, Vector2 } from 'three';
|
|
3
|
+
import { verticesDistance } from "../../utils/geometry";
|
|
4
|
+
import { isElevationView } from "../../utils/helper";
|
|
5
|
+
import * as SharedStyle from "../../shared-style";
|
|
6
|
+
import { LINE_THICKNESS, UNIT_CENTIMETER } from "../../constants";
|
|
7
|
+
import { convert } from "../../utils/convert-units-lite";
|
|
8
|
+
import ThreeBSP from "../../utils/threeCSG.es6";
|
|
17
9
|
var params = {
|
|
18
10
|
envMap: 'HDR',
|
|
19
11
|
roughness: 0.1,
|
|
@@ -31,23 +23,23 @@ var halfPI = Math.PI / 2;
|
|
|
31
23
|
* @param height: The height of the face
|
|
32
24
|
*/
|
|
33
25
|
var applyTexture = function applyTexture(material, texture, length, height) {
|
|
34
|
-
var loader = new
|
|
26
|
+
var loader = new TextureLoader();
|
|
35
27
|
if (texture) {
|
|
36
28
|
material.map = loader.load(texture.uri["default"]);
|
|
37
29
|
material.map.colorSpace = Three.SRGBColorSpace, material.needsUpdate = true;
|
|
38
|
-
material.map.wrapS =
|
|
39
|
-
material.map.wrapT =
|
|
30
|
+
material.map.wrapS = RepeatWrapping;
|
|
31
|
+
material.map.wrapT = RepeatWrapping;
|
|
40
32
|
material.map.repeat.set(length * texture.lengthRepeatScale, height * texture.heightRepeatScale);
|
|
41
33
|
if (texture.normal) {
|
|
42
34
|
material.normalMap = loader.load(texture.normal.uri["default"]);
|
|
43
|
-
material.normalScale = new
|
|
44
|
-
material.normalMap.wrapS =
|
|
45
|
-
material.normalMap.wrapT =
|
|
35
|
+
material.normalScale = new Vector2(texture.normal.normalScaleX, texture.normal.normalScaleY);
|
|
36
|
+
material.normalMap.wrapS = RepeatWrapping;
|
|
37
|
+
material.normalMap.wrapT = RepeatWrapping;
|
|
46
38
|
material.normalMap.repeat.set(length * texture.normal.lengthRepeatScale, height * texture.normal.heightRepeatScale);
|
|
47
39
|
}
|
|
48
40
|
}
|
|
49
41
|
};
|
|
50
|
-
function buildWall(element, layer, scene, textures, mode) {
|
|
42
|
+
export function buildWall(element, layer, scene, textures, mode) {
|
|
51
43
|
// Get the two vertices of the wall
|
|
52
44
|
var vetName0 = element.vertices.get(0);
|
|
53
45
|
var vetName1 = element.vertices.get(1);
|
|
@@ -67,9 +59,9 @@ function buildWall(element, layer, scene, textures, mode) {
|
|
|
67
59
|
// Get height and thickness of the wall converting them into the current scene units
|
|
68
60
|
// let height = element.properties.getIn(['height', 'length']);
|
|
69
61
|
// let thickness = element.properties.getIn(['thickness', 'length']);
|
|
70
|
-
var height =
|
|
62
|
+
var height = convert(layer.ceilHeight).from(layer.unit).to(UNIT_CENTIMETER);
|
|
71
63
|
var thickness = 2.0;
|
|
72
|
-
var distance =
|
|
64
|
+
var distance = verticesDistance(vertex0, vertex1);
|
|
73
65
|
var soulMaterial = new Three.MeshPhongMaterial({
|
|
74
66
|
color: new Three.Color(wallColor).convertLinearToSRGB()
|
|
75
67
|
}); //element.selected ? SharedStyle.MESH_SELECTED : 0xD3D3D3
|
|
@@ -79,7 +71,7 @@ function buildWall(element, layer, scene, textures, mode) {
|
|
|
79
71
|
soulVertices.push(new Three.Vector2(distance / 2, -height / 2));
|
|
80
72
|
soulVertices.push(new Three.Vector2(-distance / 2, -height / 2));
|
|
81
73
|
var soulShape = new Three.Shape(soulVertices);
|
|
82
|
-
var soulMesh = new
|
|
74
|
+
var soulMesh = new Mesh(new BoxGeometry(distance, height, thickness), soulMaterial);
|
|
83
75
|
if (element.userData.stateMode !== 'MODE_DRAWING_HOLE_3D') {
|
|
84
76
|
element.holes.forEach(function (holeID) {
|
|
85
77
|
var holeData = layer.holes.get(holeID);
|
|
@@ -102,14 +94,14 @@ function buildWall(element, layer, scene, textures, mode) {
|
|
|
102
94
|
}
|
|
103
95
|
var shapeHole = new Three.Shape(holeVertices);
|
|
104
96
|
soulShape.holes.push(shapeHole);
|
|
105
|
-
var holeGeometry = new
|
|
106
|
-
var holeMesh = new
|
|
97
|
+
var holeGeometry = new BoxGeometry(holeWidth, holeHeight, thickness);
|
|
98
|
+
var holeMesh = new Mesh(holeGeometry);
|
|
107
99
|
holeMesh.position.x += holeWidth / 2;
|
|
108
100
|
holeMesh.position.y += holeHeight / 2;
|
|
109
101
|
holeMesh.position.x += holeDistance - distance / 2 - holeWidth / 2;
|
|
110
102
|
holeMesh.position.y -= height / 2 - holeAltitude;
|
|
111
|
-
var wallBSP = new
|
|
112
|
-
var holeBSP = new
|
|
103
|
+
var wallBSP = new ThreeBSP(soulMesh);
|
|
104
|
+
var holeBSP = new ThreeBSP(holeMesh);
|
|
113
105
|
var wallWithHoleBSP = wallBSP.subtract(holeBSP);
|
|
114
106
|
soulMesh = wallWithHoleBSP.toMesh(soulMaterial);
|
|
115
107
|
}
|
|
@@ -117,7 +109,7 @@ function buildWall(element, layer, scene, textures, mode) {
|
|
|
117
109
|
}
|
|
118
110
|
var cAlpha = new Three.Vector2(vertex0.x - vertex1.x, vertex0.y - vertex1.y).angle();
|
|
119
111
|
var soulGeometry = new Three.ShapeGeometry(soulShape);
|
|
120
|
-
var soul = new
|
|
112
|
+
var soul = new Mesh(soulGeometry, soulMaterial);
|
|
121
113
|
soul.receiveShadow = true;
|
|
122
114
|
soul.castShadow = true;
|
|
123
115
|
soul.position.y += height / 2;
|
|
@@ -127,13 +119,13 @@ function buildWall(element, layer, scene, textures, mode) {
|
|
|
127
119
|
soulMesh.rotation.y = cAlpha + Math.PI;
|
|
128
120
|
soulMesh.name = 'soul';
|
|
129
121
|
soulMesh.castShadow = true;
|
|
130
|
-
var frontMaterial = new
|
|
122
|
+
var frontMaterial = new MeshStandardMaterial({
|
|
131
123
|
color: new Three.Color(wallColor).convertLinearToSRGB(),
|
|
132
124
|
metalness: 0.1,
|
|
133
125
|
roughness: 0.9
|
|
134
126
|
// envMap: textureCube,
|
|
135
127
|
});
|
|
136
|
-
var backMaterial = new
|
|
128
|
+
var backMaterial = new MeshStandardMaterial({
|
|
137
129
|
color: new Three.Color(wallColor).convertLinearToSRGB(),
|
|
138
130
|
metalness: 0.1,
|
|
139
131
|
roughness: 0.9
|
|
@@ -145,11 +137,11 @@ function buildWall(element, layer, scene, textures, mode) {
|
|
|
145
137
|
frontFace.material = frontMaterial;
|
|
146
138
|
frontFace.name = 'frontFace';
|
|
147
139
|
soulMesh.material = frontMaterial;
|
|
148
|
-
var merged = new
|
|
140
|
+
var merged = new Group();
|
|
149
141
|
merged.add(frontFace, soulMesh);
|
|
150
142
|
|
|
151
143
|
// if this wall is front of camera, show/hide
|
|
152
|
-
if (!
|
|
144
|
+
if (!isElevationView(mode)) {
|
|
153
145
|
frontFace.onBeforeRender = function (renderer, scene, camera, geometry, material, group) {
|
|
154
146
|
var soulMesh = this.parent.getObjectByName('soul');
|
|
155
147
|
if (geometry.attributes.normal === undefined) return soulMesh.visible = false;
|
|
@@ -168,7 +160,7 @@ function buildWall(element, layer, scene, textures, mode) {
|
|
|
168
160
|
}
|
|
169
161
|
return Promise.resolve(merged);
|
|
170
162
|
}
|
|
171
|
-
function updatedWall(element, layer, scene, textures, mesh, oldElement, differences, selfDestroy, selfBuild) {
|
|
163
|
+
export function updatedWall(element, layer, scene, textures, mesh, oldElement, differences, selfDestroy, selfBuild) {
|
|
172
164
|
var noPerf = function noPerf() {
|
|
173
165
|
selfDestroy();
|
|
174
166
|
return selfBuild();
|
|
@@ -179,7 +171,7 @@ function updatedWall(element, layer, scene, textures, mesh, oldElement, differen
|
|
|
179
171
|
if (differences[0] == 'selected') {
|
|
180
172
|
if (soul !== undefined) {
|
|
181
173
|
if (element.selected) {
|
|
182
|
-
soul.material = new
|
|
174
|
+
soul.material = new MeshBasicMaterial({
|
|
183
175
|
color: new Three.Color(SharedStyle.MESH_SELECTED).convertLinearToSRGB()
|
|
184
176
|
});
|
|
185
177
|
} else {
|
|
@@ -189,8 +181,8 @@ function updatedWall(element, layer, scene, textures, mesh, oldElement, differen
|
|
|
189
181
|
}
|
|
190
182
|
} else if (differences[0] == 'properties') {
|
|
191
183
|
if (differences[1] == 'thickness') {
|
|
192
|
-
var newThickness =
|
|
193
|
-
var oldThickness =
|
|
184
|
+
var newThickness = LINE_THICKNESS / 2;
|
|
185
|
+
var oldThickness = LINE_THICKNESS / 2;
|
|
194
186
|
// let newThickness = element.getIn(['properties', 'thickness', 'length']);
|
|
195
187
|
// let oldThickness = oldElement.getIn(['properties', 'thickness', 'length']);
|
|
196
188
|
var halfNewThickness = newThickness / 2;
|