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
package/es/models.js
CHANGED
|
@@ -14,11 +14,11 @@ function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.
|
|
|
14
14
|
function _getPrototypeOf(t) { return _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function (t) { return t.__proto__ || Object.getPrototypeOf(t); }, _getPrototypeOf(t); }
|
|
15
15
|
function _inherits(t, e) { if ("function" != typeof e && null !== e) throw new TypeError("Super expression must either be null or a function"); t.prototype = Object.create(e && e.prototype, { constructor: { value: t, writable: !0, configurable: !0 } }), Object.defineProperty(t, "prototype", { writable: !1 }), e && _setPrototypeOf(t, e); }
|
|
16
16
|
function _setPrototypeOf(t, e) { return _setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function (t, e) { return t.__proto__ = e, t; }, _setPrototypeOf(t, e); }
|
|
17
|
-
import {
|
|
17
|
+
import { fromJS, List, Map, Record } from 'immutable';
|
|
18
18
|
import { MODE_IDLE, UNIT_INCH } from "./constants";
|
|
19
19
|
import { SNAP_MASK } from "./utils/snap";
|
|
20
20
|
import { isEmpty } from "./utils/helper";
|
|
21
|
-
import convert from
|
|
21
|
+
import { convert } from "./utils/convert-units-lite";
|
|
22
22
|
var safeLoadMapList = function safeLoadMapList(mapList, Model, defaultMap) {
|
|
23
23
|
return mapList ? new Map(mapList).map(function (m) {
|
|
24
24
|
return new Model(m);
|
|
@@ -507,4 +507,5 @@ export var State = /*#__PURE__*/function (_Record12) {
|
|
|
507
507
|
userId: 0,
|
|
508
508
|
isHelp: false,
|
|
509
509
|
isCabinetDrawing: false
|
|
510
|
-
}, 'State'));
|
|
510
|
+
}, 'State'));
|
|
511
|
+
export default State;
|
package/es/plugins/keyboard.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import {
|
|
1
|
+
import { KEYBOARD_BUTTON_CODE, MODE_3D_FIRST_PERSON, MODE_3D_VIEW, MODE_DRAGGING_ITEM_3D, MODE_DRAWING_ITEM, MODE_DRAWING_ITEM_3D, MODE_IDLE, MODE_IDLE_3D, MODE_ROTATING_ITEM_3D, MODE_SNAPPING } from "../constants";
|
|
2
|
+
import { copyProperties, pasteProperties, recreate, redo, remove, rollback, shift2doff, shift2don, toggleSnap, uncreate, undo } from "../actions/project-actions";
|
|
3
3
|
export default function keyboard() {
|
|
4
4
|
return function (store, stateExtractor) {
|
|
5
5
|
window.addEventListener('keydown', function (event) {
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { Hole } from "../class/export";
|
|
2
2
|
import { history } from "../utils/export";
|
|
3
|
-
import {
|
|
3
|
+
import { BEGIN_DRAGGING_HOLE, BEGIN_DRAGGING_HOLE_3D, END_CREATING_HOLE, END_DRAGGING_HOLE, END_DRAGGING_HOLE_3D, END_DRAWING_HOLE, END_DRAWING_HOLE_3D, SELECT_HOLE, SELECT_TOOL_DRAWING_HOLE, SELECT_TOOL_DRAWING_HOLE_3D, UPDATE_DRAGGING_HOLE, UPDATE_DRAGGING_HOLE_CHANGED, UPDATE_DRAGGING_HOLE_RULER_CHANGED, UPDATE_DRAWING_HOLE, UPDATE_DRAWING_HOLE_3D, UPDATE_POPUP_OPEN } from "../constants";
|
|
4
4
|
export default function (state, action) {
|
|
5
5
|
switch (action.type) {
|
|
6
6
|
case UPDATE_DRAGGING_HOLE_RULER_CHANGED:
|
|
@@ -1,9 +1,6 @@
|
|
|
1
|
-
import { Item
|
|
1
|
+
import { Item } from "../class/export";
|
|
2
2
|
import { history } from "../utils/export";
|
|
3
|
-
import {
|
|
4
|
-
// SET_MOVE_STATUS,
|
|
5
|
-
// SET_ROTATE_STATUS
|
|
6
|
-
} from "../constants";
|
|
3
|
+
import { ANIMATE_OBJECT, BEGIN_DRAGGING_ITEM, BEGIN_DRAGGING_ITEM_3D, BEGIN_ROTATING_ITEM, BEGIN_ROTATING_ITEM_3D, DUPLICATE_SELECTED, EDIT_WIDTH, END_CREATING_CABINET, END_DRAGGING_ITEM, END_DRAGGING_ITEM_3D, END_DRAWING_ITEM, END_LOADING, END_ROTATING_ITEM, END_ROTATING_ITEM_3D, ITEM_MOVE_UP, REMOVE_REPLACE_SUBMODULE, REPLACE_ITEM, REPLACE_SUBMODULE, SELECT_ITEM, SELECT_TOOL_DRAWING_ITEM, SELECT_TOOL_DRAWING_ITEM_3D, SET_APPLIANCE_MATERIAL, SET_BACKSPLASH, SET_BACKSPLASH_VISIBLE, SET_COUNTER_TOP, SET_DOOR_HANDLE, SET_DOOR_STYLE, SET_HANDLE_MATERIAL, SET_INITIAL_DOOR_STYLE, SET_MODELLING, SET_MOLDING, SET_WALL_COLOR, STORE_DIST_ARRAY, TOGGLE_LOADING_CABINET, UPDATE_DRAGGING_ITEM, UPDATE_DRAGGING_ITEM_3DX, UPDATE_DRAGGING_ITEM_3DY, UPDATE_DRAGGING_ITEM_CHANGED, UPDATE_DRAWING_ITEM, UPDATE_ITEM_POSITION, UPDATE_MOLDING, UPDATE_POPUP_OPEN, UPDATE_ROTATING_ITEM, UPDATE_ROTATING_ITEM_CHANGED, VALIDATE_ITEM_POSTIONS } from "../constants";
|
|
7
4
|
export default function (state, action) {
|
|
8
5
|
switch (action.type) {
|
|
9
6
|
case STORE_DIST_ARRAY:
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { Line } from "../class/export";
|
|
2
2
|
import { history } from "../utils/export";
|
|
3
|
-
import {
|
|
3
|
+
import { BEGIN_DRAGGING_LINE, BEGIN_DRAWING_LINE, END_DRAGGING_LINE, END_DRAWING_LINE, SELECT_LINE, SELECT_TOOL_DRAWING_LINE, SET_RELATED_LINE, STOP_DRAWING_LINE, UPDATE_DRAGGING_LINE, UPDATE_DRAWING_LINE } from "../constants";
|
|
4
4
|
export default function (state, action) {
|
|
5
5
|
switch (action.type) {
|
|
6
6
|
case SELECT_TOOL_DRAWING_LINE:
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { history } from "../utils/export";
|
|
2
|
-
import {
|
|
2
|
+
import { ADD_CIRCULAR_GUIDE, ADD_HORIZONTAL_GUIDE, ADD_VERTICAL_GUIDE, ALTERATE_STATE, CHANGE_CATALOG_PAGE, COPY_PROPERTIES, GO_BACK_TO_CATALOG_PAGE, INIT_CATALOG, LOAD_PROJECT, MODE_DRAWING_LINE, MODE_IDLE, NEW_PROJECT, OPEN_CATALOG, OPEN_PROJECT_CONFIGURATOR, PASTE_PROPERTIES, PROJECT_RE_NAME, PUSH_LAST_SELECTED_CATALOG_ELEMENT_TO_HISTORY, RECREATE, REDO, REMOVE, REMOVE_CIRCULAR_GUIDE, REMOVE_DRAWING_SUPPORT, REMOVE_HORIZONTAL_GUIDE, REMOVE_VERTICAL_GUIDE, ROLLBACK, SELECT_ALL, SELECT_TOOL_EDIT, SET_HOLES_ATTRIBUTES, SET_IS_CABINET_DRAWING, SET_IS_HELP, SET_ITEMS_ATTRIBUTES, SET_LINES_ATTRIBUTES, SET_MODE, SET_PROJECT_ID, SET_PROJECT_PROPERTIES, SET_PROPERTIES, SET_STATE_PROPERTIES, SHIFT2DOFF, SHIFT2DON, THROW_ERROR, THROW_WARNING, TOGGLE_SNAP, UNCREATE, UNDO, UNSELECT_ALL, UPDATE_MOUSE_COORDS, UPDATE_ZOOM_SCALE } from "../constants";
|
|
3
3
|
import { Project } from "../class/export";
|
|
4
4
|
export default function (state, action) {
|
|
5
5
|
switch (action.type) {
|
package/es/reducers/reducer.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import { KitchenConfiguratorAreasReducer, KitchenConfiguratorHolesReducer, KitchenConfiguratorItemsReducer, KitchenConfiguratorLinesReducer,
|
|
1
|
+
import { AREA_ACTIONS, GROUP_ACTIONS, HOLE_ACTIONS, ITEMS_ACTIONS, LINE_ACTIONS, PROJECT_ACTIONS, SCENE_ACTIONS, USER_ACTIONS, VERTEX_ACTIONS, VIEWER2D_ACTIONS, VIEWER3D_ACTIONS } from "../constants";
|
|
2
|
+
import { KitchenConfiguratorAreasReducer, KitchenConfiguratorGroupsReducer, KitchenConfiguratorHolesReducer, KitchenConfiguratorItemsReducer, KitchenConfiguratorLinesReducer, KitchenConfiguratorProjectReducer, KitchenConfiguratorSceneReducer, KitchenConfiguratorUserReducer, KitchenConfiguratorVerticesReducer, KitchenConfiguratorViewer2dReducer, KitchenConfiguratorViewer3dReducer } from "./export";
|
|
3
3
|
import { State } from "../models";
|
|
4
4
|
export var initialState = new State();
|
|
5
5
|
export default function appReducer(state, action) {
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { Layer } from "../class/export";
|
|
2
2
|
import { history } from "../utils/export";
|
|
3
|
-
import { ADD_LAYER, SELECT_LAYER, SET_LAYER_PROPERTIES,
|
|
3
|
+
import { ADD_LAYER, REMOVE_LAYER, SELECT_LAYER, SET_LAYER_PROPERTIES, UPDATE_MOVING_STATE } from "../constants";
|
|
4
4
|
export default function (state, action) {
|
|
5
5
|
var saveHistory = function saveHistory() {
|
|
6
6
|
return state = state.merge({
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { BEGIN_DRAGGING_VERTEX,
|
|
1
|
+
import { BEGIN_DRAGGING_VERTEX, END_DRAGGING_VERTEX, UPDATE_DRAGGING_VERTEX } from "../constants";
|
|
2
2
|
import { history } from "../utils/export";
|
|
3
3
|
import { Vertex } from "../class/export";
|
|
4
4
|
export default function (state, action) {
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import convert from
|
|
1
|
+
import { CHANGE_BASE_CABINET_MEASURE, CHANGE_WALL_CABINET_MEASURE, CHANGE_WALL_LENGTH_MEASURE, CHANGE_WINDOW_DOOR_MEASURE, MODE_2D_PAN, MODE_2D_ZOOM_IN, MODE_2D_ZOOM_OUT, SELECT_TOOL_PAN, SELECT_TOOL_ZOOM_IN, SELECT_TOOL_ZOOM_OUT, UPDATE_2D_CAMERA, UPDATE_CEIL_HEIGHT, UPDATE_CEIL_HEIGHT_UNIT } from "../constants";
|
|
2
|
+
import { convert } from "../utils/convert-units-lite";
|
|
3
3
|
export default function (state, action) {
|
|
4
4
|
var _state = state,
|
|
5
5
|
scene = _state.scene;
|
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
import { MODE_3D_VIEW,
|
|
1
|
+
import { MODE_3D_FIRST_PERSON, MODE_3D_VIEW, SELECT_TOOL_3D_FIRST_PERSON, SELECT_TOOL_3D_VIEW, UPDATE_3D_CEIL_HEIGHT, UPDATE_3D_CEIL_HEIGHT_UNIT } from "../constants";
|
|
2
2
|
import { Project } from "../class/export";
|
|
3
3
|
import { history } from "../utils/export";
|
|
4
|
-
import convert from
|
|
4
|
+
import { convert } from "../utils/convert-units-lite";
|
|
5
5
|
export default function (state, action) {
|
|
6
6
|
state = state.merge({
|
|
7
7
|
sceneHistory: history.historyPush(state.sceneHistory, state.scene)
|
|
@@ -0,0 +1,29 @@
|
|
|
1
|
+
var lengthFactors = {
|
|
2
|
+
m: 1,
|
|
3
|
+
cm: 100,
|
|
4
|
+
mm: 1000,
|
|
5
|
+
"in": 39.3701,
|
|
6
|
+
ft: 3.28084,
|
|
7
|
+
m2: 1,
|
|
8
|
+
cm2: 10000,
|
|
9
|
+
// (100^2)
|
|
10
|
+
mm2: 1000000,
|
|
11
|
+
// (1000^2)
|
|
12
|
+
in2: 1550.0031,
|
|
13
|
+
// (39.3701^2)
|
|
14
|
+
ft2: 10.7639 // (3.28084^2)
|
|
15
|
+
};
|
|
16
|
+
export function convert(value) {
|
|
17
|
+
return {
|
|
18
|
+
from: function from(fromUnit) {
|
|
19
|
+
return {
|
|
20
|
+
to: function to(toUnit) {
|
|
21
|
+
if (!(fromUnit in lengthFactors) || !(toUnit in lengthFactors)) {
|
|
22
|
+
throw new Error("Unsupported unit conversion: ".concat(fromUnit, " \u2192 ").concat(toUnit));
|
|
23
|
+
}
|
|
24
|
+
return value / lengthFactors[fromUnit] * lengthFactors[toUnit];
|
|
25
|
+
}
|
|
26
|
+
};
|
|
27
|
+
}
|
|
28
|
+
};
|
|
29
|
+
}
|
package/es/utils/geometry.js
CHANGED
|
@@ -22,9 +22,9 @@ function _arrayWithHoles(r) { if (Array.isArray(r)) return r; }
|
|
|
22
22
|
* @param {number} y1 Vertex 1 y
|
|
23
23
|
* @return {number}
|
|
24
24
|
*/
|
|
25
|
-
import {
|
|
26
|
-
import { BASE_CABINET_LAYOUTPOS, EPSILON, LINE_THICKNESS, MEPSILON, OVERLAP_INCLUDED, OVERLAP_LINK, OVERLAP_NONE, OVERLAP_SAME, OVERLAP_SOME,
|
|
27
|
-
import convert from
|
|
25
|
+
import { fAbs, toFixedFloat } from "./math.js";
|
|
26
|
+
import { BASE_CABINET_LAYOUTPOS, EPSILON, LINE_THICKNESS, MEPSILON, OVERLAP_INCLUDED, OVERLAP_LINK, OVERLAP_NONE, OVERLAP_SAME, OVERLAP_SOME, UNIT_ANGLE, WALL_CABINET_LAYOUTPOS } from "../constants";
|
|
27
|
+
import { convert } from "./convert-units-lite";
|
|
28
28
|
import * as Three from 'three';
|
|
29
29
|
import { returnReplaceableDeepSearchType } from "../components/viewer2d/utils.js";
|
|
30
30
|
import { isEmpty } from "./helper.js";
|
|
@@ -2042,7 +2042,7 @@ export function isRightWall(v0, v1) {
|
|
|
2042
2042
|
* OVERLAP_LINK: two lines are linked at the common point, so they can be merged to one line
|
|
2043
2043
|
* OVERLAP_INCLUDED: destLine includes srcLine
|
|
2044
2044
|
* OVERLAP_SOME: two lines are overlapped with some common range, then returns the trimmed segments of srcLine
|
|
2045
|
-
*
|
|
2045
|
+
*
|
|
2046
2046
|
* //////// test - start /////////////
|
|
2047
2047
|
const p1 = { x1: 1413.1313131313132, y1: 1044.949494949495 };
|
|
2048
2048
|
const p2 = { x1: 1476.2626262626263, y1: 1108.0808080808079 };
|
package/es/utils/graph-cycles.js
CHANGED
|
@@ -200,9 +200,8 @@ function find_inner_cycles(V, EV) {
|
|
|
200
200
|
ev_mapping: cycles.ev_mapping
|
|
201
201
|
};
|
|
202
202
|
}
|
|
203
|
-
|
|
204
|
-
|
|
205
|
-
module.exports = find_inner_cycles;
|
|
203
|
+
export default find_inner_cycles;
|
|
204
|
+
export { find_inner_cycles, find_cycles, compute_ev_mapping, compute_incidences };
|
|
206
205
|
|
|
207
206
|
/**
|
|
208
207
|
* DATA
|
package/es/utils/graph.js
CHANGED
package/es/utils/helper.js
CHANGED
|
@@ -8,80 +8,12 @@ import { HDRCubeTextureLoader } from 'three/examples/jsm/loaders/HDRCubeTextureL
|
|
|
8
8
|
import { ANIMATE_OBJECT_OPEN_DOOR_ROTATION_UNIT, ANIMATE_STEP_MAX, DECIMAL_PLACES_2, HDR_URLS, MODE_ELEVATION_VIEW } from "../constants";
|
|
9
9
|
import * as Three from 'three';
|
|
10
10
|
import { returnReplaceableDeepSearchType } from "./../components/viewer2d/utils";
|
|
11
|
-
import convert from
|
|
11
|
+
import { convert } from "./convert-units-lite";
|
|
12
12
|
import { formatNumber } from "./math";
|
|
13
|
-
var AWS = require('aws-sdk');
|
|
14
|
-
var s3 = new AWS.S3({
|
|
15
|
-
accessKeyId: process.env.REACT_APP_AWS_ID,
|
|
16
|
-
secretAccessKey: process.env.REACT_APP_AWS_SECRET
|
|
17
|
-
});
|
|
18
|
-
var s3ParseUrl = function s3ParseUrl(url) {
|
|
19
|
-
var _decodedUrl = decodeURIComponent(url);
|
|
20
|
-
var _result = null;
|
|
21
|
-
|
|
22
|
-
// http://s3.amazonaws.com/bucket/key1/key2
|
|
23
|
-
var match = decodedUrl.match(/^https?:\/\/s3.amazonaws.com\/([^\/]+)\/?(.*?)$/);
|
|
24
|
-
if (_match) {
|
|
25
|
-
_result = {
|
|
26
|
-
bucket: _match[1],
|
|
27
|
-
key: _match[2],
|
|
28
|
-
region: ''
|
|
29
|
-
};
|
|
30
|
-
}
|
|
31
|
-
|
|
32
|
-
// http://s3-aws-region.amazonaws.com/bucket/key1/key2
|
|
33
|
-
match = decodedUrl.match(/^https?:\/\/s3-([^.]+).amazonaws.com\/([^\/]+)\/?(.*?)$/);
|
|
34
|
-
if (_match) {
|
|
35
|
-
_result = {
|
|
36
|
-
bucket: _match[2],
|
|
37
|
-
key: _match[3],
|
|
38
|
-
region: _match[1]
|
|
39
|
-
};
|
|
40
|
-
}
|
|
41
|
-
|
|
42
|
-
// http://bucket.s3.amazonaws.com/key1/key2
|
|
43
|
-
match = decodedUrl.match(/^https?:\/\/([^.]+).s3.amazonaws.com\/?(.*?)$/);
|
|
44
|
-
if (_match) {
|
|
45
|
-
_result = {
|
|
46
|
-
bucket: _match[1],
|
|
47
|
-
key: _match[2],
|
|
48
|
-
region: ''
|
|
49
|
-
};
|
|
50
|
-
}
|
|
51
|
-
|
|
52
|
-
// http://bucket.s3-aws-region.amazonaws.com/key1/key2 or,
|
|
53
|
-
// http://bucket.s3.aws-region.amazonaws.com/key1/key2
|
|
54
|
-
match = decodedUrl.match(/^https?:\/\/([^.]+).(?:s3-|s3\.)([^.]+).amazonaws.com\/?(.*?)$/);
|
|
55
|
-
if (_match) {
|
|
56
|
-
_result = {
|
|
57
|
-
bucket: _match[1],
|
|
58
|
-
key: _match[3],
|
|
59
|
-
region: _match[2]
|
|
60
|
-
};
|
|
61
|
-
}
|
|
62
|
-
return _result;
|
|
63
|
-
};
|
|
64
13
|
export var textureCube = new HDRCubeTextureLoader().setPath('/catalog/envMap/').load(HDR_URLS, function () {
|
|
65
14
|
textureCube.magFilter = Three.LinearFilter;
|
|
66
15
|
textureCube.needsUpdate = true;
|
|
67
16
|
});
|
|
68
|
-
export var getSignedUrl = function getSignedUrl(url) {
|
|
69
|
-
if (!url) return url;
|
|
70
|
-
var signedUrl = url;
|
|
71
|
-
try {
|
|
72
|
-
var _s3ParseUrl = s3ParseUrl(url),
|
|
73
|
-
bucket = _s3ParseUrl.bucket,
|
|
74
|
-
key = _s3ParseUrl.key;
|
|
75
|
-
signedUrl = s3.getSignedUrl('getObject', {
|
|
76
|
-
Bucket: bucket,
|
|
77
|
-
Key: key,
|
|
78
|
-
ResponseCacheControl: 'no-cache'
|
|
79
|
-
});
|
|
80
|
-
} catch (e) {
|
|
81
|
-
signedUrl = url;
|
|
82
|
-
}
|
|
83
|
-
return signedUrl;
|
|
84
|
-
};
|
|
85
17
|
export var base64Decode = function base64Decode(targetStr) {
|
|
86
18
|
if (!targetStr) return null;
|
|
87
19
|
try {
|
package/es/utils/id-broker.js
CHANGED
|
@@ -4,7 +4,7 @@ function _defineProperties(e, r) { for (var t = 0; t < r.length; t++) { var o =
|
|
|
4
4
|
function _createClass(e, r, t) { return r && _defineProperties(e.prototype, r), t && _defineProperties(e, t), Object.defineProperty(e, "prototype", { writable: !1 }), e; }
|
|
5
5
|
function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
|
|
6
6
|
function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
|
|
7
|
-
|
|
7
|
+
import { nanoid } from 'nanoid';
|
|
8
8
|
export var IDBroker = /*#__PURE__*/function () {
|
|
9
9
|
function IDBroker() {
|
|
10
10
|
_classCallCheck(this, IDBroker);
|
|
@@ -12,7 +12,7 @@ export var IDBroker = /*#__PURE__*/function () {
|
|
|
12
12
|
return _createClass(IDBroker, null, [{
|
|
13
13
|
key: "acquireID",
|
|
14
14
|
value: function acquireID() {
|
|
15
|
-
return
|
|
15
|
+
return nanoid();
|
|
16
16
|
}
|
|
17
17
|
}]);
|
|
18
18
|
}();
|
package/es/utils/molding.js
CHANGED
|
@@ -13,7 +13,7 @@ function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r)
|
|
|
13
13
|
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
14
|
import { BASE_CABINET_LAYOUTPOS, BOTTOM_MOLDING_LOCATION, EPSILON, MIDDLE_MOLDING_LOCATION, MOLDING_LOCATIONS, OVERLAP_INCLUDED, OVERLAP_LINK, OVERLAP_SAME, OVERLAP_SOME, TALL_CABINET_LAYOUTPOS, TOP_MOLDING_LOCATION, WALL_CABINET_LAYOUTPOS } from "../constants";
|
|
15
15
|
import * as Three from 'three';
|
|
16
|
-
import convert from
|
|
16
|
+
import { convert } from "./convert-units-lite";
|
|
17
17
|
import IDBroker from "./id-broker";
|
|
18
18
|
import { returnReplaceableDeepSearchType } from "../components/viewer2d/utils";
|
|
19
19
|
import { GeometryUtils } from "./export";
|
|
@@ -69,16 +69,16 @@ export function isEnableItemForMolding(layer, selItem) {
|
|
|
69
69
|
else return result && hasMoldingLayout(molding, selItem.layoutpos);
|
|
70
70
|
}
|
|
71
71
|
|
|
72
|
-
/**
|
|
73
|
-
* Check two line segments are overlap. The direction of the two line segments must be opposite.
|
|
74
|
-
* s1 c2 s2 c1
|
|
75
|
-
* |--------|------|-----------|
|
|
76
|
-
* Decision Formular: L(s1,c1) + L(s2, c2) = L(s1, s2) + L(c1, c2)
|
|
77
|
-
* @param {*} selRectPos1
|
|
78
|
-
* @param {*} selRectPos2
|
|
79
|
-
* @param {*} curRectPos1
|
|
80
|
-
* @param {*} curRectPos2
|
|
81
|
-
* @returns L(s1,c1) + L(s2, c2) - L(s1, s2) - L(c1, c2)
|
|
72
|
+
/**
|
|
73
|
+
* Check two line segments are overlap. The direction of the two line segments must be opposite.
|
|
74
|
+
* s1 c2 s2 c1
|
|
75
|
+
* |--------|------|-----------|
|
|
76
|
+
* Decision Formular: L(s1,c1) + L(s2, c2) = L(s1, s2) + L(c1, c2)
|
|
77
|
+
* @param {*} selRectPos1
|
|
78
|
+
* @param {*} selRectPos2
|
|
79
|
+
* @param {*} curRectPos1
|
|
80
|
+
* @param {*} curRectPos2
|
|
81
|
+
* @returns L(s1,c1) + L(s2, c2) - L(s1, s2) - L(c1, c2)
|
|
82
82
|
*/
|
|
83
83
|
function getDelta(selRectPos1, selRectPos2, curRectPos1, curRectPos2) {
|
|
84
84
|
return (
|
|
@@ -168,11 +168,11 @@ function tryMergeItemWithLocation(curItem, itemGroup, location) {
|
|
|
168
168
|
});
|
|
169
169
|
}
|
|
170
170
|
|
|
171
|
-
/**
|
|
172
|
-
* Make the molding group array with [items].
|
|
173
|
-
* @param {*} layer
|
|
174
|
-
* @param {*} items - Mergable snapped item group, if [items] is null then get all MG array of layer
|
|
175
|
-
* @returns MG array
|
|
171
|
+
/**
|
|
172
|
+
* Make the molding group array with [items].
|
|
173
|
+
* @param {*} layer
|
|
174
|
+
* @param {*} items - Mergable snapped item group, if [items] is null then get all MG array of layer
|
|
175
|
+
* @returns MG array
|
|
176
176
|
*/
|
|
177
177
|
export function getAllMoldingGroups(layer) {
|
|
178
178
|
var items = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : null;
|
|
@@ -347,12 +347,12 @@ export function mergeOverlappedLines(line1, line2) {
|
|
|
347
347
|
}
|
|
348
348
|
}
|
|
349
349
|
|
|
350
|
-
/**
|
|
351
|
-
* Get the contour line array of moldingGroup items
|
|
352
|
-
* @param {*} moldingGroup
|
|
353
|
-
* @param {*} layer
|
|
354
|
-
* @param {*} catalog
|
|
355
|
-
* @returns contour line array of moldingGroup items
|
|
350
|
+
/**
|
|
351
|
+
* Get the contour line array of moldingGroup items
|
|
352
|
+
* @param {*} moldingGroup
|
|
353
|
+
* @param {*} layer
|
|
354
|
+
* @param {*} catalog
|
|
355
|
+
* @returns contour line array of moldingGroup items
|
|
356
356
|
*/
|
|
357
357
|
export function getLinesFromItems2(moldingGroup, layer, catalog) {
|
|
358
358
|
// wall lines
|
|
@@ -507,13 +507,13 @@ export function getLinesFromItems2(moldingGroup, layer, catalog) {
|
|
|
507
507
|
return newMGlines;
|
|
508
508
|
}
|
|
509
509
|
|
|
510
|
-
/**
|
|
511
|
-
* Get the line that colinear linked with [line], and merge them to a new line
|
|
512
|
-
* @param {*} line
|
|
513
|
-
* @param {*} MGlines
|
|
514
|
-
* @returns
|
|
515
|
-
* - returns merged new line
|
|
516
|
-
* - returns filtered new line group (remove linked line from [MGlines])
|
|
510
|
+
/**
|
|
511
|
+
* Get the line that colinear linked with [line], and merge them to a new line
|
|
512
|
+
* @param {*} line
|
|
513
|
+
* @param {*} MGlines
|
|
514
|
+
* @returns
|
|
515
|
+
* - returns merged new line
|
|
516
|
+
* - returns filtered new line group (remove linked line from [MGlines])
|
|
517
517
|
*/
|
|
518
518
|
function getMergedLine(line, MGlines, cnt) {
|
|
519
519
|
try {
|
|
@@ -566,11 +566,11 @@ function getMergedLine(line, MGlines, cnt) {
|
|
|
566
566
|
}
|
|
567
567
|
}
|
|
568
568
|
|
|
569
|
-
/**
|
|
570
|
-
* Get the contour line segments from [lineSegs]
|
|
571
|
-
* @param {*} lineSegs
|
|
572
|
-
* @param {*} otherLines
|
|
573
|
-
* @returns
|
|
569
|
+
/**
|
|
570
|
+
* Get the contour line segments from [lineSegs]
|
|
571
|
+
* @param {*} lineSegs
|
|
572
|
+
* @param {*} otherLines
|
|
573
|
+
* @returns
|
|
574
574
|
*/
|
|
575
575
|
function getTrimmedContourLineSegs(lineSegs, otherLines, cnt) {
|
|
576
576
|
try {
|
|
@@ -5,19 +5,17 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
5
5
|
});
|
|
6
6
|
exports["default"] = void 0;
|
|
7
7
|
var _axios = _interopRequireDefault(require("axios"));
|
|
8
|
-
var
|
|
9
|
-
var
|
|
10
|
-
var
|
|
8
|
+
var _convertUnitsLite = require("./utils/convert-units-lite");
|
|
9
|
+
var _export = require("./plugins/export");
|
|
10
|
+
var _propTypes = _interopRequireDefault(require("prop-types"));
|
|
11
11
|
var _react = _interopRequireWildcard(require("react"));
|
|
12
|
-
var _reactGa = _interopRequireDefault(require("react-ga4"));
|
|
13
|
-
var _reactHotjar = require("react-hotjar");
|
|
14
12
|
var _reactRedux = require("react-redux");
|
|
15
13
|
var _redux = require("redux");
|
|
16
14
|
var constants = _interopRequireWildcard(require("./constants"));
|
|
17
15
|
var _helper = require("./utils/helper");
|
|
18
|
-
var
|
|
16
|
+
var _export2 = _interopRequireDefault(require("./actions/export"));
|
|
19
17
|
var _catalog = _interopRequireDefault(require("./catalog/catalog"));
|
|
20
|
-
var
|
|
18
|
+
var _export3 = require("./components/export");
|
|
21
19
|
var _translator = _interopRequireDefault(require("./translator/translator"));
|
|
22
20
|
var _objectsUtils = require("./utils/objects-utils");
|
|
23
21
|
var _version = require("./version");
|
|
@@ -348,7 +346,7 @@ var KitchenConfigurator = /*#__PURE__*/function (_Component) {
|
|
|
348
346
|
key: "getChildContext",
|
|
349
347
|
value: function getChildContext() {
|
|
350
348
|
var _this2 = this;
|
|
351
|
-
return _objectSpread(_objectSpread({}, (0, _objectsUtils.objectsMap)(
|
|
349
|
+
return _objectSpread(_objectSpread({}, (0, _objectsUtils.objectsMap)(_export2["default"], function (actionNamespace) {
|
|
352
350
|
return _this2.props[actionNamespace];
|
|
353
351
|
})), {}, {
|
|
354
352
|
translator: this.props.translator,
|
|
@@ -369,11 +367,6 @@ var KitchenConfigurator = /*#__PURE__*/function (_Component) {
|
|
|
369
367
|
key: "componentDidMount",
|
|
370
368
|
value: function componentDidMount() {
|
|
371
369
|
var _this3 = this;
|
|
372
|
-
_reactGa["default"].send({
|
|
373
|
-
hitType: 'pageview',
|
|
374
|
-
page: (0, _helper.getPath)()
|
|
375
|
-
});
|
|
376
|
-
_reactHotjar.hotjar.event && _reactHotjar.hotjar.event("pageview:".concat((0, _helper.getPath)()));
|
|
377
370
|
window.addEventListener('beforeunload', this.handleBeforeUnload);
|
|
378
371
|
console.log('context =>', this.context);
|
|
379
372
|
window.forRedo = [];
|
|
@@ -393,7 +386,7 @@ var KitchenConfigurator = /*#__PURE__*/function (_Component) {
|
|
|
393
386
|
return;
|
|
394
387
|
}
|
|
395
388
|
if (match && match.params.pid === undefined) {
|
|
396
|
-
var newplugins = [].concat(_toConsumableArray(plugins), [
|
|
389
|
+
var newplugins = [].concat(_toConsumableArray(plugins), [(0, _export.Autosave)('KitchenConfigurator_v0', false)]);
|
|
397
390
|
newplugins.forEach(function (newplugin) {
|
|
398
391
|
return newplugin(store, stateExtractor);
|
|
399
392
|
});
|
|
@@ -565,7 +558,7 @@ var KitchenConfigurator = /*#__PURE__*/function (_Component) {
|
|
|
565
558
|
var firstVisit = this.state.wizardStepOpend && this.isProjectEmpty(extractedState.scene);
|
|
566
559
|
var allVisible = firstVisit || signOpen || myProjectsOpen;
|
|
567
560
|
var _scene = extractedState.getIn(['scene']);
|
|
568
|
-
var len = convert(_scene.width).from(_scene.unit).to('cm');
|
|
561
|
+
var len = (0, _convertUnitsLite.convert)(_scene.width).from(_scene.unit).to('cm');
|
|
569
562
|
var _viewer2D = extractedState.getIn(['viewer2D']);
|
|
570
563
|
if (_viewer2D.size > 0) {
|
|
571
564
|
var scaleX = width / len * 3;
|
|
@@ -588,9 +581,11 @@ var KitchenConfigurator = /*#__PURE__*/function (_Component) {
|
|
|
588
581
|
});
|
|
589
582
|
return /*#__PURE__*/_react["default"].createElement("section", null, /*#__PURE__*/_react["default"].createElement("div", {
|
|
590
583
|
style: _objectSpread(_objectSpread({}, wrapperStyle), {}, {
|
|
591
|
-
height: height
|
|
584
|
+
height: height,
|
|
585
|
+
display: 'flex',
|
|
586
|
+
justifyContent: 'center'
|
|
592
587
|
})
|
|
593
|
-
}, /*#__PURE__*/_react["default"].createElement(
|
|
588
|
+
}, /*#__PURE__*/_react["default"].createElement(_export3.Content, _extends({
|
|
594
589
|
width: contentW,
|
|
595
590
|
height: contentH,
|
|
596
591
|
catalog: this.props.catalog,
|
|
@@ -608,30 +603,29 @@ var KitchenConfigurator = /*#__PURE__*/function (_Component) {
|
|
|
608
603
|
}]);
|
|
609
604
|
}(_react.Component);
|
|
610
605
|
KitchenConfigurator.propTypes = {
|
|
611
|
-
translator:
|
|
612
|
-
catalog:
|
|
613
|
-
allowProjectFileSupport:
|
|
614
|
-
plugins:
|
|
615
|
-
autosaveKey:
|
|
616
|
-
autosaveDelay:
|
|
617
|
-
width:
|
|
618
|
-
height:
|
|
619
|
-
stateExtractor:
|
|
620
|
-
|
|
621
|
-
|
|
622
|
-
|
|
623
|
-
|
|
624
|
-
|
|
625
|
-
configData: PropTypes.object
|
|
606
|
+
translator: _propTypes["default"].instanceOf(_translator["default"]),
|
|
607
|
+
catalog: _propTypes["default"].instanceOf(_catalog["default"]),
|
|
608
|
+
allowProjectFileSupport: _propTypes["default"].bool,
|
|
609
|
+
plugins: _propTypes["default"].arrayOf(_propTypes["default"].func),
|
|
610
|
+
autosaveKey: _propTypes["default"].string,
|
|
611
|
+
autosaveDelay: _propTypes["default"].number,
|
|
612
|
+
width: _propTypes["default"].number.isRequired,
|
|
613
|
+
height: _propTypes["default"].number.isRequired,
|
|
614
|
+
stateExtractor: _propTypes["default"].func.isRequired,
|
|
615
|
+
sidebarComponents: _propTypes["default"].array,
|
|
616
|
+
footerbarComponents: _propTypes["default"].array,
|
|
617
|
+
customContents: _propTypes["default"].object,
|
|
618
|
+
softwareSignature: _propTypes["default"].string,
|
|
619
|
+
configData: _propTypes["default"].object
|
|
626
620
|
};
|
|
627
621
|
KitchenConfigurator.contextTypes = {
|
|
628
|
-
store:
|
|
622
|
+
store: _propTypes["default"].object.isRequired
|
|
629
623
|
};
|
|
630
|
-
KitchenConfigurator.childContextTypes = _objectSpread(_objectSpread({}, (0, _objectsUtils.objectsMap)(
|
|
631
|
-
return
|
|
624
|
+
KitchenConfigurator.childContextTypes = _objectSpread(_objectSpread({}, (0, _objectsUtils.objectsMap)(_export2["default"], function () {
|
|
625
|
+
return _propTypes["default"].object;
|
|
632
626
|
})), {}, {
|
|
633
|
-
translator:
|
|
634
|
-
catalog:
|
|
627
|
+
translator: _propTypes["default"].object,
|
|
628
|
+
catalog: _propTypes["default"].object
|
|
635
629
|
});
|
|
636
630
|
KitchenConfigurator.defaultProps = {
|
|
637
631
|
translator: new _translator["default"](),
|
|
@@ -639,7 +633,6 @@ KitchenConfigurator.defaultProps = {
|
|
|
639
633
|
plugins: [],
|
|
640
634
|
allowProjectFileSupport: true,
|
|
641
635
|
softwareSignature: "KitchenConfigurator ".concat(_version.VERSION),
|
|
642
|
-
toolbarButtons: [],
|
|
643
636
|
sidebarComponents: [],
|
|
644
637
|
footerbarComponents: [],
|
|
645
638
|
customContents: {},
|
|
@@ -653,8 +646,8 @@ function mapStateToProps(reduxState) {
|
|
|
653
646
|
};
|
|
654
647
|
}
|
|
655
648
|
function mapDispatchToProps(dispatch) {
|
|
656
|
-
return (0, _objectsUtils.objectsMap)(
|
|
657
|
-
return (0, _redux.bindActionCreators)(
|
|
649
|
+
return (0, _objectsUtils.objectsMap)(_export2["default"], function (actionNamespace) {
|
|
650
|
+
return (0, _redux.bindActionCreators)(_export2["default"][actionNamespace], dispatch);
|
|
658
651
|
});
|
|
659
652
|
}
|
|
660
653
|
var _default = exports["default"] = (0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps)(KitchenConfigurator);
|