kitchen-simulator 1.1.1-test.75 → 1.1.1-test.77

package/es/components/viewer2d/viewer2d.js

@@ -7,17 +7,16 @@ import React, { useEffect, useRef, useState } from 'react';
 import PropTypes from 'prop-types';
 import { ReactSVGPanZoom, TOOL_AUTO, TOOL_NONE, TOOL_PAN, TOOL_ZOOM_IN, TOOL_ZOOM_OUT, zoom } from 'react-svg-pan-zoom';
 import * as constants from "../../constants";
+import { DECIMAL_PLACES_2, LINE_THICKNESS, MIN_ANGLE_DISALLOW_DRAW_WALL, MODE_ELEVATION_VIEW, MODE_IDLE, UNIT_ANGLE } from "../../constants";
 import State from "./state";
 import * as SharedStyle from "../../shared-style";
 import { RulerX, RulerY } from "./export";
-import { DECIMAL_PLACES_2, LINE_THICKNESS, MIN_ANGLE_DISALLOW_DRAW_WALL, MODE_ELEVATION_VIEW, MODE_IDLE, UNIT_ANGLE } from "../../constants";
 import { GeometryUtils } from "../../utils/export";
 import FormNumberInput from "../style/form-number-input";
 import { convert } from "../../utils/convert-units-lite";
 import { Map } from 'immutable';
 import { formatNumber } from "../../utils/math";
 import { isEmpty } from "../../utils/helper"; // variables
-
 // variables
 var pinFlag = false;
 var sFlag = false; //for all object move
@@ -393,6 +392,17 @@ export default function Viewer2D(_ref, _ref2) {
     }
     var absAngle, lineAngle;
     if (draggingLine.vertices[0] !== draggingLine.vertices[1]) {
+      if (isEmpty(relatedLines) && mode !== 'DRAGGING_LINE') {
+        endDrag.push(true);
+        var originVerIndex = draggingLine.vertices.findIndex(function (vertice) {
+          return vertice !== dragVertexId;
+        });
+        var originVerId = originVerIndex < 0 ? draggingLine.vertices[0] : draggingLine.vertices[originVerIndex];
+        var ox = vertices[originVerId].x;
+        var oy = vertices[originVerId].y;
+        lineAngle = GeometryUtils.angleBetweenTwoPointsAndOrigin(ox, oy, x, y);
+        absAngle = Math.abs(lineAngle);
+      }
       for (var i = 0; i < relatedLines.length; i++) {
         var line = relatedLines[i];
         lineAngle = GeometryUtils.angleBetweenTwoLines(line, draggingLine, vertices);
@@ -418,17 +428,17 @@ export default function Viewer2D(_ref, _ref2) {
     } else {
       var rest = MIN_ANGLE_DISALLOW_DRAW_WALL - absAngle;
       // the origin point of rotation(snapping)
-      var originVerId = draggingLine.vertices.findIndex(function (vertice) {
+      var _originVerId = draggingLine.vertices.findIndex(function (vertice) {
         return vertice !== dragVertexId;
       });
-      originVerId = originVerId < 0 ? draggingLine.vertices[0] : draggingLine.vertices[originVerId];
+      _originVerId = _originVerId < 0 ? draggingLine.vertices[0] : draggingLine.vertices[_originVerId];
       if (stepUnit) {
-        var ox = vertices[originVerId].x;
-        var oy = vertices[originVerId].y;
+        var _ox = vertices[_originVerId].x;
+        var _oy = vertices[_originVerId].y;
         // determine the direction of rotation.
         rest = lineAngle > 0 ? -rest : rest;
         // rotate the current point to last point around the first point of drawing line.
-        var res = GeometryUtils.rotatePointAroundPoint(x, y, ox, oy, rest);
+        var res = GeometryUtils.rotatePointAroundPoint(x, y, _ox, _oy, rest);
         vtx = res.x;
         vty = res.y;
       }
@@ -806,8 +816,9 @@ export default function Viewer2D(_ref, _ref2) {
           current_sel_obj_id = elementData.id;
           if (elementData.part === 'rotation-anchor') itemsActions.beginRotatingItem(elementData.layer, elementData.id, x, y);else if (elementData.part === 'remove') break;else if (elementData.part === 'duplicate') break;else if (elementData.part === 'warning_edit') break;else {
             // closes the setting dialog
-            // document.getElementById('setting_dialog').style.display = 'none';
-
+            if (document.getElementById('setting_dialog')) {
+              document.getElementById('setting_dialog').style.display = 'none';
+            }
             itemsActions.selectItem(elementData.layer, elementData.id);
             // projectActions.setMode(constants.MODE_DRAGGING_ITEM);
             itemsActions.beginDraggingItem(elementData.layer, elementData.id, x, y);
@@ -860,11 +871,15 @@ export default function Viewer2D(_ref, _ref2) {
         var selectedLayer = scene.getIn(['layers', layerID]);
         switch (elementData ? elementData.prototype : 'none') {
           case 'areas':
-            // document.getElementById('setting_dialog').style.display = 'none';
+            if (document.getElementById('setting_dialog')) {
+              document.getElementById('setting_dialog').style.display = 'none';
+            }
             areaActions.selectArea(elementData.layer, elementData.id);
             break;
           case 'lines':
-            // document.getElementById('setting_dialog').style.display = 'none';
+            if (document.getElementById('setting_dialog')) {
+              document.getElementById('setting_dialog').style.display = 'none';
+            }
             if (elementData.part === 'remove') {
               projectActions.remove();
               break;
@@ -882,7 +897,9 @@ export default function Viewer2D(_ref, _ref2) {
               break;
             }
           case 'holes':
-            // document.getElementById('setting_dialog').style.display = 'none';
+            if (document.getElementById('setting_dialog')) {
+              document.getElementById('setting_dialog').style.display = 'none';
+            }
             holesActions.selectHole(elementData.layer, elementData.id);
             break;
           case 'items':
@@ -895,8 +912,9 @@ export default function Viewer2D(_ref, _ref2) {
               break;
             } else if (elementData.part === 'warning_edit') {
               // closes the setting dialog
-              // document.getElementById('setting_dialog').style.display = 'none';
-
+              if (document.getElementById('setting_dialog')) {
+                document.getElementById('setting_dialog').style.display = 'none';
+              }
               itemsActions.selectItem(elementData.layer, elementData.id);
               replaceCabinet(true);
               break;
@@ -1265,8 +1283,6 @@ export default function Viewer2D(_ref, _ref2) {
   var sceneZoom = state.zoom || 1;
   var rulerXElements = Math.ceil(sceneWidth / rulerUnitPixelSize) + 1;
   var rulerYElements = Math.ceil(sceneHeight / rulerUnitPixelSize) + 1;
-  console.log('---render viewer2d');
-  console.log(viewer2D.isEmpty());
   return /*#__PURE__*/React.createElement("div", null, rulerEdit, /*#__PURE__*/React.createElement("div", {
     style: {
       margin: 0,
@@ -1337,11 +1353,8 @@ export default function Viewer2D(_ref, _ref2) {
     onMouseDown: onMouseDown,
     onMouseMove: onMouseMove,
     onMouseUp: onMouseUp,
-    miniatureProps: {
-      position: 'none'
-    },
     toolbarProps: {
-      position: 'right'
+      position: 'none'
     },
     detectPinchGesture: false,
     disableDoubleClickZoomWithToolAuto: true,

package/es/components/viewer3d/libs/mtl-loader.js

@@ -4,7 +4,7 @@
  * @author angelxuanchang
  */
 
-var THREE = window.THREE;
+var THREE = window.THREE || require('three');
 var MTLLoader;
 MTLLoader = function MTLLoader(manager) {
   this.manager = manager !== undefined ? manager : THREE.DefaultLoadingManager;
@@ -354,4 +354,4 @@ MTLLoader.MaterialCreator.prototype = {
     return texture;
   }
 };
-export default MTLLoader;
+module.exports = MTLLoader;

package/es/components/viewer3d/libs/obj-loader.js

@@ -2,7 +2,7 @@
  * @author mrdoob / http://mrdoob.com/
  */
 
-var THREE = window.THREE;
+var THREE = window.THREE || require('three');
 var OBJLoader;
 OBJLoader = function OBJLoader(manager) {
   this.manager = manager !== undefined ? manager : THREE.DefaultLoadingManager;
@@ -459,4 +459,4 @@ OBJLoader.prototype = {
     return container;
   }
 };
-export default OBJLoader;
+module.exports = OBJLoader;

package/es/components/viewer3d/libs/orbit-controls.js

@@ -13,8 +13,9 @@
 //    Zoom - middle mouse, or mousewheel / touch: two finger spread or squish
 //    Pan - right mouse, or arrow keys / touch: three finter swipe
 
-var THREE = window.THREE;
-function OrbitControls(object, domElement) {
+var THREE = window.THREE || require('three');
+var OrbitControls;
+module.exports = OrbitControls = function OrbitControls(object, domElement) {
   this.object = object;
   this.domElement = domElement !== undefined ? domElement : document;
 
@@ -622,7 +623,7 @@ function OrbitControls(object, domElement) {
   // force an update at start
 
   this.update();
-}
+};
 OrbitControls.prototype = Object.create(THREE.EventDispatcher.prototype);
 OrbitControls.prototype.constructor = OrbitControls;
 Object.defineProperties(OrbitControls.prototype, {
@@ -694,6 +695,4 @@ Object.defineProperties(OrbitControls.prototype, {
       this.dampingFactor = value;
     }
   }
-});
-export default OrbitControls;
-export { OrbitControls };
+});

package/es/components/viewer3d/libs/pointer-lock-controls.js

@@ -2,8 +2,9 @@
  * @author mrdoob / http://mrdoob.com/
  */
 
-var THREE = window.THREE;
-function PointerLockControls(camera) {
+var THREE = window.THREE || require('three');
+var PointerLockControls;
+module.exports = PointerLockControls = function PointerLockControls(camera) {
   var scope = this;
   camera.rotation.set(0, 0, 0);
   var pitchObject = new THREE.Object3D();
@@ -41,6 +42,4 @@ function PointerLockControls(camera) {
       return v;
     };
   }();
-}
-export default PointerLockControls;
-export { PointerLockControls };
+};

package/es/components/viewer3d/ruler-utils/scene3D.js

@@ -13,7 +13,6 @@ export default function Scene3D(_ref) {
     mode = _ref.mode,
     downloadFlag = _ref.downloadFlag;
   var layers = scene.layers;
-  console.log(layers.toJS());
   var selectedLayer = layers.get(scene.selectedLayer);
   var ceilHeight = selectedLayer.ceilHeight;
   var selectedLine = selectedLayer.lines.get(selectedLayer.selected.lines.toJS()[0]);

package/es/components/viewer3d/scene-creator.js

@@ -429,6 +429,7 @@ function replaceObject(modifiedPath, layer, planData, actions, sceneData, oldSce
       break;
     case 'items':
       var item = layer.getIn(['items', modifiedPath[4]]);
+      if (isEmpty(item)) break;
       deleteCountertop(planData.sceneGraph.layers[layer.id].countertops, item, planData, layer);
       var tmpMoldings = _toConsumableArray(planData.sceneGraph.layers[layer.id].moldingGroups);
       if (catalog.getElement(item.type).updateRender3D) {
@@ -682,7 +683,9 @@ function replaceObject(modifiedPath, layer, planData, actions, sceneData, oldSce
             }
             applyInteract(item3D, function () {
               // closes the setting dialog
-              // document.getElementById('setting_dialog').style.display = 'none';
+              if (document.getElementById('setting_dialog')) {
+                document.getElementById('setting_dialog').style.display = 'none';
+              }
               return actions.itemsActions.selectItem(layer.id, modifiedPath[4]);
             });
             setTimeout(function () {
@@ -1622,7 +1625,9 @@ function addHole(sceneData, planData, layer, holeID, catalog, holesActions, mode
     planData.plan.add(pivot);
     planData.sceneGraph.layers[layer.id].holes[holeData.id] = pivot;
     applyInteract(pivot, function () {
-      // document.getElementById('setting_dialog').style.display = 'none';
+      if (document.getElementById('setting_dialog')) {
+        document.getElementById('setting_dialog').style.display = 'none';
+      }
       return holesActions.selectHole(layer.id, holeData.id);
     });
     var opacity = layer.opacity;
@@ -1693,7 +1698,9 @@ function addLine(sceneData, planData, layer, lineID, catalog, linesActions) {
     planData.plan.add(pivot);
     planData.sceneGraph.layers[layer.id].lines[lineID] = pivot;
     applyInteract(pivot, function () {
-      // document.getElementById('setting_dialog').style.display = 'none';
+      if (document.getElementById('setting_dialog')) {
+        document.getElementById('setting_dialog').style.display = 'none';
+      }
       return linesActions.selectLine(layer.id, line.id);
     });
     var opacity = layer.opacity;
@@ -1793,7 +1800,9 @@ function addArea(sceneData, planData, layer, areaID, catalog, areaActions, mode)
     if (isElevationView(mode)) pivot.visible = false;
     planData.plan.add(pivot);
     planData.sceneGraph.layers[layer.id].areas[areaID] = pivot;
-    // document.getElementById('setting_dialog').style.display = 'none';
+    if (document.getElementById('setting_dialog')) {
+      document.getElementById('setting_dialog').style.display = 'none';
+    }
     applyInteract(pivot, interactFunction);
     var opacity = layer.opacity;
     if (area.selected) {
@@ -1875,7 +1884,9 @@ function addItem(sceneData, planData, layer, itemID, catalog, itemsActions) {
     pivot.position.z = -item.y;
     applyInteract(item3D, function () {
       // closes the setting dialog
-      // document.getElementById('setting_dialog').style.display = 'none';
+      if (document.getElementById('setting_dialog')) {
+        document.getElementById('setting_dialog').style.display = 'none';
+      }
       return itemsActions.selectItem(layer.id, item.id);
     });
     var opacity = layer.opacity;
@@ -1996,7 +2007,9 @@ function addItem(sceneData, planData, layer, itemID, catalog, itemsActions) {
       }
     }
     applyInteract(pivot, function () {
-      // document.getElementById('setting_dialog').style.display = 'none';
+      if (document.getElementById('setting_dialog')) {
+        document.getElementById('setting_dialog').style.display = 'none';
+      }
       return itemsActions.selectItem(layer.id, item.id);
     });
     setTimeout(function () {
@@ -2018,7 +2031,9 @@ function updateItem(sceneData, oldSceneData, planData, layer, itemID, difference
 
 // Apply interact function to children of an Object3D
 function applyInteract(object, interactFunction) {
-  // document.getElementById('setting_dialog').style.display = 'none';
+  if (document.getElementById('setting_dialog')) {
+    document.getElementById('setting_dialog').style.display = 'none';
+  }
   object.traverse(function (child) {
     if (child instanceof Three.Mesh) {
       child.interact = interactFunction;