Browse Source

fix: 整合

xzw 2 years ago
parent
commit
1038152d56
1 changed files with 14 additions and 7 deletions
  1. 14 7
      src/custom/modules/panoEdit/panoEditor.js

+ 14 - 7
src/custom/modules/panoEdit/panoEditor.js

@@ -58,7 +58,11 @@ const cameraProps = [
         axis:["y","z"], 
         direction : new THREE.Vector3(1,0,0), 
         openCount:0,
-    }  
+    },
+    {
+        name : 'mainView',
+        openCount:0,
+    }
 ]   
 
 
@@ -120,7 +124,7 @@ class PanoEditor extends THREE.EventDispatcher{
             this.lineMeshes.name = 'lineMeshes'
             viewer.scene.scene.add(this.lineMeshes)
             
-            
+            Potree.settings.ifShowMarker = false
             
             {
                 this.transformControls = new TransformControls(viewer.mainViewport.camera, viewer.renderArea,{
@@ -193,8 +197,9 @@ class PanoEditor extends THREE.EventDispatcher{
                 e.material.color = pointColor.default 
                  
             })
-            
-            
+            /* viewer.setEDLEnabled(true) //为了降一倍的绘制. 同时用描边增强立体感,弥补点云稀疏
+            viewer.setEDLRadius(3)
+            viewer.setEDLStrength(0.02) */
             
             
             this.switchView('top')
@@ -214,7 +219,7 @@ class PanoEditor extends THREE.EventDispatcher{
             
             viewer.addEventListener('global_click',(e)=>{
                 if(e.button === THREE.MOUSE.RIGHT){//取消旋转和平移
-                     console.log('right click',e)
+                     //console.log('right click',e)
                      this.setLinkOperateState('addLink',false)
                      this.setLinkOperateState('removeLink',false)
                 }else if(this.clickToZoomInEnabled){
@@ -486,8 +491,10 @@ class PanoEditor extends THREE.EventDispatcher{
                 let opaProp = name == 'top' ? opacitys.topView : opacitys.sideView 
                 if(this.selectedPano && this.selectedClouds.includes(e) /* this.selectedPano.pointcloud == e */){
                     e.changePointOpacity(opaProp.selected,true)
+                    e.material.color = pointColor.selected;  
                 }else{
                     e.changePointOpacity(opaProp.default,true)
+                    e.material.color = pointColor.default; 
                 }
                 
             })
@@ -759,7 +766,7 @@ class PanoEditor extends THREE.EventDispatcher{
             })
         })
         
-        console.log('panoLink',this.panoLink)
+        //console.log('panoLink',this.panoLink)
     }
      
     
@@ -1221,7 +1228,7 @@ class PanoEditor extends THREE.EventDispatcher{
             group = this.panoGroup.find(panos=>panos[0].pointcloud.dataset_id == datasetId )
             if(!group)return //要找的数据集的pano全部都孤立了
         }
-        if(!datasetId)return
+        if(datasetId == void 0)return
         let panos = Potree.settings.datasetsPanos[datasetId].panos
         return panos.length == group.length
     }