kitchen-simulator 1.1.1-test.6 → 1.1.1-test.60
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/KitchenConfigurator.js +8 -15
- package/es/KitchenConfiguratorApp.js +11 -27
- package/es/actions/holes-actions.js +1 -1
- package/es/actions/items-actions.js +1 -1
- package/es/actions/lines-actions.js +1 -1
- package/es/actions/project-actions.js +1 -1
- package/es/actions/scene-actions.js +1 -1
- package/es/actions/vertices-actions.js +1 -1
- package/es/actions/viewer2d-actions.js +1 -1
- package/es/actions/viewer3d-actions.js +1 -1
- package/es/catalog/areas/area/planner-element.js +10 -7
- package/es/catalog/factories/wall-factory-3d.js +1 -1
- package/es/catalog/holes/export.js +13 -13
- package/es/catalog/lines/wall/planner-element.js +13 -10
- package/es/catalog/properties/property-checkbox.js +63 -18
- package/es/catalog/properties/property-enum.js +51 -9
- package/es/catalog/properties/property-lenght-measure.js +2 -2
- package/es/catalog/properties/property-length-measure.js +58 -9
- package/es/catalog/properties/property-length-measure_hole.js +2 -2
- package/es/catalog/utils/exporter.js +1 -1
- package/es/catalog/utils/item-loader.js +1 -1
- package/es/catalog/utils/mtl-loader.js +3 -2
- package/es/catalog/utils/obj-loader.js +3 -2
- package/es/class/area.js +1 -1
- package/es/class/group.js +3 -3
- package/es/class/hole.js +5 -6
- package/es/class/item.js +8 -10
- package/es/class/layer.js +2 -2
- package/es/class/project.js +4 -4
- package/es/components/content.js +1 -0
- package/es/components/disclaimer/disclaimer.js +66 -86
- package/es/components/style/form-number-input.js +31 -7
- package/es/components/style/form-select.js +56 -8
- package/es/components/style/form-slider.js +22 -6
- package/es/components/style/form-text-input.js +31 -12
- package/es/components/viewer2d/area.js +4 -4
- package/es/components/viewer2d/grids/grid-horizontal-streak.js +0 -1
- package/es/components/viewer2d/grids/grid-streak.js +0 -1
- package/es/components/viewer2d/grids/grid-vertical-streak.js +0 -1
- package/es/components/viewer2d/item.js +3 -5
- package/es/components/viewer2d/line.js +2 -5
- package/es/components/viewer2d/ruler.js +2 -3
- package/es/components/viewer2d/rulerDist.js +1 -1
- package/es/components/viewer2d/scene.js +2 -2
- package/es/components/viewer2d/utils.js +37 -1
- package/es/components/viewer2d/viewer2d.js +10 -4
- package/es/components/viewer3d/libs/mtl-loader.js +2 -2
- package/es/components/viewer3d/libs/obj-loader.js +2 -2
- package/es/components/viewer3d/libs/orbit-controls.js +6 -5
- package/es/components/viewer3d/libs/pointer-lock-controls.js +5 -4
- package/es/components/viewer3d/ruler-utils/itemRect.js +1 -1
- package/es/components/viewer3d/ruler-utils/layer3D.js +2 -2
- package/es/components/viewer3d/ruler-utils/scene3D.js +2 -3
- package/es/components/viewer3d/scene-creator.js +1 -1
- package/es/components/viewer3d/viewer3d.js +12 -13
- package/es/index.js +20 -14
- package/es/models.js +4 -3
- package/es/plugins/keyboard.js +2 -2
- package/es/reducers/holes-reducer.js +1 -1
- package/es/reducers/items-reducer.js +2 -5
- package/es/reducers/lines-reducer.js +1 -1
- package/es/reducers/project-reducer.js +1 -1
- package/es/reducers/reducer.js +2 -2
- package/es/reducers/scene-reducer.js +1 -1
- package/es/reducers/user-reducer.js +1 -2
- package/es/reducers/vertices-reducer.js +1 -1
- package/es/reducers/viewer2d-reducer.js +2 -2
- package/es/reducers/viewer3d-reducer.js +2 -2
- package/es/utils/convert-units-lite.js +29 -0
- package/es/utils/geometry.js +4 -4
- package/es/utils/get-edges-of-subgraphs.js +2 -1
- package/es/utils/graph-cycles.js +2 -3
- package/es/utils/graph.js +2 -1
- package/es/utils/helper.js +1 -69
- package/es/utils/id-broker.js +2 -2
- package/es/utils/molding.js +34 -34
- package/lib/KitchenConfigurator.js +33 -40
- package/lib/KitchenConfiguratorApp.js +34 -49
- package/lib/catalog/areas/area/planner-element.js +12 -8
- package/lib/catalog/factories/wall-factory-3d.js +2 -2
- package/lib/catalog/holes/export.js +13 -13
- package/lib/catalog/lines/wall/planner-element.js +15 -11
- package/lib/catalog/properties/property-checkbox.js +64 -19
- package/lib/catalog/properties/property-enum.js +49 -7
- package/lib/catalog/properties/property-lenght-measure.js +3 -3
- package/lib/catalog/properties/property-length-measure.js +60 -11
- package/lib/catalog/properties/property-length-measure_hole.js +3 -3
- package/lib/catalog/utils/exporter.js +5 -6
- package/lib/catalog/utils/item-loader.js +20 -21
- package/lib/catalog/utils/mtl-loader.js +7 -3
- package/lib/catalog/utils/obj-loader.js +7 -3
- package/lib/class/item.js +13 -16
- package/lib/components/content.js +1 -0
- package/lib/components/disclaimer/disclaimer.js +66 -86
- package/lib/components/style/form-number-input.js +30 -6
- package/lib/components/style/form-select.js +54 -8
- package/lib/components/style/form-slider.js +22 -6
- package/lib/components/style/form-text-input.js +30 -12
- package/lib/components/viewer2d/area.js +5 -5
- package/lib/components/viewer2d/grids/grid-horizontal-streak.js +0 -1
- package/lib/components/viewer2d/grids/grid-streak.js +0 -1
- package/lib/components/viewer2d/grids/grid-vertical-streak.js +0 -1
- package/lib/components/viewer2d/item.js +7 -8
- package/lib/components/viewer2d/line.js +2 -5
- package/lib/components/viewer2d/ruler.js +6 -7
- package/lib/components/viewer2d/rulerDist.js +4 -4
- package/lib/components/viewer2d/scene.js +1 -1
- package/lib/components/viewer2d/utils.js +37 -0
- package/lib/components/viewer2d/viewer2d.js +25 -17
- package/lib/components/viewer3d/libs/mtl-loader.js +6 -2
- package/lib/components/viewer3d/libs/obj-loader.js +6 -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/ruler-utils/itemRect.js +7 -7
- package/lib/components/viewer3d/ruler-utils/layer3D.js +32 -32
- package/lib/components/viewer3d/ruler-utils/scene3D.js +3 -4
- package/lib/components/viewer3d/scene-creator.js +24 -24
- package/lib/components/viewer3d/viewer3d.js +17 -17
- package/lib/index.js +22 -88
- package/lib/models.js +7 -7
- package/lib/reducers/user-reducer.js +0 -1
- package/lib/reducers/viewer2d-reducer.js +3 -4
- package/lib/reducers/viewer3d-reducer.js +3 -4
- package/lib/utils/convert-units-lite.js +35 -0
- package/lib/utils/geometry.js +9 -10
- package/lib/utils/get-edges-of-subgraphs.js +7 -1
- package/lib/utils/graph-cycles.js +9 -9
- package/lib/utils/graph.js +9 -3
- package/lib/utils/helper.js +7 -76
- package/lib/utils/id-broker.js +2 -2
- package/lib/utils/molding.js +52 -52
- package/package.json +34 -70
- 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
|
@@ -6,9 +6,8 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
6
6
|
exports["default"] = Ruler;
|
|
7
7
|
var _react = _interopRequireDefault(require("react"));
|
|
8
8
|
var _propTypes = _interopRequireDefault(require("prop-types"));
|
|
9
|
-
var
|
|
9
|
+
var _convertUnitsLite = require("../../utils/convert-units-lite");
|
|
10
10
|
var _idBroker = _interopRequireDefault(require("../../utils/id-broker"));
|
|
11
|
-
var _export = require("../style/export");
|
|
12
11
|
var _constants = require("../../constants");
|
|
13
12
|
function _interopRequireDefault(e) { return e && e.__esModule ? e : { "default": e }; }
|
|
14
13
|
var STYLE = {
|
|
@@ -43,11 +42,11 @@ function Ruler(_ref) {
|
|
|
43
42
|
if (type === 0) {
|
|
44
43
|
merged = value.merge({
|
|
45
44
|
_length: newLength,
|
|
46
|
-
length: (0,
|
|
45
|
+
length: (0, _convertUnitsLite.convert)(newLength).from(unitInput).to('cm')
|
|
47
46
|
});
|
|
48
47
|
} else {
|
|
49
48
|
merged = value.merge({
|
|
50
|
-
_length: (0,
|
|
49
|
+
_length: (0, _convertUnitsLite.convert)(newLength).from(UNIT_INCH).to(unitInput),
|
|
51
50
|
_unit: unitInput
|
|
52
51
|
});
|
|
53
52
|
}
|
|
@@ -60,8 +59,8 @@ function Ruler(_ref) {
|
|
|
60
59
|
};
|
|
61
60
|
// let _unit = "in";
|
|
62
61
|
// let distanceText = convert(length).from(unit).to(rulerUnit);
|
|
63
|
-
var distanceText = (0,
|
|
64
|
-
var thickness = (0,
|
|
62
|
+
var distanceText = (0, _convertUnitsLite.convert)(length).from(unit).to(rulerUnit).toFixed(0);
|
|
63
|
+
var thickness = (0, _convertUnitsLite.convert)(_constants.LINE_THICKNESS).from(unit).to(rulerUnit).toFixed(0);
|
|
65
64
|
// let _ft_len = convert(_length).from('in').to('ft');
|
|
66
65
|
// let _ft_val = Math.floor(_ft_len); _ft_len -= _ft_val;
|
|
67
66
|
// let _in_val = convert(_ft_len).from('ft').to('in').toFixed(0);
|
|
@@ -86,7 +85,7 @@ function Ruler(_ref) {
|
|
|
86
85
|
transform: "scale(1, -1)",
|
|
87
86
|
style: STYLE_TEXT,
|
|
88
87
|
fill: _constants.TEXT_COLOR_NEUTRAL_7
|
|
89
|
-
}, Math.round((0,
|
|
88
|
+
}, Math.round((0, _convertUnitsLite.convert)(distanceText).from('in').to(layer.unit) * 100) / 100, layer.unit === 'in' ? '"' : layer.unit)), /*#__PURE__*/_react["default"].createElement("line", {
|
|
90
89
|
x1: "0",
|
|
91
90
|
y1: "0",
|
|
92
91
|
x2: (length - textLength) / 2 < 0 ? 0 : (length - textLength) / 2,
|
|
@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
6
6
|
exports["default"] = RulerDist;
|
|
7
7
|
var _react = _interopRequireDefault(require("react"));
|
|
8
8
|
var _propTypes = _interopRequireDefault(require("prop-types"));
|
|
9
|
-
var
|
|
9
|
+
var _convertUnitsLite = require("../../utils/convert-units-lite");
|
|
10
10
|
function _interopRequireDefault(e) { return e && e.__esModule ? e : { "default": e }; }
|
|
11
11
|
var ARROW_STYLE = {
|
|
12
12
|
stroke: '#1183B7',
|
|
@@ -38,7 +38,7 @@ function RulerDist(_ref) {
|
|
|
38
38
|
rotation = _ref.rotation;
|
|
39
39
|
var _unit = 'in';
|
|
40
40
|
// let _length = convert(length).from(unit).to(rulerUnit);
|
|
41
|
-
var distanceText = "".concat((0,
|
|
41
|
+
var distanceText = "".concat((0, _convertUnitsLite.convert)(length).from('cm').to(rulerUnit).toFixed(0));
|
|
42
42
|
var textLength = (distanceText.length + layer.unit.length) * 18;
|
|
43
43
|
var textangle = angle + 90;
|
|
44
44
|
var textRotation = 1;
|
|
@@ -82,7 +82,7 @@ function RulerDist(_ref) {
|
|
|
82
82
|
y: "0",
|
|
83
83
|
transform: "translate(".concat(length / 2, ",").concat(ay, ") scale(1, -1) rotate(").concat(textRotation, ")"),
|
|
84
84
|
style: STYLE_TEXT
|
|
85
|
-
}, Math.round((0,
|
|
85
|
+
}, Math.round((0, _convertUnitsLite.convert)(distanceText).from('in').to(layer.unit) * 100) / 100, layer.unit)), /*#__PURE__*/_react["default"].createElement("circle", {
|
|
86
86
|
cx: "1",
|
|
87
87
|
cy: "0",
|
|
88
88
|
fill: "white",
|
|
@@ -117,7 +117,7 @@ function RulerDist(_ref) {
|
|
|
117
117
|
y: "0",
|
|
118
118
|
transform: "translate(".concat(length / 2, ",").concat(ay, ") scale(1, -1) rotate(").concat(textRotation, ")"),
|
|
119
119
|
style: STYLE_TEXT
|
|
120
|
-
}, Math.round((0,
|
|
120
|
+
}, Math.round((0, _convertUnitsLite.convert)(distanceText).from('in').to(layer.unit) * 100) / 100, layer.unit)), /*#__PURE__*/_react["default"].createElement("circle", {
|
|
121
121
|
cx: "1",
|
|
122
122
|
cy: "0",
|
|
123
123
|
fill: "white",
|
|
@@ -8,7 +8,6 @@ exports["default"] = void 0;
|
|
|
8
8
|
var _react = _interopRequireWildcard(require("react"));
|
|
9
9
|
var _propTypes = _interopRequireDefault(require("prop-types"));
|
|
10
10
|
var _export = require("./export");
|
|
11
|
-
var _utils = require("./utils");
|
|
12
11
|
function _interopRequireDefault(e) { return e && e.__esModule ? e : { "default": e }; }
|
|
13
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); }
|
|
14
13
|
function _slicedToArray(r, e) { return _arrayWithHoles(r) || _iterableToArrayLimit(r, e) || _unsupportedIterableToArray(r, e) || _nonIterableRest(); }
|
|
@@ -51,6 +50,7 @@ var Scene = exports["default"] = /*#__PURE__*/function (_Component) {
|
|
|
51
50
|
if (this.props.scene.hashCode() !== nextProps.scene.hashCode()) {
|
|
52
51
|
scene = nextProps.scene, catalog = nextProps.catalog;
|
|
53
52
|
height = scene.height, layers = scene.layers;
|
|
53
|
+
console.log(layers.toJS());
|
|
54
54
|
selectedLayer = layers.get(scene.selectedLayer);
|
|
55
55
|
msg = '';
|
|
56
56
|
isNotFoundInElements = false;
|
|
@@ -3,6 +3,7 @@
|
|
|
3
3
|
Object.defineProperty(exports, "__esModule", {
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
|
+
exports.areaPolygon = void 0;
|
|
6
7
|
exports.getInstallationSuffix = getInstallationSuffix;
|
|
7
8
|
exports.getToeKickSKU = void 0;
|
|
8
9
|
exports.isEmpty = isEmpty;
|
|
@@ -11,6 +12,12 @@ exports.makeSKUForMagento = makeSKUForMagento;
|
|
|
11
12
|
exports.searchForSkuValue = exports.returnReplaceableDeepSearchType = void 0;
|
|
12
13
|
var _helper = require("../../utils/helper");
|
|
13
14
|
var _constants = require("../../constants");
|
|
15
|
+
function _toConsumableArray(r) { return _arrayWithoutHoles(r) || _iterableToArray(r) || _unsupportedIterableToArray(r) || _nonIterableSpread(); }
|
|
16
|
+
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."); }
|
|
17
|
+
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; } }
|
|
18
|
+
function _iterableToArray(r) { if ("undefined" != typeof Symbol && null != r[Symbol.iterator] || null != r["@@iterator"]) return Array.from(r); }
|
|
19
|
+
function _arrayWithoutHoles(r) { if (Array.isArray(r)) return _arrayLikeToArray(r); }
|
|
20
|
+
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; }
|
|
14
21
|
function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
|
|
15
22
|
var searchForSkuValue = exports.searchForSkuValue = function searchForSkuValue(catalog, selectedLayer, elementType) {
|
|
16
23
|
return new Promise(function (resolve) {
|
|
@@ -170,4 +177,34 @@ var getToeKickSKU = exports.getToeKickSKU = function getToeKickSKU() {
|
|
|
170
177
|
});
|
|
171
178
|
if (!skuData) return false;
|
|
172
179
|
return skuData;
|
|
180
|
+
};
|
|
181
|
+
|
|
182
|
+
// ESM version of "area-polygon" with default + named export.
|
|
183
|
+
// Same behavior: takes an array of [x,y] tuples or {x,y} objects.
|
|
184
|
+
// If `signed` is truthy, returns signed area; otherwise absolute area.
|
|
185
|
+
// Does not mutate the input array.
|
|
186
|
+
|
|
187
|
+
function normalize(point) {
|
|
188
|
+
if (Array.isArray(point)) {
|
|
189
|
+
return {
|
|
190
|
+
x: point[0],
|
|
191
|
+
y: point[1]
|
|
192
|
+
};
|
|
193
|
+
}
|
|
194
|
+
return point;
|
|
195
|
+
}
|
|
196
|
+
var areaPolygon = exports.areaPolygon = function areaPolygon(points) {
|
|
197
|
+
var signed = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
|
|
198
|
+
if (!Array.isArray(points) || points.length < 3) return 0;
|
|
199
|
+
|
|
200
|
+
// normalize and ensure closed ring (without mutating input)
|
|
201
|
+
var pts = points.map(normalize);
|
|
202
|
+
var closed = pts.length > 0 && (pts[0].x !== pts[pts.length - 1].x || pts[0].y !== pts[pts.length - 1].y) ? [].concat(_toConsumableArray(pts), [pts[0]]) : pts;
|
|
203
|
+
var det = 0;
|
|
204
|
+
var l = closed.length - 1; // last index before the duplicated first point
|
|
205
|
+
for (var i = 0; i < l; i++) {
|
|
206
|
+
det += closed[i].x * closed[i + 1].y - closed[i].y * closed[i + 1].x;
|
|
207
|
+
}
|
|
208
|
+
var area = det / 2;
|
|
209
|
+
return signed ? area : Math.abs(area);
|
|
173
210
|
};
|
|
@@ -15,7 +15,7 @@ var SharedStyle = _interopRequireWildcard(require("../../shared-style"));
|
|
|
15
15
|
var _export = require("./export");
|
|
16
16
|
var _export2 = require("../../utils/export");
|
|
17
17
|
var _formNumberInput = _interopRequireDefault(require("../style/form-number-input"));
|
|
18
|
-
var
|
|
18
|
+
var _convertUnitsLite = require("../../utils/convert-units-lite");
|
|
19
19
|
var _immutable = require("immutable");
|
|
20
20
|
var _math = require("../../utils/math");
|
|
21
21
|
var _helper = require("../../utils/helper");
|
|
@@ -36,6 +36,8 @@ function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r)
|
|
|
36
36
|
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; }
|
|
37
37
|
function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t["return"] && (u = t["return"](), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
|
|
38
38
|
function _arrayWithHoles(r) { if (Array.isArray(r)) return r; }
|
|
39
|
+
// variables
|
|
40
|
+
|
|
39
41
|
// variables
|
|
40
42
|
var pinFlag = false;
|
|
41
43
|
var sFlag = false; //for all object move
|
|
@@ -472,7 +474,7 @@ function Viewer2D(_ref, _ref2) {
|
|
|
472
474
|
if (!(item !== null && item !== void 0 && (_item$properties = item.properties) !== null && _item$properties !== void 0 && _item$properties.getIn)) return 0;
|
|
473
475
|
var length = item.properties.getIn([property, '_length']);
|
|
474
476
|
var unit = item.properties.getIn([property, '_unit']);
|
|
475
|
-
return length && unit ? (0,
|
|
477
|
+
return length && unit ? (0, _convertUnitsLite.convert)(length).from(unit).to('cm') : 0;
|
|
476
478
|
};
|
|
477
479
|
var point = function point(x, y) {
|
|
478
480
|
return {
|
|
@@ -923,7 +925,7 @@ function Viewer2D(_ref, _ref2) {
|
|
|
923
925
|
break;
|
|
924
926
|
}
|
|
925
927
|
case 'rulerDist':
|
|
926
|
-
var _length1 = (0,
|
|
928
|
+
var _length1 = (0, _convertUnitsLite.convert)(elementData.length).from(scene.unit).to(scene.rulerUnit);
|
|
927
929
|
var distanceText1 = "".concat((0, _math.formatNumber)(_length1, _constants.DECIMAL_PLACES_2));
|
|
928
930
|
var numberInput1 = /*#__PURE__*/_react["default"].createElement("div", {
|
|
929
931
|
id: "ruler_numberInput",
|
|
@@ -946,7 +948,7 @@ function Viewer2D(_ref, _ref2) {
|
|
|
946
948
|
value: distanceText1,
|
|
947
949
|
onChange: function onChange(event) {
|
|
948
950
|
var value = new _immutable.Map({
|
|
949
|
-
length: (0,
|
|
951
|
+
length: (0, _convertUnitsLite.convert)(event.target.value).from(scene.rulerUnit).to(scene.unit),
|
|
950
952
|
_length: event.target.value,
|
|
951
953
|
_unit: scene.rulerUnit
|
|
952
954
|
});
|
|
@@ -958,7 +960,7 @@ function Viewer2D(_ref, _ref2) {
|
|
|
958
960
|
projectActions.unselectAll();
|
|
959
961
|
break;
|
|
960
962
|
case 'ruler':
|
|
961
|
-
var _length = (0,
|
|
963
|
+
var _length = (0, _convertUnitsLite.convert)(elementData.length).from(scene.unit).to(selectedLayer.unit);
|
|
962
964
|
var numberInput = /*#__PURE__*/_react["default"].createElement("div", {
|
|
963
965
|
id: "ruler_numberInput",
|
|
964
966
|
style: {
|
|
@@ -980,7 +982,7 @@ function Viewer2D(_ref, _ref2) {
|
|
|
980
982
|
value: (0, _math.formatNumber)(_length, _constants.DECIMAL_PLACES_2),
|
|
981
983
|
onChange: function onChange(event) {
|
|
982
984
|
var value = new _immutable.Map({
|
|
983
|
-
length: (0,
|
|
985
|
+
length: (0, _convertUnitsLite.convert)(event.target.value).from(selectedLayer.unit).to(scene.unit),
|
|
984
986
|
_length: event.target.value,
|
|
985
987
|
_unit: selectedLayer.unit
|
|
986
988
|
});
|
|
@@ -992,7 +994,7 @@ function Viewer2D(_ref, _ref2) {
|
|
|
992
994
|
projectActions.unselectAll();
|
|
993
995
|
break;
|
|
994
996
|
case 'twoHoleRuler':
|
|
995
|
-
var _lengthTwoHoleRuler = (0,
|
|
997
|
+
var _lengthTwoHoleRuler = (0, _convertUnitsLite.convert)(elementData.length).from(scene.unit).to(scene.rulerUnit);
|
|
996
998
|
var distanceTextTwoHoleRuler = "".concat((0, _math.formatNumber)(_lengthTwoHoleRuler, _constants.DECIMAL_PLACES_2));
|
|
997
999
|
var numberInputTwoHoleRuler = /*#__PURE__*/_react["default"].createElement("div", {
|
|
998
1000
|
id: "ruler_numberInput",
|
|
@@ -1015,7 +1017,7 @@ function Viewer2D(_ref, _ref2) {
|
|
|
1015
1017
|
value: distanceTextTwoHoleRuler,
|
|
1016
1018
|
onChange: function onChange(event) {
|
|
1017
1019
|
var value = new _immutable.Map({
|
|
1018
|
-
length: (0,
|
|
1020
|
+
length: (0, _convertUnitsLite.convert)(event.target.value / 2).from(scene.rulerUnit).to(scene.unit),
|
|
1019
1021
|
_length: event.target.value / 2,
|
|
1020
1022
|
_unit: scene.rulerUnit
|
|
1021
1023
|
});
|
|
@@ -1027,7 +1029,7 @@ function Viewer2D(_ref, _ref2) {
|
|
|
1027
1029
|
projectActions.unselectAll();
|
|
1028
1030
|
break;
|
|
1029
1031
|
case 'leftHoleRuler':
|
|
1030
|
-
var _lengthLeftHoleRuler = (0,
|
|
1032
|
+
var _lengthLeftHoleRuler = (0, _convertUnitsLite.convert)(elementData.length).from(scene.unit).to(scene.rulerUnit);
|
|
1031
1033
|
var distanceTextLeftHoleRuler = "".concat(_lengthLeftHoleRuler.toFixed(2));
|
|
1032
1034
|
var numberInputLeftHoleRuler = /*#__PURE__*/_react["default"].createElement("div", {
|
|
1033
1035
|
id: "ruler_numberInput",
|
|
@@ -1050,7 +1052,7 @@ function Viewer2D(_ref, _ref2) {
|
|
|
1050
1052
|
value: distanceTextLeftHoleRuler,
|
|
1051
1053
|
onChange: function onChange(event) {
|
|
1052
1054
|
var value = new _immutable.Map({
|
|
1053
|
-
length: (0,
|
|
1055
|
+
length: (0, _convertUnitsLite.convert)(event.target.value).from(scene.rulerUnit).to(scene.unit),
|
|
1054
1056
|
_length: event.target.value,
|
|
1055
1057
|
_unit: scene.rulerUnit
|
|
1056
1058
|
});
|
|
@@ -1062,7 +1064,7 @@ function Viewer2D(_ref, _ref2) {
|
|
|
1062
1064
|
projectActions.unselectAll();
|
|
1063
1065
|
break;
|
|
1064
1066
|
case 'rulerHole':
|
|
1065
|
-
var _lengthRulerHole = (0,
|
|
1067
|
+
var _lengthRulerHole = (0, _convertUnitsLite.convert)(elementData.length).from(scene.unit).to(scene.rulerUnit);
|
|
1066
1068
|
var distanceTextRulerHole = "".concat((0, _math.formatNumber)(_lengthRulerHole, _constants.DECIMAL_PLACES_2));
|
|
1067
1069
|
var numberInputRulerHole = /*#__PURE__*/_react["default"].createElement("div", {
|
|
1068
1070
|
id: "ruler_numberInput",
|
|
@@ -1085,7 +1087,7 @@ function Viewer2D(_ref, _ref2) {
|
|
|
1085
1087
|
value: distanceTextRulerHole,
|
|
1086
1088
|
onChange: function onChange(event) {
|
|
1087
1089
|
var value = new _immutable.Map({
|
|
1088
|
-
length: (0,
|
|
1090
|
+
length: (0, _convertUnitsLite.convert)(event.target.value).from(scene.rulerUnit).to(scene.unit),
|
|
1089
1091
|
_length: event.target.value,
|
|
1090
1092
|
_unit: scene.rulerUnit
|
|
1091
1093
|
});
|
|
@@ -1097,7 +1099,7 @@ function Viewer2D(_ref, _ref2) {
|
|
|
1097
1099
|
projectActions.unselectAll();
|
|
1098
1100
|
break;
|
|
1099
1101
|
case 'rightHoleRuler':
|
|
1100
|
-
var _lengthRightHoleRuler = (0,
|
|
1102
|
+
var _lengthRightHoleRuler = (0, _convertUnitsLite.convert)(elementData.length).from(scene.unit).to(scene.rulerUnit);
|
|
1101
1103
|
var distanceTextRightHoleRuler = "".concat(_lengthRightHoleRuler.toFixed(2));
|
|
1102
1104
|
var numberInputRightHoleRuler = /*#__PURE__*/_react["default"].createElement("div", {
|
|
1103
1105
|
id: "ruler_numberInput",
|
|
@@ -1120,7 +1122,7 @@ function Viewer2D(_ref, _ref2) {
|
|
|
1120
1122
|
value: distanceTextRightHoleRuler,
|
|
1121
1123
|
onChange: function onChange(event) {
|
|
1122
1124
|
var value = new _immutable.Map({
|
|
1123
|
-
length: (0,
|
|
1125
|
+
length: (0, _convertUnitsLite.convert)(event.target.value).from(scene.rulerUnit).to(scene.unit),
|
|
1124
1126
|
_length: event.target.value,
|
|
1125
1127
|
_unit: scene.rulerUnit
|
|
1126
1128
|
});
|
|
@@ -1149,7 +1151,7 @@ function Viewer2D(_ref, _ref2) {
|
|
|
1149
1151
|
value: _length2,
|
|
1150
1152
|
onChange: function onChange(event) {
|
|
1151
1153
|
var value = new _immutable.Map({
|
|
1152
|
-
length: (0,
|
|
1154
|
+
length: (0, _convertUnitsLite.convert)(event.target.value).from(scene.rulerUnit).to(scene.unit),
|
|
1153
1155
|
_length: event.target.value,
|
|
1154
1156
|
_unit: scene.rulerUnit
|
|
1155
1157
|
});
|
|
@@ -1283,6 +1285,8 @@ function Viewer2D(_ref, _ref2) {
|
|
|
1283
1285
|
var sceneZoom = state.zoom || 1;
|
|
1284
1286
|
var rulerXElements = Math.ceil(sceneWidth / rulerUnitPixelSize) + 1;
|
|
1285
1287
|
var rulerYElements = Math.ceil(sceneHeight / rulerUnitPixelSize) + 1;
|
|
1288
|
+
console.log('---render viewer2d');
|
|
1289
|
+
console.log(viewer2D.isEmpty());
|
|
1286
1290
|
return /*#__PURE__*/_react["default"].createElement("div", null, rulerEdit, /*#__PURE__*/_react["default"].createElement("div", {
|
|
1287
1291
|
style: {
|
|
1288
1292
|
margin: 0,
|
|
@@ -1353,8 +1357,12 @@ function Viewer2D(_ref, _ref2) {
|
|
|
1353
1357
|
onMouseDown: onMouseDown,
|
|
1354
1358
|
onMouseMove: onMouseMove,
|
|
1355
1359
|
onMouseUp: onMouseUp,
|
|
1356
|
-
|
|
1357
|
-
|
|
1360
|
+
miniatureProps: {
|
|
1361
|
+
position: 'none'
|
|
1362
|
+
},
|
|
1363
|
+
toolbarProps: {
|
|
1364
|
+
position: 'right'
|
|
1365
|
+
},
|
|
1358
1366
|
detectPinchGesture: false,
|
|
1359
1367
|
disableDoubleClickZoomWithToolAuto: true,
|
|
1360
1368
|
ref: Viewer
|
|
@@ -1,12 +1,16 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
|
+
Object.defineProperty(exports, "__esModule", {
|
|
4
|
+
value: true
|
|
5
|
+
});
|
|
6
|
+
exports["default"] = void 0;
|
|
3
7
|
/**
|
|
4
8
|
* Loads a Wavefront .mtl file specifying materials
|
|
5
9
|
*
|
|
6
10
|
* @author angelxuanchang
|
|
7
11
|
*/
|
|
8
12
|
|
|
9
|
-
var THREE = window.THREE
|
|
13
|
+
var THREE = window.THREE;
|
|
10
14
|
var MTLLoader;
|
|
11
15
|
MTLLoader = function MTLLoader(manager) {
|
|
12
16
|
this.manager = manager !== undefined ? manager : THREE.DefaultLoadingManager;
|
|
@@ -356,4 +360,4 @@ MTLLoader.MaterialCreator.prototype = {
|
|
|
356
360
|
return texture;
|
|
357
361
|
}
|
|
358
362
|
};
|
|
359
|
-
|
|
363
|
+
var _default = exports["default"] = MTLLoader;
|
|
@@ -1,10 +1,14 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
|
+
Object.defineProperty(exports, "__esModule", {
|
|
4
|
+
value: true
|
|
5
|
+
});
|
|
6
|
+
exports["default"] = void 0;
|
|
3
7
|
/**
|
|
4
8
|
* @author mrdoob / http://mrdoob.com/
|
|
5
9
|
*/
|
|
6
10
|
|
|
7
|
-
var THREE = window.THREE
|
|
11
|
+
var THREE = window.THREE;
|
|
8
12
|
var OBJLoader;
|
|
9
13
|
OBJLoader = function OBJLoader(manager) {
|
|
10
14
|
this.manager = manager !== undefined ? manager : THREE.DefaultLoadingManager;
|
|
@@ -461,4 +465,4 @@ OBJLoader.prototype = {
|
|
|
461
465
|
return container;
|
|
462
466
|
}
|
|
463
467
|
};
|
|
464
|
-
|
|
468
|
+
var _default = exports["default"] = OBJLoader;
|
|
@@ -1,5 +1,10 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
|
+
Object.defineProperty(exports, "__esModule", {
|
|
4
|
+
value: true
|
|
5
|
+
});
|
|
6
|
+
exports.OrbitControls = OrbitControls;
|
|
7
|
+
exports["default"] = void 0;
|
|
3
8
|
/**
|
|
4
9
|
* @author qiao / https://github.com/qiao
|
|
5
10
|
* @author mrdoob / http://mrdoob.com
|
|
@@ -15,9 +20,8 @@
|
|
|
15
20
|
// Zoom - middle mouse, or mousewheel / touch: two finger spread or squish
|
|
16
21
|
// Pan - right mouse, or arrow keys / touch: three finter swipe
|
|
17
22
|
|
|
18
|
-
var THREE = window.THREE
|
|
19
|
-
|
|
20
|
-
module.exports = OrbitControls = function OrbitControls(object, domElement) {
|
|
23
|
+
var THREE = window.THREE;
|
|
24
|
+
function OrbitControls(object, domElement) {
|
|
21
25
|
this.object = object;
|
|
22
26
|
this.domElement = domElement !== undefined ? domElement : document;
|
|
23
27
|
|
|
@@ -625,7 +629,7 @@ module.exports = OrbitControls = function OrbitControls(object, domElement) {
|
|
|
625
629
|
// force an update at start
|
|
626
630
|
|
|
627
631
|
this.update();
|
|
628
|
-
}
|
|
632
|
+
}
|
|
629
633
|
OrbitControls.prototype = Object.create(THREE.EventDispatcher.prototype);
|
|
630
634
|
OrbitControls.prototype.constructor = OrbitControls;
|
|
631
635
|
Object.defineProperties(OrbitControls.prototype, {
|
|
@@ -697,4 +701,5 @@ Object.defineProperties(OrbitControls.prototype, {
|
|
|
697
701
|
this.dampingFactor = value;
|
|
698
702
|
}
|
|
699
703
|
}
|
|
700
|
-
});
|
|
704
|
+
});
|
|
705
|
+
var _default = exports["default"] = OrbitControls;
|
|
@@ -1,12 +1,16 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
|
+
Object.defineProperty(exports, "__esModule", {
|
|
4
|
+
value: true
|
|
5
|
+
});
|
|
6
|
+
exports.PointerLockControls = PointerLockControls;
|
|
7
|
+
exports["default"] = void 0;
|
|
3
8
|
/**
|
|
4
9
|
* @author mrdoob / http://mrdoob.com/
|
|
5
10
|
*/
|
|
6
11
|
|
|
7
|
-
var THREE = window.THREE
|
|
8
|
-
|
|
9
|
-
module.exports = PointerLockControls = function PointerLockControls(camera) {
|
|
12
|
+
var THREE = window.THREE;
|
|
13
|
+
function PointerLockControls(camera) {
|
|
10
14
|
var scope = this;
|
|
11
15
|
camera.rotation.set(0, 0, 0);
|
|
12
16
|
var pitchObject = new THREE.Object3D();
|
|
@@ -44,4 +48,5 @@ module.exports = PointerLockControls = function PointerLockControls(camera) {
|
|
|
44
48
|
return v;
|
|
45
49
|
};
|
|
46
50
|
}();
|
|
47
|
-
}
|
|
51
|
+
}
|
|
52
|
+
var _default = exports["default"] = PointerLockControls;
|
|
@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
6
6
|
exports["default"] = ItemRect;
|
|
7
7
|
var _react = _interopRequireDefault(require("react"));
|
|
8
8
|
var _constants = require("../../../constants");
|
|
9
|
-
var
|
|
9
|
+
var _convertUnitsLite = require("../../../utils/convert-units-lite");
|
|
10
10
|
function _interopRequireDefault(e) { return e && e.__esModule ? e : { "default": e }; }
|
|
11
11
|
function ItemRect(_ref) {
|
|
12
12
|
var scene = _ref.scene,
|
|
@@ -23,19 +23,19 @@ function ItemRect(_ref) {
|
|
|
23
23
|
y0 = v0.y;
|
|
24
24
|
var x1 = v1.x,
|
|
25
25
|
y1 = v1.y;
|
|
26
|
-
var translateY = frontRect.height / 2 - (0,
|
|
26
|
+
var translateY = frontRect.height / 2 - (0, _convertUnitsLite.convert)(Math.abs(calcrect.itemInfo.properties.altitude._length)).from(calcrect.itemInfo.properties.altitude._unit).to(layer.unit) * scale;
|
|
27
27
|
var translateX = -frontRect.width / 2;
|
|
28
|
-
var itemWidth = (0,
|
|
29
|
-
var itemDepth = (0,
|
|
30
|
-
var itemHeight = (0,
|
|
28
|
+
var itemWidth = (0, _convertUnitsLite.convert)(calcrect.size.width).from(scene.unit).to(layer.unit) * scale;
|
|
29
|
+
var itemDepth = (0, _convertUnitsLite.convert)(calcrect.size.depth).from(scene.unit).to(layer.unit) * scale;
|
|
30
|
+
var itemHeight = (0, _convertUnitsLite.convert)(calcrect.size.height).from(scene.unit).to(layer.unit) * scale;
|
|
31
31
|
switch (mode) {
|
|
32
32
|
case _constants.MODE_FRONT_ELEVATION_VIEW:
|
|
33
33
|
case _constants.MODE_BACK_ELEVATION_VIEW:
|
|
34
|
-
translateX += (0,
|
|
34
|
+
translateX += (0, _convertUnitsLite.convert)(Math.abs(rect[3].x - x0)).from(scene.unit).to(layer.unit) * scale;
|
|
35
35
|
break;
|
|
36
36
|
case _constants.MODE_RIGHT_ELEVATION_VIEW:
|
|
37
37
|
case _constants.MODE_LEFT_ELEVATION_VIEW:
|
|
38
|
-
translateX += (0,
|
|
38
|
+
translateX += (0, _convertUnitsLite.convert)(Math.abs(rect[3].y - y1)).from(scene.unit).to(layer.unit) * scale;
|
|
39
39
|
break;
|
|
40
40
|
}
|
|
41
41
|
var dimension;
|