kitchen-simulator 3.1.14 → 4.0.0-alpha.12

package/lib/components/viewer3d/front3D.js

@@ -10,7 +10,6 @@ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/sli
 var _react = _interopRequireWildcard(require("react"));
 var _viewer3d = _interopRequireDefault(require("./viewer3d"));
 var _state3D = _interopRequireDefault(require("./ruler-utils/state3D"));
-var _utils = require("../viewer2d/utils");
 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); }
 var k = 0;
 function Front3D(_ref, _ref2) {
@@ -36,9 +35,9 @@ function Front3D(_ref, _ref2) {
     setToolbar('');
   };
   (0, _react.useEffect)(function () {
-    if (!(0, _utils.isEmpty)(document.getElementById('front'))) document.getElementById('front').addEventListener('mouseup', mouseUpEvent);
+    document.getElementById('front').addEventListener('mouseup', mouseUpEvent);
     return function () {
-      if (!(0, _utils.isEmpty)(document.getElementById('front'))) document.getElementById('front').removeEventListener('mouseup', mouseUpEvent);
+      document.getElementById('front').removeEventListener('mouseup', mouseUpEvent);
     };
   }, []);
   return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement("svg", {

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

@@ -1,18 +1,12 @@
 "use strict";
 
-var _typeof = require("@babel/runtime/helpers/typeof");
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports["default"] = void 0;
-var THREE = _interopRequireWildcard(require("three"));
-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); }
 /**
  * Loads a Wavefront .mtl file specifying materials
  *
  * @author angelxuanchang
  */
 
+var THREE = window.THREE || require('three');
 var MTLLoader;
 MTLLoader = function MTLLoader(manager) {
   this.manager = manager !== undefined ? manager : THREE.DefaultLoadingManager;
@@ -362,5 +356,4 @@ MTLLoader.MaterialCreator.prototype = {
     return texture;
   }
 };
-var _default = exports["default"] = MTLLoader;
-module.exports = exports.default;
+module.exports = MTLLoader;

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

@@ -1,16 +1,10 @@
 "use strict";
 
-var _typeof = require("@babel/runtime/helpers/typeof");
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports["default"] = void 0;
-var THREE = _interopRequireWildcard(require("three"));
-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); }
 /**
  * @author mrdoob / http://mrdoob.com/
  */
 
+var THREE = window.THREE || require('three');
 var OBJLoader;
 OBJLoader = function OBJLoader(manager) {
   this.manager = manager !== undefined ? manager : THREE.DefaultLoadingManager;
@@ -467,5 +461,4 @@ OBJLoader.prototype = {
     return container;
   }
 };
-var _default = exports["default"] = OBJLoader;
-module.exports = exports.default;
+module.exports = OBJLoader;

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

@@ -1,12 +1,5 @@
 "use strict";
 
-var _typeof = require("@babel/runtime/helpers/typeof");
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports["default"] = OrbitControls;
-var THREE = _interopRequireWildcard(require("three"));
-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); }
 /**
  * @author qiao / https://github.com/qiao
  * @author mrdoob / http://mrdoob.com
@@ -22,7 +15,9 @@ function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r
 //    Zoom - middle mouse, or mousewheel / touch: two finger spread or squish
 //    Pan - right mouse, or arrow keys / touch: three finter swipe
 
-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;
 
@@ -630,7 +625,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, {
@@ -702,5 +697,4 @@ Object.defineProperties(OrbitControls.prototype, {
       this.dampingFactor = value;
     }
   }
-});
-module.exports = exports.default;
+});

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

@@ -1,18 +1,12 @@
 "use strict";
 
-var _typeof = require("@babel/runtime/helpers/typeof");
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports["default"] = PointerLockControls;
-var THREE = _interopRequireWildcard(require("three"));
-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); }
 /**
  * @author mrdoob / http://mrdoob.com/
- * Converted to ESM
  */
 
-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();
@@ -23,14 +17,14 @@ function PointerLockControls(camera) {
   yawObject.position.y = 10;
   yawObject.add(pitchObject);
   var PI_2 = Math.PI / 2;
-  function onMouseMove(event) {
+  var onMouseMove = function onMouseMove(event) {
     if (scope.enabled === false) return;
     var movementX = event.movementX || event.mozMovementX || event.webkitMovementX || 0;
     var movementY = event.movementY || event.mozMovementY || event.webkitMovementY || 0;
     yawObject.rotation.y -= movementX * 0.002;
     pitchObject.rotation.x -= movementY * 0.002;
     pitchObject.rotation.x = Math.max(-PI_2, Math.min(PI_2, pitchObject.rotation.x));
-  }
+  };
   this.dispose = function () {
     document.removeEventListener('mousemove', onMouseMove, false);
   };
@@ -41,6 +35,7 @@ function PointerLockControls(camera) {
   };
   this.getDirection = function () {
     // assumes the camera itself is not rotated
+
     var direction = new THREE.Vector3(0, 0, -1);
     var rotation = new THREE.Euler(0, 0, 0, 'YXZ');
     return function (v) {
@@ -49,5 +44,4 @@ function PointerLockControls(camera) {
       return v;
     };
   }();
-}
-module.exports = exports.default;
+};

package/lib/components/viewer3d/viewer3d.js

@@ -29,8 +29,8 @@ var _export = require("../../utils/export");
 var _helper = require("../../utils/helper");
 var _RGBELoader = require("three/examples/jsm/loaders/RGBELoader");
 var _cameraControls = _interopRequireDefault(require("camera-controls"));
-var _objectsUtils = require("../../utils/objects-utils");
 var _utils = require("../viewer2d/utils");
+var _objectsUtils = require("../../utils/objects-utils");
 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); }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2["default"])(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
@@ -1190,34 +1190,6 @@ var Scene3DViewer = exports["default"] = /*#__PURE__*/function (_React$Component
           itemID: selItemId
         };
       };
-      var sendInternalEvent = function sendInternalEvent(evtType, evtElement) {
-        var pointArray = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : null;
-        if (!(0, _helper.isEmpty)(evtType) && !(0, _helper.isEmpty)(evtElement)) {
-          var _this2$props$onIntern, _this2$props;
-          var payload = evtElement === null || evtElement === void 0 ? void 0 : evtElement.toJS();
-          if ((evtElement === null || evtElement === void 0 ? void 0 : evtElement.prototype) === 'lines') {
-            // caculating length of selected line//
-            var v_a = layer.vertices.get(evtElement.vertices.get(0));
-            var v_b = layer.vertices.get(evtElement.vertices.get(1));
-            var distance = _export.GeometryUtils.pointsDistance(v_a.x, v_a.y, v_b.x, v_b.y);
-            var _length = (0, _convertUnitsLite.convert)(distance).from('cm').to(layer.unit);
-            payload.length = _length;
-            //////////////////////////////////////
-          } else if ((evtElement === null || evtElement === void 0 ? void 0 : evtElement.prototype) === 'items') {
-            // check this cabinet has warning box
-            payload.isWarning = (0, _utils.isWarningItem)(evtElement);
-            // check this item is available molding
-            payload.isMoldingAvailable = _export.MoldingUtils.isEnableItemForMolding(layer, evtElement); // check this item is snapped to wall
-            payload.isAttachedWall = _export.MoldingUtils.isAttachedWall(layer, evtElement);
-            // update distArray
-            if (pointArray) payload.distArray = pointArray;
-          }
-          (_this2$props$onIntern = (_this2$props = _this2.props).onInternalEvent) === null || _this2$props$onIntern === void 0 || _this2$props$onIntern.call(_this2$props, {
-            type: evtType,
-            value: payload
-          });
-        }
-      };
       this.mouseDownEvent = function (event) {
         gridPlanOrigin = gridPlane.position;
         gridMatrix.copy(gridPlane.matrixWorld).invert();
@@ -1309,18 +1281,7 @@ var Scene3DViewer = exports["default"] = /*#__PURE__*/function (_React$Component
               }
             }
             if (selectedObject !== undefined) {
-              // get selected object from planData.sceneGraph
-              var selectedItem = null;
-              switch (true) {
-                case 'itemID' in selectedObject:
-                  selectedItem = planData.sceneGraph.layers[selectedObject.layerID].items[selectedObject.itemID];
-                  break;
-                case 'holeID' in selectedObject:
-                  selectedItem = planData.sceneGraph.layers[selectedObject.layerID].holes[selectedObject.holeID];
-                  break;
-                default:
-                  break;
-              }
+              var selectedItem = planData.sceneGraph.layers[selectedObject.layerID].items[selectedObject.itemID];
               sPoint.set(Point.x, Point.y);
               if (transflag == 0) {
                 scene3D.remove(toolObj);
@@ -1369,6 +1330,11 @@ var Scene3DViewer = exports["default"] = /*#__PURE__*/function (_React$Component
               if (selectedFlag || toolIntersects.length > 0 && !(0, _helper.isElevationView)(mode)) {
                 cameraControls.mouseButtons.left = _cameraControls["default"].ACTION.NONE;
                 selectedFlag = false;
+              } else {
+                isSelected = false;
+                _this2.context.projectActions.unselectAll();
+                scene3D.remove(toolObj);
+                _this2.context.itemsActions.removeReplacingSupport();
               }
             }
           } else {
@@ -1381,8 +1347,7 @@ var Scene3DViewer = exports["default"] = /*#__PURE__*/function (_React$Component
         }
       };
       this.mouseUpEvent = function (event) {
-        var internalType = ''; // internalEvent type - select/drag/draw
-        var selectedElement; // internalEvent data
+        var _selObj$object, _selObj$object2;
         firstMove = 0;
         var altitude = 0;
         if (allItemRect && allItemRect.cur && allItemRect.cur.itemInfo !== undefined) {
@@ -1419,21 +1384,6 @@ var Scene3DViewer = exports["default"] = /*#__PURE__*/function (_React$Component
           isInitialPhase = true;
           return;
         }
-        switch (_this2.props.state.mode) {
-          case _constants.MODE_DRAGGING_ITEM_3D:
-          case _constants.MODE_DRAGGING_HOLE_3D:
-            internalType = _constants.INTERNAL_EVENT_DRAG_ELEMENT;
-            break;
-          case _constants.MODE_ROTATING_ITEM_3D:
-            internalType = _constants.INTERNAL_EVENT_ROTATE_ELEMENT;
-            break;
-          case _constants.MODE_DRAWING_HOLE_3D:
-            internalType = _constants.INTERNAL_EVENT_DRAW_ELEMENT;
-            break;
-          case _constants.MODE_IDLE_3D:
-            internalType = _constants.INTERNAL_EVENT_SELECT_ELEMENT;
-            break;
-        }
         if (_this2.props.state.mode == _constants.MODE_DRAGGING_ITEM_3D) {
           _this2.context.itemsActions.endDraggingItem3D();
         }
@@ -1466,8 +1416,7 @@ var Scene3DViewer = exports["default"] = /*#__PURE__*/function (_React$Component
             });
           });
           var intersects = raycaster.intersectObjects(meshes, true);
-          var _i10; // index of warning object in intersects
-
+          var _i10;
           if (intersects.length > 0 && !isNaN(intersects[0].distance)) {
             for (_i10 = 0; _i10 < intersects.length; _i10++) {
               if (intersects[_i10].object.name === 'warningObj') break;
@@ -1495,19 +1444,6 @@ var Scene3DViewer = exports["default"] = /*#__PURE__*/function (_React$Component
             }
           }
           gridMatrix.copy(gridPlane.matrixWorld).invert();
-          var addItemToolObj = function addItemToolObj() {
-            var _intersects$_i;
-            var selectedItem = planData.sceneGraph.layers[selectedObject.layerID].items[selectedObject.itemID];
-            if ((0, _util.isUndefined)(selectedItem)) return;
-            selectedElement = _this2.props.state.scene.layers.get(selectedObject.layerID).items.get(selectedObject.itemID);
-            var itemPos = selectedItem.position.clone();
-            if (((_intersects$_i = intersects[_i10]) === null || _intersects$_i === void 0 || (_intersects$_i = _intersects$_i.object) === null || _intersects$_i === void 0 || (_intersects$_i = _intersects$_i.parent) === null || _intersects$_i === void 0 || (_intersects$_i = _intersects$_i.parent) === null || _intersects$_i === void 0 || (_intersects$_i = _intersects$_i.userData) === null || _intersects$_i === void 0 ? void 0 : _intersects$_i.itemId) === selectedItem.userData.itemId) {
-              toolObj.position.set(intersects[_i10].point.x, intersects[_i10].point.y, intersects[_i10].point.z);
-            } else {
-              toolObj.position.set(planData.plan.position.x + itemPos.x, selectedElement.category === 'lighting' ? -planData.plan.position.y - selectedElement.properties.get('height').get('length') : planData.plan.position.y + selectedItem.children[0].position.y, planData.plan.position.z + itemPos.z);
-            }
-            scene3D.add(toolObj);
-          };
           if (Math.abs(mouse.x - _this2.lastMousePosition.x) <= 0.02 && Math.abs(mouse.y - _this2.lastMousePosition.y) <= 0.02 || bMove) {
             if (intersects.length > 0 && !isNaN(intersects[0].distance)) {
               if (intersects[_i10] === undefined) {
@@ -1531,63 +1467,67 @@ var Scene3DViewer = exports["default"] = /*#__PURE__*/function (_React$Component
                 isSelected = true;
                 setTimeout(function () {
                   (0, _sceneCreator.getDistances)(layer);
-                  addItemToolObj();
+                  var selectedItem = planData.sceneGraph.layers[selectedObject.layerID].items[selectedObject.itemID];
+                  if ((0, _util.isUndefined)(selectedItem)) return;
+                  var selItem = _this2.props.state.scene.layers.get(selectedObject.layerID).items.get(selectedObject.itemID);
+                  var itemPos = selectedItem.position.clone();
+                  if (intersects[_i10].object.parent && intersects[_i10].object.parent.parent.userData.itemId === selectedItem.userData.itemId) {
+                    toolObj.position.set(intersects[_i10].point.x, intersects[_i10].point.y, intersects[_i10].point.z);
+                  } else {
+                    toolObj.position.set(planData.plan.position.x + itemPos.x, selItem.category === 'lighting' ? -planData.plan.position.y - selItem.properties.get('height').get('length') : planData.plan.position.y + selectedItem.children[0].position.y, planData.plan.position.z + itemPos.z);
+                  }
+                  scene3D.add(toolObj);
                   _this2.setState({
                     toolObj: toolObj
                   });
                   // showItemButtons(layer.getIn(['items', selectedObject.itemID]), currentObject, event, camera, this.renderer);
-                  var pointArray = [];
-                  // pointArray.push([fVLine[0].userData.distance, 90]);
-                  // pointArray.push([fVLine[1].userData.distance, -90]);
-                  // pointArray.push([fVLine[2].userData.distance, 180]);
-                  // pointArray.push([fVLine[3].userData.distance, 0]);
-                  pointArray = _export.GeometryUtils.calcDistancesFromItemToWalls(selectedElement, layer).PointArray;
+                  var pointArray = [],
+                    cnt = 0;
+                  pointArray.push([_sceneCreator.fVLine[0].userData.distance, 90]);
+                  pointArray.push([_sceneCreator.fVLine[1].userData.distance, -90]);
+                  pointArray.push([_sceneCreator.fVLine[2].userData.distance, 180]);
+                  pointArray.push([_sceneCreator.fVLine[3].userData.distance, 0]);
+                  pointArray.forEach(function (pointElement, index) {
+                    if (pointElement[0] == undefined) pointArray[index][0] = 0;
+                  });
+                  pointArray.forEach(function (pointElement) {
+                    if (pointElement[0] == 0) cnt++;
+                  });
+                  if (cnt == 4 || cnt == 3) {
+                    pointArray[0][0] = 100;
+                    pointArray[1][0] = 100;
+                  }
                   actions.itemsActions.storeDistArray(layer.id, selectedObject.itemID, pointArray);
-                  internalType = internalType ? internalType : _constants.INTERNAL_EVENT_SELECT_ELEMENT;
-                  sendInternalEvent(internalType, selectedElement, pointArray);
                 });
               } else {
                 if (selectedObject) {
-                  var elementID = null;
-                  var elementPrototype = null;
                   switch (true) {
                     case 'holeID' in selectedObject:
-                      elementID = selectedObject.holeID;
-                      elementPrototype = 'holes';
-                      if (_this2.props.state.mode === _constants.MODE_DRAGGING_HOLE_3D) {
+                      if (selObj !== null && selObj !== void 0 && (_selObj$object = selObj.object) !== null && _selObj$object !== void 0 && _selObj$object.name.includes('transHole')) {
                         actions.holesActions.endDraggingHole3D(sPoint.x, sPoint.y);
                       }
                       break;
                     case 'lineID' in selectedObject:
-                      elementID = selectedObject.lineID;
-                      elementPrototype = 'lines';
-                      break;
-                    case 'areaID' in selectedObject:
-                      elementID = selectedObject.areaID;
-                      elementPrototype = 'areas';
+                      if (selObj !== null && selObj !== void 0 && (_selObj$object2 = selObj.object) !== null && _selObj$object2 !== void 0 && _selObj$object2.name.includes('transHole')) {
+                        actions.holesActions.endDraggingHole3D(sPoint.x, sPoint.y);
+                      }
                       break;
                     default:
                       break;
                   }
-                  selectedElement = _this2.props.state.scene.layers.get(selectedObject.layerID).getIn([elementPrototype, elementID]);
                 }
                 isSelected = false;
               }
             } else {
-              var selectedItem = planData.sceneGraph.layers[selectedObject.layerID].items[selectedObject.itemID];
-              if (bMove && !(0, _helper.isEmpty)(selectedItem)) {
-                addItemToolObj();
-              } else {
-                isSelected = false;
-                _this2.context.projectActions.unselectAll();
-                switch (true) {
-                  case 'holeID' in selectedObject:
-                    actions.holesActions.endDraggingHole3D(sPoint.x, sPoint.y);
-                    break;
-                  default:
-                    _this2.context.itemsActions.removeReplacingSupport();
-                    break;
-                }
+              isSelected = false;
+              _this2.context.projectActions.unselectAll();
+              switch (true) {
+                case 'holeID' in selectedObject:
+                  actions.holesActions.endDraggingHole3D(sPoint.x, sPoint.y);
+                  break;
+                default:
+                  _this2.context.itemsActions.removeReplacingSupport();
+                  break;
               }
             }
             bMove = false;
@@ -1608,15 +1548,35 @@ var Scene3DViewer = exports["default"] = /*#__PURE__*/function (_React$Component
             }
             getPoint(event, alti);
             if (bRotate) {
-              addItemToolObj();
+              var _intersects$_i;
+              var selectedItem = planData.sceneGraph.layers[selectedObject.layerID].items[selectedObject.itemID];
+              if ((0, _util.isUndefined)(selectedItem)) return;
+              var selItem = _this2.props.state.scene.layers.get(selectedObject.layerID).items.get(selectedObject.itemID);
+              var itemPos = selectedItem.position.clone();
+              if (((_intersects$_i = intersects[_i10]) === null || _intersects$_i === void 0 || (_intersects$_i = _intersects$_i.object) === null || _intersects$_i === void 0 || (_intersects$_i = _intersects$_i.parent) === null || _intersects$_i === void 0 || (_intersects$_i = _intersects$_i.parent) === null || _intersects$_i === void 0 || (_intersects$_i = _intersects$_i.userData) === null || _intersects$_i === void 0 ? void 0 : _intersects$_i.itemId) === selectedItem.userData.itemId) {
+                toolObj.position.set(intersects[_i10].point.x, intersects[_i10].point.y, intersects[_i10].point.z);
+              } else {
+                toolObj.position.set(planData.plan.position.x + itemPos.x, selItem.category === 'lighting' ? -planData.plan.position.y - selItem.properties.get('height').get('length') : planData.plan.position.y + selectedItem.children[0].position.y, planData.plan.position.z + itemPos.z);
+              }
+              scene3D.add(toolObj);
               _this2.setState({
                 toolObj: toolObj
               });
               _this2.context.itemsActions.endRotatingItem3D(Point.x, Point.y);
               bRotate = false;
-            } else if (bMove) {
+            }
+            if (bMove) {
               bMove = false;
-              addItemToolObj();
+              var _selectedItem = planData.sceneGraph.layers[selectedObject.layerID].items[selectedObject.itemID];
+              if ((0, _util.isUndefined)(_selectedItem)) return;
+              var _selItem = _this2.props.state.scene.layers.get(selectedObject.layerID).items.get(selectedObject.itemID);
+              var _itemPos = _selectedItem.position.clone();
+              if (intersects[_i10].object.parent.parent.userData.itemId === _selectedItem.userData.itemId) {
+                toolObj.position.set(intersects[_i10].point.x, intersects[_i10].point.y, intersects[_i10].point.z);
+              } else {
+                toolObj.position.set(planData.plan.position.x + _itemPos.x, _selItem.category === 'lighting' ? -planData.plan.position.y - _selItem.properties.get('height').get('length') : planData.plan.position.y + _selectedItem.children[0].position.y, planData.plan.position.z + _itemPos.z);
+              }
+              scene3D.add(toolObj);
               _this2.setState({
                 toolObj: toolObj
               });
@@ -1636,7 +1596,7 @@ var Scene3DViewer = exports["default"] = /*#__PURE__*/function (_React$Component
                 _item3D.position.z = targetPoint.z;
                 _item3D.visible = true;
               }
-            } else {}
+            }
             if (bMoveUP) {
               bMoveUP = false;
             }
@@ -1648,7 +1608,6 @@ var Scene3DViewer = exports["default"] = /*#__PURE__*/function (_React$Component
             selectedObj = allItemRect.cur;
           }
         }
-        sendInternalEvent(internalType, selectedElement);
       };
       this.mouseEnterEvent = function (event) {
         if (_this2.props.state.mode !== _constants.MODE_DRAWING_ITEM_3D) return;
@@ -2083,7 +2042,7 @@ var Scene3DViewer = exports["default"] = /*#__PURE__*/function (_React$Component
         if (minDis < snapDelta && !snapFlag) {
           _this2.snap(snapObj, layer);
           snapFlag = true;
-          (0, _sceneCreator.getDistances)(layer);
+          (0, _sceneCreator.getDistances)(layer, true);
           var _i13 = 0;
           for (_i13 = 0; _i13 < _sceneCreator.fVLine.length; _i13++) {
             if (_sceneCreator.fVLine[_i13].userData.distance < snapDelta) {
@@ -2207,7 +2166,7 @@ var Scene3DViewer = exports["default"] = /*#__PURE__*/function (_React$Component
         scene3D = new Three.Scene();
         if ((0, _helper.isElevationView)(state.mode)) scene3D.background = new Three.Color(0xffffff);
         // change color about v1: 0x8791AB, v2: 0xC2C2C2, v3: 0xC3CADC
-        else scene3D.background = new Three.Color(0xe4ebfe); // change color about v1: 0x8791AB, v2: 0xC2C2C2, v3: 0xC3CADC
+        else scene3D.background = new Three.Color(0xc3cadc); // change color about v1: 0x8791AB, v2: 0xC2C2C2, v3: 0xC3CADC
         // scene3D.fog = new Three.Fog(0xC3CADC, 2000, 3500);
         window.scene3D = scene3D;
         // Camera
@@ -2602,7 +2561,7 @@ var Scene3DViewer = exports["default"] = /*#__PURE__*/function (_React$Component
               height: '70px',
               animation: 'spin 2s linear infinite'
             },
-            src: '/assets/img/loading/loading.gif',
+            src: '/assets/img/loading_large.gif',
             alt: "img"
           }));
         } else {
@@ -2616,12 +2575,9 @@ var Scene3DViewer = exports["default"] = /*#__PURE__*/function (_React$Component
           }, /*#__PURE__*/_react["default"].createElement("img", {
             style: {
               animation: 'spin 2s linear infinite',
-              position: "absolute",
-              top: "50%",
-              width: '70px',
-              height: '70px'
+              marginTop: "22%"
             },
-            src: '/assets/img/loading/loading.gif',
+            src: '/assets/img/loading_large.gif',
             alt: "img"
           }));
         }
@@ -2638,11 +2594,9 @@ var Scene3DViewer = exports["default"] = /*#__PURE__*/function (_React$Component
           style: {
             animation: 'spin 2s linear infinite',
             position: "absolute",
-            top: "50%",
-            width: '70px',
-            height: '70px'
+            top: "50%"
           },
-          src: '/assets/img/loading/loading.gif',
+          src: '/assets/img/loading_large.gif',
           alt: "img"
         }));
       } else {