kitchen-simulator 4.0.6 → 4.0.7-measurement-unit-payload

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.
Files changed (47) hide show
  1. package/es/actions/project-actions.js +2 -1
  2. package/es/catalog/factories/wall-factory.js +1 -1
  3. package/es/catalog/utils/exporter.js +23 -11
  4. package/es/catalog/utils/item-loader.js +4 -9
  5. package/es/class/item.js +3 -0
  6. package/es/class/layer.js +1 -1
  7. package/es/class/project.js +9 -7
  8. package/es/components/viewer2d/line.js +5 -5
  9. package/es/components/viewer2d/ruler.js +16 -13
  10. package/es/components/viewer2d/rulerDist.js +38 -52
  11. package/es/components/viewer2d/viewer2d.js +10 -5
  12. package/es/components/viewer3d/scene-creator.js +213 -53
  13. package/es/components/viewer3d/viewer3d.js +21 -14
  14. package/es/constants.js +1 -0
  15. package/es/index.js +26 -5
  16. package/es/models.js +10 -6
  17. package/es/reducers/project-reducer.js +1 -1
  18. package/es/reducers/viewer2d-reducer.js +3 -1
  19. package/es/reducers/viewer3d-reducer.js +3 -1
  20. package/es/utils/geometry.js +7 -7
  21. package/es/utils/isolate-event-handler.js +8 -8
  22. package/es/utils/molding.js +4 -2
  23. package/es/utils/ruler.js +58 -0
  24. package/lib/actions/project-actions.js +2 -1
  25. package/lib/catalog/factories/wall-factory.js +1 -1
  26. package/lib/catalog/utils/exporter.js +23 -11
  27. package/lib/catalog/utils/item-loader.js +4 -9
  28. package/lib/class/item.js +3 -0
  29. package/lib/class/layer.js +1 -1
  30. package/lib/class/project.js +9 -7
  31. package/lib/components/viewer2d/line.js +5 -5
  32. package/lib/components/viewer2d/ruler.js +15 -12
  33. package/lib/components/viewer2d/rulerDist.js +38 -52
  34. package/lib/components/viewer2d/viewer2d.js +10 -5
  35. package/lib/components/viewer3d/scene-creator.js +212 -52
  36. package/lib/components/viewer3d/viewer3d.js +21 -14
  37. package/lib/constants.js +5 -4
  38. package/lib/index.js +28 -5
  39. package/lib/models.js +10 -6
  40. package/lib/reducers/project-reducer.js +1 -1
  41. package/lib/reducers/viewer2d-reducer.js +3 -1
  42. package/lib/reducers/viewer3d-reducer.js +3 -1
  43. package/lib/utils/geometry.js +7 -7
  44. package/lib/utils/isolate-event-handler.js +8 -8
  45. package/lib/utils/molding.js +4 -2
  46. package/lib/utils/ruler.js +63 -0
  47. package/package.json +1 -1
@@ -7,13 +7,7 @@ Object.defineProperty(exports, "__esModule", {
7
7
  exports["default"] = RulerDist;
8
8
  var _react = _interopRequireDefault(require("react"));
9
9
  var _propTypes = _interopRequireDefault(require("prop-types"));
10
- var _convertUnitsLite = require("../../utils/convert-units-lite");
11
- var _constants = require("../../constants");
12
- var ARROW_STYLE = {
13
- stroke: '#1183B7',
14
- strokeWidth: '2px',
15
- strokeLinecap: 'round'
16
- };
10
+ var _ruler = require("../../utils/ruler");
17
11
  var STYLE = {
18
12
  stroke: '#455A64',
19
13
  fill: '#455A64',
@@ -39,10 +33,17 @@ function RulerDist(_ref) {
39
33
  transform = _ref.transform,
40
34
  angle = _ref.angle,
41
35
  rotation = _ref.rotation;
42
- var ruLength = (0, _convertUnitsLite.convert)(length).from(unit).to(rulerUnit);
43
- var fixedLength = layer.unit === _constants.UNIT_METER || layer.unit === _constants.UNIT_FOOT ? 2 : 0;
44
- var distanceText = (Math.round((0, _convertUnitsLite.convert)(ruLength).from(rulerUnit).to(layer.unit) * 100) / 100).toFixed(fixedLength);
45
- var textLength = (distanceText.length + layer.unit.length) * 8;
36
+ var _getRulerDisplayData = (0, _ruler.getRulerDisplayData)({
37
+ length: length,
38
+ unit: unit,
39
+ rulerUnit: rulerUnit,
40
+ layerUnit: layer.unit
41
+ }),
42
+ distanceText = _getRulerDisplayData.distanceText,
43
+ unitStr = _getRulerDisplayData.unitStr,
44
+ textLength = _getRulerDisplayData.textLength,
45
+ bShowText = _getRulerDisplayData.bShowText,
46
+ bShowLine = _getRulerDisplayData.bShowLine;
46
47
  var textangle = angle + 90;
47
48
  var textRotation = 1;
48
49
  var ay = 2;
@@ -74,47 +75,32 @@ function RulerDist(_ref) {
74
75
  textRotation = 180;
75
76
  ay = 5;
76
77
  }
77
- if (ruLength > 0) {
78
- if (ruLength < 28) {
79
- return /*#__PURE__*/_react["default"].createElement("g", {
80
- transform: transform
81
- }, /*#__PURE__*/_react["default"].createElement("g", null, /*#__PURE__*/_react["default"].createElement("text", {
82
- x: "0",
83
- y: "0",
84
- transform: "translate(".concat(length / 2, ",").concat(ay, ") scale(1, -1) rotate(").concat(textRotation, ")"),
85
- style: STYLE_TEXT
86
- }, distanceText, layer.unit === 'in' ? '"' : layer.unit)));
87
- } else {
88
- return /*#__PURE__*/_react["default"].createElement("g", {
89
- transform: transform
90
- }, /*#__PURE__*/_react["default"].createElement("g", null, /*#__PURE__*/_react["default"].createElement("text", {
91
- x: "0",
92
- y: "0",
93
- transform: "translate(".concat(length / 2, ",").concat(ay, ") scale(1, -1) rotate(").concat(textRotation, ")"),
94
- style: STYLE_TEXT
95
- }, distanceText, layer.unit === 'in' ? '"' : layer.unit)), /*#__PURE__*/_react["default"].createElement("line", {
96
- x1: "2",
97
- y1: "0",
98
- x2: (length - textLength) / 2 < 0 ? 0 : (length - textLength) / 2,
99
- y2: "0",
100
- style: STYLE
101
- }), /*#__PURE__*/_react["default"].createElement("polygon", {
102
- points: "1, 0, 4.5, -2, 4.5, 2 ",
103
- style: STYLE
104
- }), /*#__PURE__*/_react["default"].createElement("line", {
105
- x1: (length + textLength) / 2 < 0 ? 0 : (length + textLength) / 2 < length ? (length + textLength) / 2 : length,
106
- y1: "0",
107
- x2: length,
108
- y2: "0",
109
- style: STYLE
110
- }), /*#__PURE__*/_react["default"].createElement("polygon", {
111
- points: "".concat(length - 1, ", 0, ").concat(length - 4.5, ", 2, ").concat(length - 4.5, ", -2"),
112
- style: STYLE
113
- }));
114
- }
115
- } else {
116
- return null;
117
- }
78
+ return /*#__PURE__*/_react["default"].createElement("g", {
79
+ transform: transform
80
+ }, bShowText && /*#__PURE__*/_react["default"].createElement("g", null, /*#__PURE__*/_react["default"].createElement("text", {
81
+ x: "0",
82
+ y: "0",
83
+ transform: "translate(".concat(length / 2, ",").concat(ay, ") scale(1, -1) rotate(").concat(textRotation, ")"),
84
+ style: STYLE_TEXT
85
+ }, distanceText, unitStr)), bShowLine && /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement("line", {
86
+ x1: "2",
87
+ y1: "0",
88
+ x2: (length - textLength) / 2 < 0 ? 0 : (length - textLength) / 2,
89
+ y2: "0",
90
+ style: STYLE
91
+ }), /*#__PURE__*/_react["default"].createElement("polygon", {
92
+ points: "1, 0, 4.5, -2, 4.5, 2 ",
93
+ style: STYLE
94
+ }), /*#__PURE__*/_react["default"].createElement("line", {
95
+ x1: (length + textLength) / 2 < 0 ? 0 : (length + textLength) / 2 < length ? (length + textLength) / 2 : length,
96
+ y1: "0",
97
+ x2: length,
98
+ y2: "0",
99
+ style: STYLE
100
+ }), /*#__PURE__*/_react["default"].createElement("polygon", {
101
+ points: "".concat(length - 1, ", 0, ").concat(length - 4.5, ", 2, ").concat(length - 4.5, ", -2"),
102
+ style: STYLE
103
+ })));
118
104
  }
119
105
  RulerDist.propTypes = {
120
106
  length: _propTypes["default"].number.isRequired,
@@ -844,11 +844,15 @@ function Viewer2D(_ref, _ref2) {
844
844
  var event = viewerEvent.originalEvent;
845
845
  var parent = document.querySelector('#kitchen-simulator-container');
846
846
  var targetRect = event.target.getBoundingClientRect();
847
- var parentRect = parent.getBoundingClientRect();
848
- var left = targetRect.left - parentRect.left;
849
- var top = targetRect.top - parentRect.top;
850
- left = left - (200 - targetRect.width) / 2;
851
- top = top - (50 - targetRect.height) / 2;
847
+ var left = targetRect.left;
848
+ var top = targetRect.top;
849
+ if (!(0, _helper.isEmpty)(parent)) {
850
+ var parentRect = parent.getBoundingClientRect();
851
+ left = targetRect.left - parentRect.left;
852
+ top = targetRect.top - parentRect.top;
853
+ left = left - (200 - targetRect.width) / 2;
854
+ top = top - (50 - targetRect.height) / 2;
855
+ }
852
856
  if (!mode.includes('ING')) {
853
857
  setToolbar('');
854
858
  }
@@ -940,6 +944,7 @@ function Viewer2D(_ref, _ref2) {
940
944
  // handle action when click elevation about selected line
941
945
  var _mode = _constants.MODE_ELEVATION_VIEW;
942
946
  projectActions.setMode(_mode);
947
+ internalType = constants.INTERNAL_EVENT_TOGGLE_TO_ELEVATION;
943
948
  break;
944
949
  } else {
945
950
  var tlines = [];
@@ -514,19 +514,19 @@ function replaceObject(modifiedPath, layer, planData, actions, sceneData, oldSce
514
514
  if (modifiedPath[keyIndex] == 'rotation') {
515
515
  item3D.rotation.set(0, value * Math.PI / 180 + Math.PI, 0);
516
516
  setTimeout(function () {
517
- getDistances(layer);
517
+ getDistances(layer, item);
518
518
  }, 50);
519
519
  removeSelItemMesh(tmpMoldings, item, planData, mode);
520
520
  } else if (modifiedPath[keyIndex] == 'x') {
521
521
  item3D.position.x = value;
522
522
  setTimeout(function () {
523
- getDistances(layer);
523
+ getDistances(layer, item);
524
524
  }, 50);
525
525
  removeSelItemMesh(tmpMoldings, item, planData, mode);
526
526
  } else if (modifiedPath[keyIndex] == 'y') {
527
527
  item3D.position.z = -value;
528
528
  setTimeout(function () {
529
- getDistances(layer);
529
+ getDistances(layer, item);
530
530
  }, 50);
531
531
  removeSelItemMesh(tmpMoldings, item, planData, mode);
532
532
  } else if (modifiedPath[keyIndex] == 'selected') {
@@ -752,7 +752,7 @@ function replaceObject(modifiedPath, layer, planData, actions, sceneData, oldSce
752
752
  return actions.itemsActions.selectItem(layer.id, modifiedPath[4]);
753
753
  });
754
754
  setTimeout(function () {
755
- getDistances(layer);
755
+ getDistances(layer, item);
756
756
  }, 100);
757
757
  }
758
758
  } else if (modifiedPath[keyIndex] == 'length') {
@@ -880,7 +880,7 @@ function replaceObject(modifiedPath, layer, planData, actions, sceneData, oldSce
880
880
  removeItemWithoutItem(planData, layer.id, modifiedPath[4]);
881
881
  promises.push(addItem(sceneData, planData, layer, modifiedPath[4], catalog, actions.itemsActions, mode, null, rItem));
882
882
  setTimeout(function () {
883
- getDistances(layer);
883
+ getDistances(layer, item);
884
884
  }, 100);
885
885
  }
886
886
  break;
@@ -926,10 +926,169 @@ function replaceObject(modifiedPath, layer, planData, actions, sceneData, oldSce
926
926
  promise: p1
927
927
  };
928
928
  }
929
- function getDistances(layer, isCalcWall) {
929
+ function getDistances(layer, curItem, isCalcWall) {
930
+ // matching fvLine distance with OP
931
+ var pointArray = (0, _geometry2.calcDistancesFromItemToWalls)(curItem, layer).PointArray;
932
+ if ((pointArray === null || pointArray === void 0 ? void 0 : pointArray.length) > 0) {
933
+ var _loop2 = function _loop2() {
934
+ var direction = i === 0 ? 90 : i === 1 ? -90 : i === 2 ? 180 : 0;
935
+ if (fVLine[i].userData) {
936
+ var _pointArray$filter$;
937
+ var opDist = (_pointArray$filter$ = pointArray.filter(function (v) {
938
+ return v[1] === direction;
939
+ })[0]) !== null && _pointArray$filter$ !== void 0 ? _pointArray$filter$ : fVLine[i].userData.distance;
940
+ fVLine[i].userData.opDist = opDist[0];
941
+ }
942
+ };
943
+ for (var i = 0; i < ((_fVLine = fVLine) === null || _fVLine === void 0 ? void 0 : _fVLine.length); i++) {
944
+ var _fVLine;
945
+ _loop2();
946
+ }
947
+ }
930
948
  fVLine.forEach(function (line, index) {
931
- getLineDistance(line, layer, isCalcWall === undefined ? false : isCalcWall, index);
949
+ getLineDistance2(line, layer, (0, _helper.isEmpty)(isCalcWall) ? false : isCalcWall, index);
950
+ });
951
+ }
952
+ function getLineDistance2(obj, layer, isCalcWall, index) {
953
+ var _obj$userData$opDist, _obj$userData, _obj$userData2, _obj$userData$opDist2, _obj$userData3, _obj$userData4;
954
+ if (obj === undefined) return;
955
+ var positionAttribute = obj.geometry.attributes.position;
956
+ if (positionAttribute === undefined) return;
957
+ var wPoint0 = new Three.Vector3().fromBufferAttribute(positionAttribute, 0).applyMatrix4(obj.matrixWorld);
958
+ var wPoint1 = new Three.Vector3().fromBufferAttribute(positionAttribute, 1).applyMatrix4(obj.matrixWorld);
959
+ var raycaster = new Three.Raycaster(wPoint0, new Three.Vector3(wPoint1.x - wPoint0.x, wPoint1.y - wPoint0.y, wPoint1.z - wPoint0.z));
960
+ var rayDirection = raycaster.ray.direction;
961
+ raycaster.camera = new Three.Camera();
962
+ rayDirection.normalize();
963
+ var meshes = [];
964
+ planData.plan.traverse(function (child) {
965
+ if (child.isMesh && child.geometry) {
966
+ meshes.push(child);
967
+ }
932
968
  });
969
+ var dx = wPoint0.x - wPoint1.x;
970
+ var dy = wPoint0.y - wPoint1.y;
971
+ var dz = wPoint0.z - wPoint1.z;
972
+ var length = Math.sqrt(dx * dx + dy * dy + dz * dz);
973
+ var scale = 1;
974
+ var extrudeSettings = {
975
+ steps: 2,
976
+ depth: 0.01,
977
+ bevelEnabled: false
978
+ };
979
+ var w = 0.2;
980
+ var h = w * (Math.sqrt(3) / 2);
981
+ var shape = new Three.Shape();
982
+ shape.moveTo(0, 0);
983
+ shape.lineTo(-w / 4, h / 2);
984
+ shape.lineTo(w / 4, h / 2);
985
+ var geom = new Three.ExtrudeGeometry(shape, extrudeSettings);
986
+ geom.center();
987
+ var opDist = (_obj$userData$opDist = (_obj$userData = obj.userData) === null || _obj$userData === void 0 ? void 0 : _obj$userData.opDist) !== null && _obj$userData$opDist !== void 0 ? _obj$userData$opDist : (_obj$userData2 = obj.userData) === null || _obj$userData2 === void 0 ? void 0 : _obj$userData2.distance;
988
+ scale = opDist / length;
989
+ if (opDist <= 0.1) {
990
+ scale = 0.1 / length;
991
+ }
992
+ obj.userData.distance = (_obj$userData$opDist2 = (_obj$userData3 = obj.userData) === null || _obj$userData3 === void 0 ? void 0 : _obj$userData3.opDist) !== null && _obj$userData$opDist2 !== void 0 ? _obj$userData$opDist2 : (_obj$userData4 = obj.userData) === null || _obj$userData4 === void 0 ? void 0 : _obj$userData4.distance;
993
+ // obj.userData.target = intersects[i].object;
994
+ var originPoint = obj.geometry.attributes.position.array.slice(0, 3);
995
+ var lx = obj.geometry.attributes.position.array[3] - obj.geometry.attributes.position.array[0];
996
+ var ly = obj.geometry.attributes.position.array[4] - obj.geometry.attributes.position.array[1];
997
+ var lz = obj.geometry.attributes.position.array[5] - obj.geometry.attributes.position.array[2];
998
+ var newVec = new Three.Vector3(originPoint[0] + lx * scale, originPoint[1] + ly * scale, originPoint[2] + lz * scale);
999
+ obj.geometry.attributes.position.array[3] = newVec.x;
1000
+ obj.geometry.attributes.position.array[4] = newVec.y;
1001
+ obj.geometry.attributes.position.array[5] = newVec.z;
1002
+ obj.geometry.attributes.position.needsUpdate = true;
1003
+ obj.geometry.computeBoundingSphere();
1004
+ obj.geometry.computeBoundingBox();
1005
+ var dist = (0, _convertUnitsLite.convert)(opDist).from('cm').to('in');
1006
+ if (dist > 3) {
1007
+ var _canvas = getDistanceCanvas(dist, layer);
1008
+ var wid = _canvas.width / window.innerWidth * 30;
1009
+ var hei = _canvas.height / window.innerHeight * 30;
1010
+ var texture = new Three.Texture(_canvas);
1011
+ texture.minFilter = Three.LinearFilter;
1012
+ texture.needsUpdate = true;
1013
+ var geometry = new Three.PlaneGeometry(wid / 5, hei / 5);
1014
+ geometry.computeBoundingBox();
1015
+ var material = new Three.MeshBasicMaterial({
1016
+ map: texture,
1017
+ side: Three.DoubleSide
1018
+ });
1019
+ var textMesh = new Three.Mesh(geometry, material);
1020
+ for (; obj.children.length != 0;) {
1021
+ var temp = obj.children.pop();
1022
+ (0, _threeMemoryCleaner.disposeObject)(temp);
1023
+ }
1024
+ textMesh.rotation.set(Math.PI / 2, Math.PI, 0);
1025
+ // obj.add(textMesh);
1026
+ textMesh.position.set((obj.geometry.attributes.position.array[0] + obj.geometry.attributes.position.array[3]) / 2, 0.01, (obj.geometry.attributes.position.array[2] + obj.geometry.attributes.position.array[5]) / 2);
1027
+ textMesh.name = 'lineText';
1028
+ textMesh.renderOrder = 2;
1029
+ textMesh.material.depthTest = false;
1030
+ textMesh.material.transparent = true;
1031
+ var sprite1 = new Three.Sprite(new Three.SpriteMaterial({
1032
+ map: texture
1033
+ }));
1034
+ sprite1.position.set((obj.geometry.attributes.position.array[0] + obj.geometry.attributes.position.array[3]) / 2, 0.01, (obj.geometry.attributes.position.array[2] + obj.geometry.attributes.position.array[5]) / 2);
1035
+ sprite1.name = 'lineText';
1036
+ sprite1.renderOrder = 2;
1037
+ sprite1.scale.set(0.2, 0.1, 0.2);
1038
+ sprite1.layers.set(1);
1039
+ sprite1.material.depthTest = false;
1040
+ obj.add(sprite1);
1041
+ if (obj.parent != null) {
1042
+ // is not lighting
1043
+ var item3D = obj.parent.parent.parent;
1044
+ var max = item3D.children[0].userData.max;
1045
+ var min = item3D.children[0].userData.min;
1046
+ var objW = (max.x - min.x) / 100,
1047
+ objL = (max.z - min.z) / 100;
1048
+ var triangle = new Three.Mesh(geom, new Three.MeshBasicMaterial({
1049
+ color: _constants.SHADE_DARK_PURPLE_COLOR
1050
+ }));
1051
+ var triangle1 = new Three.Mesh(geom, new Three.MeshBasicMaterial({
1052
+ color: _constants.SHADE_DARK_PURPLE_COLOR
1053
+ }));
1054
+ triangle.position.set((index < 2 ? 0 : Math.sin((index === 2 ? 1 : -1) * Math.PI / 2)) * (obj.geometry.attributes.position.array[0] + h / 4 + (index % 2 === 0 ? 0 : objW)), newVec.y, (index < 2 ? Math.cos(index * Math.PI) : 0) * (obj.geometry.attributes.position.array[2] + h / 4 + (index % 2 === 0 ? 0 : objL)));
1055
+ triangle1.position.set(newVec.x - (index < 2 ? 0 : Math.sin((index === 2 ? 1 : -1) * Math.PI / 2)) * h / 4, newVec.y, newVec.z - (index < 2 ? Math.cos(index * Math.PI) : 0) * h / 4);
1056
+ if (index < 2) {
1057
+ triangle.rotation.x = Math.cos(index * Math.PI) * Math.PI / 2;
1058
+ triangle1.rotation.x = -Math.cos(index * Math.PI) * Math.PI / 2;
1059
+ } else {
1060
+ triangle.rotation.x = -Math.PI / 2;
1061
+ triangle.rotation.z = -(index === 2 ? 1 : -1) * Math.PI / 2;
1062
+ triangle1.rotation.x = Math.PI / 2;
1063
+ triangle1.rotation.z = (index === 2 ? 1 : -1) * Math.PI / 2;
1064
+ }
1065
+ triangle.name = 'lineText';
1066
+ triangle1.name = 'lineText';
1067
+ triangle.renderOrder = 2;
1068
+ triangle1.renderOrder = 2;
1069
+ triangle.material.transparent = true;
1070
+ triangle1.material.transparent = true;
1071
+ triangle.material.depthTest = false;
1072
+ triangle1.material.depthTest = false;
1073
+ obj.add(triangle);
1074
+ obj.add(triangle1);
1075
+ }
1076
+ }
1077
+
1078
+ // if (obj.userData.distance <= 50 && obj.userData.distance >= 0.5) {
1079
+ var real_target = obj.userData.target;
1080
+ for (; ((_real_target = real_target) === null || _real_target === void 0 ? void 0 : _real_target.name) != 'pivot';) {
1081
+ var _real_target, _real_target2, _real_target3;
1082
+ if (((_real_target2 = real_target) === null || _real_target2 === void 0 ? void 0 : _real_target2.parent) == null) break;
1083
+ real_target = (_real_target3 = real_target) === null || _real_target3 === void 0 ? void 0 : _real_target3.parent;
1084
+ }
1085
+ // let item3D = obj.parent.parent.parent;
1086
+ // let origin = obj.geometry.vertices[0].clone().applyMatrix4(obj.matrixWorld);
1087
+ // let target = obj.geometry.vertices[1].clone().applyMatrix4(obj.matrixWorld);
1088
+ // let uVec = new Three.Vector3(target.x - origin.x - 0.2, target.y - origin.y - 0.2, target.z - origin.z - 0.2);
1089
+ obj.visible = true;
1090
+ if (dist < 3) obj.visible = false;
1091
+ return obj;
933
1092
  }
934
1093
  function getLineDistance(obj, layer, isCalcWall, index) {
935
1094
  if (obj === undefined) return;
@@ -988,10 +1147,10 @@ function getLineDistance(obj, layer, isCalcWall, index) {
988
1147
  obj.geometry.computeBoundingBox();
989
1148
  var dist = (0, _convertUnitsLite.convert)(intersects[i].distance).from('cm').to('in');
990
1149
  if (dist > 3) {
991
- var _canvas = getDistanceCanvas(dist, layer);
992
- var wid = _canvas.width / window.innerWidth * 30;
993
- var hei = _canvas.height / window.innerHeight * 30;
994
- var texture = new Three.Texture(_canvas);
1150
+ var _canvas2 = getDistanceCanvas(dist, layer);
1151
+ var wid = _canvas2.width / window.innerWidth * 30;
1152
+ var hei = _canvas2.height / window.innerHeight * 30;
1153
+ var texture = new Three.Texture(_canvas2);
995
1154
  texture.minFilter = Three.LinearFilter;
996
1155
  texture.needsUpdate = true;
997
1156
  var geometry = new Three.PlaneGeometry(wid / 5, hei / 5);
@@ -1020,6 +1179,7 @@ function getLineDistance(obj, layer, isCalcWall, index) {
1020
1179
  sprite1.renderOrder = 2;
1021
1180
  sprite1.scale.set(0.2, 0.1, 0.2);
1022
1181
  sprite1.layers.set(1);
1182
+ sprite1.material.depthTest = false;
1023
1183
  obj.add(sprite1);
1024
1184
  if (obj.parent != null) {
1025
1185
  // is not lighting
@@ -1108,12 +1268,12 @@ function getLineDistance(obj, layer, isCalcWall, index) {
1108
1268
  obj.geometry.attributes.position.array[4] = _newVec.y;
1109
1269
  obj.geometry.attributes.position.array[5] = _newVec.z;
1110
1270
  obj.geometry.attributes.position.needsUpdate = true;
1111
- var _dist = (0, _math.formatNumber)(distance, _constants.DECIMAL_PLACES_2);
1271
+ var _dist = (0, _convertUnitsLite.convert)((0, _math.formatNumber)(distance, _constants.DECIMAL_PLACES_2)).from('cm').to('in');
1112
1272
  if (_dist > 3) {
1113
- var _canvas2 = getDistanceCanvas(_dist, layer);
1114
- var _wid = _canvas2.width / window.innerWidth * 30;
1115
- var _hei = _canvas2.height / window.innerHeight * 30;
1116
- var _texture = new Three.Texture(_canvas2);
1273
+ var _canvas3 = getDistanceCanvas(_dist, layer);
1274
+ var _wid = _canvas3.width / window.innerWidth * 30;
1275
+ var _hei = _canvas3.height / window.innerHeight * 30;
1276
+ var _texture = new Three.Texture(_canvas3);
1117
1277
  _texture.needsUpdate = true;
1118
1278
  var _geometry = new Three.PlaneGeometry(_wid / 2, _hei / 2);
1119
1279
  _geometry.computeBoundingBox();
@@ -1843,7 +2003,7 @@ function addArea(sceneData, planData, layer, areaID, catalog, areaActions, mode)
1843
2003
  layer.lines.forEach(function (data) {
1844
2004
  lines.push(data);
1845
2005
  });
1846
- var _loop2 = function _loop2() {
2006
+ var _loop3 = function _loop3() {
1847
2007
  var data = lines[i];
1848
2008
  var realVec = [];
1849
2009
  data.vertices.forEach(function (vec) {
@@ -1856,7 +2016,7 @@ function addArea(sceneData, planData, layer, areaID, catalog, areaActions, mode)
1856
2016
  }
1857
2017
  };
1858
2018
  for (var i = 0; i < lines.length; i++) {
1859
- if (_loop2()) break;
2019
+ if (_loop3()) break;
1860
2020
  }
1861
2021
  ceil.translateZ((0, _convertUnitsLite.convert)(layer.ceilHeight).from(layer.unit).to(_constants.UNIT_CENTIMETER));
1862
2022
  pivot.name = 'pivot';
@@ -1911,6 +2071,7 @@ function addItem(sceneData, planData, layer, itemID, catalog, itemsActions) {
1911
2071
  if (!catalogElement) catalogElement = catalog.getElement((0, _utils.returnReplaceableDeepSearchType)(item.type));
1912
2072
  if (!catalogElement) return false;
1913
2073
  return catalogElement.render3D(item, layer, sceneData, mode).then(function (item3D) {
2074
+ var _item$properties$getI, _item$properties$getI2, _item$properties$getI3;
1914
2075
  if (item3D instanceof Three.LOD) {
1915
2076
  planData.sceneGraph.LODs[itemID] = item3D;
1916
2077
  }
@@ -1967,7 +2128,7 @@ function addItem(sceneData, planData, layer, itemID, catalog, itemsActions) {
1967
2128
  if (child.type === 'Line' && child.geometry.attributes !== undefined) fVLine.push(child);
1968
2129
  });
1969
2130
  setTimeout(function () {
1970
- getDistances();
2131
+ getDistances(layer, item);
1971
2132
  }, 50);
1972
2133
  }
1973
2134
  applyOpacity(pivot, opacity);
@@ -2026,9 +2187,9 @@ function addItem(sceneData, planData, layer, itemID, catalog, itemsActions) {
2026
2187
  var catid = item.type;
2027
2188
  var cat = catalog.elements[catid];
2028
2189
  if (!cat) cat = catalog.elements[(0, _utils.returnReplaceableDeepSearchType)(catid)];
2029
- var width = (0, _convertUnitsLite.convert)(item.properties.getIn(['width', '_length'])).from('in').to(sceneData.unit);
2030
- var height = (0, _convertUnitsLite.convert)(item.properties.getIn(['height', '_length'])).from('in').to(sceneData.unit);
2031
- var depth = (0, _convertUnitsLite.convert)(item.properties.getIn(['depth', '_length'])).from('in').to(sceneData.unit);
2190
+ var width = (0, _convertUnitsLite.convert)(item.properties.getIn(['width', '_length'])).from((_item$properties$getI = item.properties.getIn(['width', '_unit'])) !== null && _item$properties$getI !== void 0 ? _item$properties$getI : 'in').to(sceneData.unit);
2191
+ var height = (0, _convertUnitsLite.convert)(item.properties.getIn(['height', '_length'])).from((_item$properties$getI2 = item.properties.getIn(['height', '_unit'])) !== null && _item$properties$getI2 !== void 0 ? _item$properties$getI2 : 'in').to(sceneData.unit);
2192
+ var depth = (0, _convertUnitsLite.convert)(item.properties.getIn(['depth', '_length'])).from((_item$properties$getI3 = item.properties.getIn(['depth', '_unit'])) !== null && _item$properties$getI3 !== void 0 ? _item$properties$getI3 : 'in').to(sceneData.unit);
2032
2193
  val.size = {
2033
2194
  width: width,
2034
2195
  height: height,
@@ -2082,7 +2243,7 @@ function addItem(sceneData, planData, layer, itemID, catalog, itemsActions) {
2082
2243
  return itemsActions.selectItem(layer.id, item.id);
2083
2244
  });
2084
2245
  setTimeout(function () {
2085
- return getDistances(layer);
2246
+ return getDistances(layer, item);
2086
2247
  }, 100);
2087
2248
  if (!sceneData.loadFlag && scene_mode == _constants.MODE_DRAWING_ITEM_3D) {
2088
2249
  itemsActions.endLoading();
@@ -2909,19 +3070,23 @@ function createBacksplash(item, layer, planData, scene) {
2909
3070
  var altItems = [],
2910
3071
  flag = false;
2911
3072
  wallItems.map(function (wallItem) {
2912
- var altitude = wallItem.itemInfo.properties.get('altitude').get('_length');
2913
- var altitudeUnit = wallItem.itemInfo.properties.get('altitude').get('_unit') || 'cm';
2914
- altitude = (0, _convertUnitsLite.convert)(altitude).from(altitudeUnit).to('cm');
2915
- altItems.push({
2916
- x: wallItem.pos.x,
2917
- width: wallItem.size.width,
2918
- altitude: altitude
2919
- });
3073
+ var _wallItem$itemInfo, _wallItem$itemInfo2;
3074
+ var altitude = (_wallItem$itemInfo = wallItem.itemInfo) === null || _wallItem$itemInfo === void 0 || (_wallItem$itemInfo = _wallItem$itemInfo.properties) === null || _wallItem$itemInfo === void 0 ? void 0 : _wallItem$itemInfo.get('altitude').get('_length');
3075
+ var altitudeUnit = ((_wallItem$itemInfo2 = wallItem.itemInfo) === null || _wallItem$itemInfo2 === void 0 || (_wallItem$itemInfo2 = _wallItem$itemInfo2.properties) === null || _wallItem$itemInfo2 === void 0 ? void 0 : _wallItem$itemInfo2.get('altitude').get('_unit')) || 'cm';
3076
+ if (!(0, _helper.isEmpty)(altitude) && !(0, _helper.isEmpty)(altitudeUnit)) {
3077
+ altitude = (0, _convertUnitsLite.convert)(altitude).from(altitudeUnit).to('cm');
3078
+ altItems.push({
3079
+ x: wallItem.pos.x,
3080
+ width: wallItem.size.width,
3081
+ altitude: altitude
3082
+ });
3083
+ }
2920
3084
  });
2921
3085
  layer.holes.map(function (hole) {
2922
- var width = hole.properties.getIn(['width', 'length']);
2923
- var altitude = hole.properties.getIn(['altitude', 'length']);
2924
- altItems.push({
3086
+ var _hole$properties, _hole$properties2;
3087
+ var width = (_hole$properties = hole.properties) === null || _hole$properties === void 0 ? void 0 : _hole$properties.getIn(['width', 'length']);
3088
+ var altitude = (_hole$properties2 = hole.properties) === null || _hole$properties2 === void 0 ? void 0 : _hole$properties2.getIn(['altitude', 'length']);
3089
+ if (!(0, _helper.isEmpty)(width) && !(0, _helper.isEmpty)(altitude)) altItems.push({
2925
3090
  x: hole.x,
2926
3091
  width: width,
2927
3092
  altitude: altitude
@@ -3099,23 +3264,18 @@ function _addMGMesh(molding, planData, layer, data, svg_width, svg_height, flag)
3099
3264
  // let layoutType = molding.items[0].layoutpos;
3100
3265
  // let visible = molding.items[0];
3101
3266
  molding.pointGroups.forEach(function (pointGroup) {
3267
+ var _child$width_unit, _child$height_unit, _child$length_unit;
3102
3268
  var geometry = new Three.BufferGeometry();
3103
3269
  var length = data.length; //point array
3104
- var temp_unit = child.height_unit;
3105
- if (temp_unit === 'inch') {
3106
- child.height = (0, _convertUnitsLite.convert)(child.height).from('in').to('cm');
3107
- child.height_unit = 'cm';
3108
- }
3109
- temp_unit = child.width_unit;
3110
- if (temp_unit === 'inch') {
3111
- child.width = (0, _convertUnitsLite.convert)(child.width).from('in').to('cm');
3112
- child.width_unit = 'cm';
3113
- }
3114
- temp_unit = child.length_unit;
3115
- if (temp_unit === 'inch') {
3116
- child.length = (0, _convertUnitsLite.convert)(child.length).from('in').to('cm');
3117
- child.length_unit = 'cm';
3118
- }
3270
+ var widthUnit = child.width_unit === 'inch' ? 'in' : (_child$width_unit = child.width_unit) !== null && _child$width_unit !== void 0 ? _child$width_unit : 'in';
3271
+ var heightUnit = child.height_unit === 'inch' ? 'in' : (_child$height_unit = child.height_unit) !== null && _child$height_unit !== void 0 ? _child$height_unit : 'in';
3272
+ var lengthUnit = child.length_unit === 'inch' ? 'in' : (_child$length_unit = child.length_unit) !== null && _child$length_unit !== void 0 ? _child$length_unit : 'in';
3273
+ child.height = (0, _convertUnitsLite.convert)(child.height).from(heightUnit).to('cm');
3274
+ child.height_unit = 'cm';
3275
+ child.width = (0, _convertUnitsLite.convert)(child.width).from(widthUnit).to('cm');
3276
+ child.width_unit = 'cm';
3277
+ child.length = (0, _convertUnitsLite.convert)(child.length).from(lengthUnit).to('cm');
3278
+ child.length_unit = 'cm';
3119
3279
  geometry.needsUpdate = true;
3120
3280
  geometry = moldingVertices(pointGroup, geometry, data, child, svg_width, svg_height, molding.pointGroups.length);
3121
3281
  var total = geometry.attributes.position.count;
@@ -3425,7 +3585,7 @@ function updateMoldingGroupArray(MGArray, selItem, planData, layer) {
3425
3585
  if ((0, _helper.isEmpty)(filteredNewMGList)) {
3426
3586
  return true;
3427
3587
  }
3428
- var _loop3 = function _loop3() {
3588
+ var _loop4 = function _loop4() {
3429
3589
  var newMG = filteredNewMGList[k];
3430
3590
  if (oldMG.items.some(function (it) {
3431
3591
  return it.id === selItem.id;
@@ -3478,7 +3638,7 @@ function updateMoldingGroupArray(MGArray, selItem, planData, layer) {
3478
3638
  },
3479
3639
  _ret;
3480
3640
  for (var k = 0; k < filteredNewMGList.length; k++) {
3481
- _ret = _loop3();
3641
+ _ret = _loop4();
3482
3642
  if (_ret) return _ret.v;
3483
3643
  }
3484
3644
  return true;
@@ -3647,7 +3807,7 @@ function addWarningBox(itemId, altitude, planData) {
3647
3807
  deleteSpecifiedMeshObjects('WarningBox' + itemId);
3648
3808
  var item3D = planData.sceneGraph.layers[planData.sceneData.selectedLayer].items[itemId];
3649
3809
  if (item3D == undefined) return;
3650
- var altitudeLength = (0, _convertUnitsLite.convert)(altitude).from('in').to('cm');
3810
+ var altitudeLength = altitude;
3651
3811
  var sBounding = item3D.children[0].userData;
3652
3812
  var width = sBounding.max.x - sBounding.min.x;
3653
3813
  var height = sBounding.max.y - sBounding.min.y;