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

public/lib/potree/potree.js

@@ -80366,7 +80366,14 @@ void main() {
              var dir = this.viewport.view.direction;  //相机朝向
              this.camera.position.copy(dir.multiplyScalar(radius).negate());  //相机绕着指南针中心（000）转动
         } 
-        
+
+        changeViewport(viewport){
+            this.viewport = viewport;
+            this.update(); //因相机更新了
+        }
+
+
+
         render(){
             this.renderer.render(this.scene, this.camera);
         }
@@ -80387,6 +80394,8 @@ void main() {
              
         }
         
+        
+        
         setDomPos(){
             if(!this.viewport)return
             let right = this.viewport.left + this.viewport.width;
@@ -118171,12 +118180,14 @@ ENDSEC
             this.transformControls2.view = viewer.viewports[1].view;
             this.transformControls2.camera = viewer.viewports[1].camera;
             this.transformControls2._gizmo.hideAxis = {translate:['x','y'], rotate:['x','y','z'] };
-                
-            viewer.compass.viewport = viewer.viewports[0];
-            viewer.compass.setDomPos();
-            this.secondCompass.viewport = viewer.viewports[1];
+            
+
+            this.secondCompass.changeViewport(viewer.viewports[0]);
             this.secondCompass.setDomPos();
-            this.secondCompass.setDisplay(true);
+            this.secondCompass.setDisplay(true);   
+            viewer.compass.changeViewport(viewer.viewports[1]);
+            viewer.compass.setDomPos();
+            
         },
         
         leaveSplit(){
@@ -118194,7 +118205,8 @@ ENDSEC
             this.transformControls._gizmo.hideAxis = {};
             viewer.setObjectLayers(this.transformControls, 'sceneObjects' );  //恢复
             
-            viewer.compass.viewport = viewer.viewports[0];//恢复
+            
+            viewer.compass.changeViewport(viewer.viewports[0]); //恢复 
             viewer.compass.setDomPos();
             this.secondCompass.setDisplay(false);
             
@@ -118256,7 +118268,10 @@ ENDSEC
             if(state){
                 if(this.selected){
                     if(this.selected == model) return
-                    else this.selectModel(this.selected, false, fitBound, by2d);
+                    else {
+                        this.selectModel(this.selected, false, fitBound, by2d);
+                        this.transformControls.attach(model);
+                    }
                 }
                 this.selected = model;
                  
@@ -129378,7 +129393,7 @@ ENDSEC
                 this.scene.scene.traverse((object)=>{
                     if(object.material){  
                         this.updateVisible(object, 'renderOpa', 
-                            (params.renderBeforeCloud && object.material.opacity<1 || (!params.renderBeforeCloud) && object.material.opacity==1 )? false:true); 
+                            (params.renderBeforeCloud && (object.material.opacity<1 || !object.material.depthTest) || (!params.renderBeforeCloud) && (object.material.opacity==1 && object.material.depthTest))? false:true); 
                         //点云之前渲染的话隐藏半透明的， 点云之后渲染的话隐藏不透明的
                     } 
                 });

src/sdk/cover/index.js

@@ -711,8 +711,7 @@ export const enter = (dom, isLocal) => {
                          
                     }
                 },
-                leaveTransform(){
-                    
+                leaveTransform(){ 
                     
                     if(MergeEditor.split){//分屏校准
                         MergeEditor.setTransformState(null)
@@ -723,9 +722,10 @@ export const enter = (dom, isLocal) => {
                 },
                 
                 enterAlignment(){//开始校准
+                    result.leaveTransform()
                     MergeEditor.enterSplit()
                     
-                    result.leaveTransform()
+                    
                     //console.log('enterAlignment',model.position, model.rotation)
                     let bus = new mitt()
                     
@@ -741,6 +741,7 @@ export const enter = (dom, isLocal) => {
                     MergeEditor.leaveSplit() 
                     
                     MergeEditor.transformControls.detach()
+                    MergeEditor.transformControls2.detach()
                 },
                 
                 enterScaleSet(){//设置比例