fix: 1

public/lib/potree/potree.js

@@ -33626,11 +33626,12 @@
 	      }
 	    });
 	    var click = e => {
+	      var _e$intersect;
 	      //不用"mouseup" 是因为 mouseup有drag object时也会触发 
 	      if (e.clickElement || Potree.settings.unableNavigate || this.flying || !e.isTouch && e.button != MOUSE.LEFT || e.drag && e.drag.object //拖拽结束时不算
 	      /*  || Potree.settings.editType == 'pano' && viewer.modules.PanoEditor.entered */
 	      //||   Potree.settings.editType == 'merge' && !e.intersectPoint || viewer.inputHandler.hoveredElements[0] && viewer.inputHandler.hoveredElements[0].isModel && e.intersectPoint.distance > viewer.inputHandler.hoveredElements[0].distance
-	      || Potree.settings.editType == 'merge' && !Potree.settings.mergeType2
+	      || Potree.settings.editType == 'merge' && !Potree.settings.mergeType2 || Potree.settings.editType == 'merge' && (_e$intersect = e.intersect) !== null && _e$intersect !== void 0 && _e$intersect.object && !e.intersect.object.is4dkkModel
 	      //|| Potree.settings.mergeType2 && Potree.settings.displayMode == 'showPointCloud' 
 	      ) return;
 	      if (Potree.settings.editType != 'pano' && Potree.settings.editType != 'merge') {
@@ -82643,13 +82644,13 @@
 	          if (weight > 0) {
 	            //最多两个
 	            key.action.play();
-	            key.action.paused = true; /* time !=  key.time || delta != void 0 */ //停在某帧 //如果没有点击该动作块的话 不停
+	            key.action.paused = true; //停在某帧 //如果没有点击该动作块的话 不停
 
 	            key.action.tempSW_.weight += weight;
 	            key.tempTime_ >= 0 && (key.action.tempSW_.scale = key.speed); //相同动作不允许叠加速度
-	            //key.action.tempSW_.time += key.tempTime_ 
 
 	            if (key.action.tempSW_.time == null) {
+	              //如果两个动作相同 只需在第一个计算出总和
 	              var timeSum = 0;
 	              key.action.tempSW_.sameLinks.forEach(key_ => {
 	                timeSum += key_.tempTime_ % (key_.action._clip.duration / key_.speed) * key_.speed; //相同动作可能速度不同,算出每个clip的时间  

src/sdk/cover/index.js

@@ -247,9 +247,9 @@ export const enter = ({ dom, mapDom, isLocal, lonlat, scenes, laserRoot, laserOS
      
     viewer.images360.addEventListener('endChangeMode',(e)=>{
         sceneBus.emit('modeChange', {mode: e.mode == 'showPanos' ? 'pano' : 'fuse',  model : e.mode == 'showPanos' && viewer.images360.currentPano.pointcloud.result_} )
-         console.log('emit Changemode', e.mode )
-        Potree.Utils.updateVisible(MergeEditor.transformControls, 'showPanos', e.mode == 'showPointCloud')
-        Potree.Utils.updateVisible(MergeEditor.boxHelper, 'showPanos', e.mode == 'showPointCloud')
+        console.log('emit Changemode', e.mode )
+        //Potree.Utils.updateVisible(MergeEditor.transformControls, 'showPanos', e.mode == 'showPointCloud')
+        //Potree.Utils.updateVisible(MergeEditor.boxHelper, 'showPanos', e.mode == 'showPointCloud')
          
         if(e.mode == 'showPanos'){
             viewer.setControls( viewer.fpControls )
@@ -1695,7 +1695,7 @@ export const enter = ({ dom, mapDom, isLocal, lonlat, scenes, laserRoot, laserOS
                            
                             if(!model.visible)return null
                          
-                            let boundPoints = Potree.Common.getBoundPoints(model.boundingBox, model.modelMatrix)
+                            let boundPoints = Potree.Common.getBoundPoints(model.boundingBox, model.matrixWorld)
                             boundPoints.forEach(e=>{ 
                                 e.pos2d = Potree.Utils.getPos2d(e, viewer.mainViewport , viewer.renderArea, viewer.renderer  )
                             })