fix: Merge branch 'master' of http://192.168.0.115:3000/bill/fuse-code

public/lib/potree/potree.js

@@ -115022,7 +115022,9 @@ ENDSEC
             
             
             viewer.addEventListener('global_click',(e)=>{
-                if(viewer.inputHandler.selection[0]){//正在平移和旋转，不允许更换
+                if(viewer.inputHandler.selection[0] ||//正在平移和旋转，不允许更换
+                    viewer.scene.cameraAnimations.length  //正在播放
+                ){
                     return
                 }
                 
@@ -127273,7 +127275,7 @@ ENDSEC
                             //console.log(child.matrixWorld.clone())
                             boundingBox.union(child.geometry.boundingBox.clone().applyMatrix4(child.matrixWorld)); //但感觉如果最外层object大小不为1，要还原下scale再乘
                         }//获取在scale为1时，表现出的大小
-                        //Common.makeTexDontResize(child.material.map)
+                        Common.makeTexDontResize(child.material.map);
                         //console.log(child.name, 'roughness',child.material.roughness,'metalness',child.material.metalness)
                         child.material.roughness = 0.6; 
                         child.material.metalness = 0.3; 

src/sdk/cover/index.js

@@ -260,24 +260,11 @@ export const enter = (dom) => {
               position: {x,y,z}
               target: {x,y,z}
               time: number
-              speed: number
-            }
-            sceneGuide = enterSceneGuide(sceneGuidePaths)
-  
-              let posTran = function (position, target) {
-                position = Potree.Utils.datasetPosTransform({ fromDataset: true, position: position, datasetId: Potree.settings.originDatasetId })
-                target = Potree.Utils.datasetPosTransform({ fromDataset: true, position: target, datasetId: Potree.settings.originDatasetId })
-                return { position, target }
+              speed: number //没用到
             } 
-            if (data) {
-                data.points.forEach(e => {
-                    //let { position, target } = posTran(e.position, e.target)
-                    e.position = position
-                    e.target = target
-                })
-            }*/
+            */
             let data = {
-                duration: pathArr.reduce(function(total, currentValue ){return total+currentValue.time}, 0),
+                duration: pathArr.reduce(function(total, currentValue ){return total+currentValue.time}, 0), //总时长
                 points: pathArr
             }
             let animation = editor.createAnimation(data)
@@ -297,27 +284,15 @@ export const enter = (dom) => {
             })
 
             return {
-                bus,
-                /* addPoint(index, position_, target_) {
-                    let { position, target } = posTran(position_, target_)
-                    animation.createControlPoint(index, { position, target })
-                    animation.changeCallback()
-                },
-                deletePoint(index) {
-                    animation.removeControlPoint(index)
-                    animation.changeCallback()
-                }, */
-                play() {
-                    /* var modeOld = Potree.settings.displayMode;
-                    Potree.settings.displayMode = 'showPointCloud' */
+                bus, 
+                play() { 
+                    MergeEditor.selectModel(null)
                     animation.play()
                 },
                 pause() {
                     animation.pause()
                 },
-                /*setDuration(dur) {
-                    animation.setDuration(dur)
-                }, */
+                 
                 clear() {
                     //删除
                     editor.removeAnimation(animation)