浏览代码

fix: transformControls 渲染问题

xzw 2 年之前
父节点
当前提交
45d618dea9
共有 3 个文件被更改,包括 10 次插入6 次删除
  1. 5 2
      public/lib/potree/potree.js
  2. 1 1
      public/lib/potree/potree.js.map
  3. 4 3
      src/sdk/cover/index.js

+ 5 - 2
public/lib/potree/potree.js

@@ -118256,7 +118256,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 +129381,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); 
                         //点云之前渲染的话隐藏半透明的, 点云之后渲染的话隐藏不透明的
                     } 
                 });

文件差异内容过多而无法显示
+ 1 - 1
public/lib/potree/potree.js.map


+ 4 - 3
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(){//设置比例