gs-bim-air 1.6.1-beta.82 → 1.6.1-beta.83

package/lib/BimAir.common.js

@@ -21532,7 +21532,7 @@ __webpack_require__(/*! core-js/modules/es.array.splice.js */ "./node_modules/co
       var p3 = Longan.GeometryOperators.distancePoint(negXPoint, yAxis, bbLength);
       var p4 = Longan.GeometryOperators.distancePoint(xPoint, yAxis, bbLength);
       cuttingOptions._cuttingPlanes = this._segment.insertCuttingPlanes([p1[0], p1[1], p1[2], p2[0], p2[1], p2[2], p3[0], p3[1], p3[2], p4[0], p4[1], p4[2]]);
-      if (cuttingOptions.componentIds) {
+      if (cuttingOptions.componentIds.length > 0) {
         var childComponents = [];
         this.viewer.structureTreeManager.getComponents(this.treeNodeObject, childComponents);
         childComponents.forEach(function (segObj) {
@@ -21940,6 +21940,15 @@ __webpack_require__(/*! core-js/modules/es.array.splice.js */ "./node_modules/co
       if (this.segment.key != -1) {
         this.viewer.selectionManager.clearAllSelectionAndHighlight();
         this.viewer.updateDisplay();
+        var num_1 = 0;
+        if (treeNode.childNodes) {
+          for (var i = 0; i <= index; i++) {
+            var seg = treeNode.childNodes[0].segment.owner.subsegments.get(i);
+            if (seg.renderingOptions.template) {
+              num_1++;
+            }
+          }
+        }
         var tempPath = (0, gs_viewer_1.JS_Show_Segment_Path)(segment.key);
         var strIndex = tempPath.indexOf("main");
         var segmentPath = tempPath.substring(strIndex, tempPath.length);
@@ -21948,11 +21957,11 @@ __webpack_require__(/*! core-js/modules/es.array.splice.js */ "./node_modules/co
           ops: [{
             op: OpType.Move,
             value: segmentPath,
-            index: index
+            index: index + num_1
           }]
         }]).then(function () {
           _this.moveTo(segment);
-          (0, gs_viewer_1.JS_Set_Key_Index)(_this.segment.key, index);
+          _this.segment.setIndex(index + num_1);
           var originIndex = _this.parent.childNodes.findIndex(function (node) {
             return node.key === _this.key;
           });
@@ -26060,10 +26069,10 @@ __webpack_require__(/*! core-js/modules/es.typed-array.float32-array.js */ "./no
     function ThirdPersonOperator() {
       var _this = _super.call(this) || this;
       _this.typeName = "ThirdPersonOperator";
-      _this.height = 1;
+      _this.height = 1.8;
+      _this.heightOffset = 0.08;
       _this.stepHeight = 0.65;
       _this.speed = 1;
-      _this.distance = 100;
       _this.isGravity = false;
       _this.gravitySpeed = 10;
       _this.isCollision = false;
@@ -26314,7 +26323,8 @@ __webpack_require__(/*! core-js/modules/es.typed-array.float32-array.js */ "./no
       var tempDiret = new Float32Array([0, -1, 0]);
       var matrix = this.personSegment.modellingMatrix.matrix;
       var localVector = Longan.Matrix4.multiplyVector(new Float32Array(matrix), tempDiret);
-      var position = (0, gs_viewer_1.JS_Compute_Ray_Test)(this.viewer.viewKey, tempPos, localVector);
+      var iro = this.viewer.findInstanceObject(this.viewer.renderObject);
+      var position = (0, gs_viewer_1.JS_Compute_Ray_Test)(iro.segment.key, tempPos, localVector);
       if (position) {
         var dis = Longan.Vector.module(Longan.Point.subtract(tempPos, position));
         if (dis < 0.5) {
@@ -26329,9 +26339,10 @@ __webpack_require__(/*! core-js/modules/es.typed-array.float32-array.js */ "./no
     ThirdPersonOperator.prototype.computeGravity = function (pos) {
       var tempPos = new Float64Array(pos);
       var tempDiret = new Float64Array([0, 0, -1]);
-      var position = (0, gs_viewer_1.JS_Compute_Ray_Test)(this.viewer.viewKey, tempPos, tempDiret);
+      var iro = this.viewer.findInstanceObject(this.viewer.renderObject);
+      var position = (0, gs_viewer_1.JS_Compute_Ray_Test)(iro.segment.key, tempPos, tempDiret);
       if (position) {
-        return new Float64Array([position[0], position[1], position[2] + this.height]);
+        return new Float64Array([position[0], position[1], position[2] + this.height + this.heightOffset]);
       } else {
         return null;
       }
@@ -26361,6 +26372,11 @@ __webpack_require__(/*! core-js/modules/es.typed-array.float32-array.js */ "./no
             _this.viewer.options.isShowLoading = false;
             _this.initPerson(ro, origin);
             ro.segment.visibility.setCuttingPlane(false);
+            (0, gs_viewer_1.JS_Open_Segment_By_Key)(ro.segment.key);
+            {
+              (0, gs_viewer_1.JS_Set_Heuristic_Options)("ignore ray test=on");
+            }
+            (0, gs_viewer_1.JS_Close_Segment)();
             var shader = new skinShader_1.SkinShader(ro);
             _this.viewer.updateDisplaySynced();
           });
@@ -26432,7 +26448,6 @@ __webpack_require__(/*! core-js/modules/es.typed-array.float32-array.js */ "./no
       }
     };
     ThirdPersonOperator.prototype.onRButtonDown = function (e) {
-      this.viewer.isBusy = true;
       this.state = viewerOperator_1.CameraOperateState.Rotate;
       this.rButtonDowned = true;
       this.winPos = e.mouseWindowPos();
@@ -26519,7 +26534,8 @@ __webpack_require__(/*! core-js/modules/es.typed-array.float32-array.js */ "./no
       gs_longan_1.DVector.normalize(dir);
       var tempPos = new Float64Array(headPos);
       var tempDir = new Float64Array(dir);
-      var coPosition = (0, gs_viewer_1.JS_Compute_Ray_Test)(this.viewer.renderObject.segment.subsegments.items[0].key, tempPos, tempDir);
+      var iro = this.viewer.findInstanceObject(this.viewer.renderObject);
+      var coPosition = (0, gs_viewer_1.JS_Compute_Ray_Test)(iro.segment.key, tempPos, tempDir);
       if (coPosition) {
         var zero = new Float64Array([0, 0, 0]);
         var resultPoint = new Float64Array(coPosition);
@@ -26529,9 +26545,6 @@ __webpack_require__(/*! core-js/modules/es.typed-array.float32-array.js */ "./no
         var tempDis = gs_longan_1.DVector.module(gs_longan_1.DPoint.subtract(resultPoint, headPos));
         var limitDistance = this.cameraDistance;
         if (tempDis < limitDistance) {
-          var vec = gs_longan_1.DPoint.subtract(resultPoint, headPos);
-          vec = gs_longan_1.DVector.multiply(vec, 0.9);
-          resultPoint = gs_longan_1.DPoint.add(headPos, vec);
           this.camera.position = resultPoint;
           this.camera.target = headPos;
           var up = this.computeUp(headPos, resultPoint);
@@ -26555,13 +26568,16 @@ __webpack_require__(/*! core-js/modules/es.typed-array.float32-array.js */ "./no
       gs_longan_1.DVector.normalize(zAxis);
       return zAxis;
     };
-    ThirdPersonOperator.prototype.getPersonHeadPosition = function () {
+    ThirdPersonOperator.prototype.getPersonHeadPosition = function (yLen) {
+      if (yLen === void 0) {
+        yLen = 0.17;
+      }
       if (this.personSegment != null) {
         var center = new Float64Array(Longan.BoundingBox.center(new Float32Array(this.personSegment.boundingbox)));
         center[2] += this.height / 2 + 0.1;
         var localYAxis = new Float64Array([0, 1, 0]);
         localYAxis = gs_longan_1.DMatrix4.multiplyVector(new Float64Array(this.personSegment.modellingMatrix.matrix), localYAxis);
-        var yOffset = gs_longan_1.DVector.multiply(localYAxis, 0.17);
+        var yOffset = gs_longan_1.DVector.multiply(localYAxis, yLen);
         center = gs_longan_1.DPoint.add(center, yOffset);
         return center;
       } else {
@@ -44106,6 +44122,7 @@ __webpack_require__(/*! core-js/modules/es.array.find.js */ "./node_modules/core
       this.viewer.operatorManager.clear();
       var roam = new thirdPersonOperator_1.ThirdPersonOperator();
       this.viewer.operatorManager.add(roam);
+      this.viewer.cameraLeastNear = 0.01;
       this.recordDynamicMemoryType = this.viewer.dynamicMemory;
       this.viewer.dynamicMemory = segment_1.DynamicMemoryType.None;
       this.cuttingPlaneSegment = this.viewer.utilitySegment.subsegment("CuttingPlane");
@@ -44210,6 +44227,7 @@ __webpack_require__(/*! core-js/modules/es.array.find.js */ "./node_modules/core
     };
     CommandShowThirdPersonRoam.prototype.end = function () {
       var _a;
+      this.viewer.cameraLeastNear = 0.1;
       (_a = this.cuttingPlaneSegment) === null || _a === void 0 ? void 0 : _a.clearGeometries();
       this.clearCutting();
       this.viewer.dynamicMemory = this.recordDynamicMemoryType;
@@ -57506,6 +57524,7 @@ __webpack_require__(/*! core-js/modules/es.array.find.js */ "./node_modules/core
       this._width = 600;
       this._height = 400;
       this._aspectRatio = 1;
+      this.cameraLeastNear = 0.1;
       this._cameraOrientationFixed = false;
       this._smoothTransition = true;
       this._smoothTransitionDuration = 500;
@@ -59265,7 +59284,7 @@ __webpack_require__(/*! core-js/modules/es.array.find.js */ "./node_modules/core
           }
           var min = new Float64Array([bb[0], bb[1], bb[2]]);
           var max = new Float64Array([bb[3], bb[4], bb[5]]);
-          (0, utility_1.CalculateNearFar)(camera, min, max);
+          (0, utility_1.CalculateNearFar)(camera, min, max, this.cameraLeastNear);
         }
       }
       JS_Close_Segment();
@@ -66982,7 +67001,10 @@ __webpack_require__(/*! core-js/modules/esnext.typed-array.with.js */ "./node_mo
     });
   }
   exports.guid = guid;
-  function CalculateNearFar(camera, min, max) {
+  function CalculateNearFar(camera, min, max, cameraLeastNear) {
+    if (cameraLeastNear === void 0) {
+      cameraLeastNear = 0.1;
+    }
     var bbPoints = new Array();
     bbPoints.push(new Float64Array([min[0], min[1], min[2]]));
     bbPoints.push(new Float64Array([min[0], max[1], min[2]]));
@@ -67021,11 +67043,7 @@ __webpack_require__(/*! core-js/modules/esnext.typed-array.with.js */ "./node_mo
       far = 1000;
     }
     if (near < 0) {
-      if (far > 1000) {
-        near = 0.5;
-      } else {
-        near = 0.3;
-      }
+      near = cameraLeastNear;
     }
     (0, gs_viewer_1.JS_Set_Camera_Extent)(near, far);
   }
@@ -99425,6 +99443,7 @@ __webpack_require__(/*! core-js/modules/es.array.find-index.js */ "./node_module
     };
     InterfaceStructureTree.prototype.dropConfirm = function (draggingNode, dropNode, dropType) {
       var _this = this;
+      this.isLoading = true;
       function getIndex(parent, child) {
         for (var i = 0, len = parent.childNodes.length; i < len; i++) {
           var item = parent.childNodes[i];
@@ -99463,7 +99482,9 @@ __webpack_require__(/*! core-js/modules/es.array.find-index.js */ "./node_module
       return draggingTreeNode.moveToIndexWithRequestApi(dropTreeNode, dropSegment, targetSegIndex).then(function () {
         console.log("this.$refs.structureTree ", _this.$refs.structureTree, draggingNode, draggingNode.key, draggingNodeChecked);
         _this.$refs.structureTree.setChecked(draggingNode.key, draggingNodeChecked, true);
-        return _this.updateIndexedDB();
+        return _this.updateIndexedDB().then(function () {
+          _this.isLoading = false;
+        });
       });
     };
     InterfaceStructureTree.prototype.addRenderObjectClick = function () {
@@ -99590,7 +99611,7 @@ __webpack_require__(/*! core-js/modules/es.array.find-index.js */ "./node_module
     };
     InterfaceStructureTree.prototype.updateIndexedDB = function () {
       var treeNode = this.currentTreeNodeData;
-      idb_1.default.getInstance(treeNode.modelId).del(treeNode.modelId + "?v=" + treeNode.model.renderObject.version);
+      return idb_1.default.getInstance(treeNode.modelId).del(treeNode.modelId + "?v=" + treeNode.model.renderObject.version);
     };
     InterfaceStructureTree.prototype.treeNodeMouseOver = function (data) {
       this.treeNodeHoverKey = data.key;
@@ -163129,7 +163150,7 @@ module.exports = JSON.parse('{"name":"axios","version":"0.21.4","description":"P
 /***/ (function(module) {
 
 "use strict";
-module.exports = JSON.parse('{"name":"gs-bim-air","version":"1.6.1-beta.82","description":"发布的基于gs-longan的图形显示控件","main":"lib/BimAir.umd.min.js","types":"types/index.d.ts","author":"","license":"ISC","scripts":{"publish":"npm publish ","publishAlpha":"npm publish --tag=alpha","publishBeta":"npm publish --tag=beta","publishBeta2":"npm publish --tag=beta2","typedoc":"typedoc --plugin typedoc-plugin-markdown"},"dependencies":{},"devDependencies":{}}');
+module.exports = JSON.parse('{"name":"gs-bim-air","version":"1.6.1-beta.83","description":"发布的基于gs-longan的图形显示控件","main":"lib/BimAir.umd.min.js","types":"types/index.d.ts","author":"","license":"ISC","scripts":{"publish":"npm publish ","publishAlpha":"npm publish --tag=alpha","publishBeta":"npm publish --tag=beta","publishBeta2":"npm publish --tag=beta2","typedoc":"typedoc --plugin typedoc-plugin-markdown"},"dependencies":{},"devDependencies":{}}');
 
 /***/ }),