1

src/custom/mergeStartTest.js

@@ -303,7 +303,7 @@ var start = function(dom, mapDom, number, fileServer, webSite){ //t-Zvd3w0m
             target: center,
             duration 
         })  //setView can cancel bump
-         
+        MergeEditor.selectModel(object,true) 
     }
     viewer.setControls(viewer.orbitControls) 
      
@@ -523,8 +523,8 @@ var start = function(dom, mapDom, number, fileServer, webSite){ //t-Zvd3w0m
                 
             }else if(name == 'glb'){
                  
-                let angle = 0
-                let fileName = 'block-远看有裂缝.glb'//'87b3a367bc3e4273832cb4fa398782e5.glb'    
+                //let angle = 0
+                //let fileName = 'block-远看有裂缝.glb'//'87b3a367bc3e4273832cb4fa398782e5.glb'    
                 
                  
                 /* let angle = Math.PI/2
@@ -536,8 +536,8 @@ var start = function(dom, mapDom, number, fileServer, webSite){ //t-Zvd3w0m
                    */
                 
                  
-                /* let angle = 0
-                let fileName = 'cloud_glb_47_loadErrored.glb' //176M  */
+                let angle = 0
+                let fileName = '26k.glb' //176M  
                   
                
                 
@@ -595,10 +595,10 @@ var start = function(dom, mapDom, number, fileServer, webSite){ //t-Zvd3w0m
     }
      
     
-    /* Potree.selectModel = function(name){
+    Potree.selectModel = function(name){
         let model = getModelByName(name) 
-        model && viewer.transformObject(model)
-    } */
+        model && MergeEditor.selectModel(model,true)
+    } 
     
     //Potree.loadDatasets(Potree.loadDatasetsCallback) 
      

src/custom/modules/volumeCompute/VolumeComputer.js

@@ -583,7 +583,7 @@ export default class VolumeComputer extends THREE.EventDispatcher{
                             col.push(null)
                         }else{
                             let z = this.convertColorToHeight(rgb, zMin, zMax) 
-                            let h = z //z - horizonZ
+                            let h = z - horizonZ
                             
                             z < lowest && (lowest = z) //上表面最低点  
                             z > highest && (highest = z) //上表面最高点 

src/navigation/OrbitControlsNew.js

@@ -401,23 +401,23 @@ export class OrbitControls extends THREE.EventDispatcher{
 			let moveDown = this.keys.DOWN.some(e => ih.pressedKeys[e]);
             
              
-              
+            let moveSpeed = this.currentViewport.getMoveSpeed() / 20;
             let px = 0 , py = 0, pz = 0
             if(moveForward){
-                py = 1
+                py = 1 * moveSpeed 
             }else if(moveBackward){
-                py = -1
+                py = -1 * moveSpeed 
             }
             
             if(moveLeft){
-                px = -1
+                px = -1 * moveSpeed 
             }else if(moveRight){
-                px = 1
+                px = 1 * moveSpeed 
             }
             if(moveUp){
-                pz = 1
+                pz = 1 * moveSpeed 
             }else if(moveDown){
-                pz = -1
+                pz = -1 * moveSpeed 
             }
             
             (px!=0 || py!=0 || pz!=0) && view.translate(px, py, pz, true); 

src/viewer/EDLRendererNew.js

@@ -249,8 +249,8 @@ export class EDLRenderer{//Eye-Dome Lighting 眼罩照明
             e.visible = true; 
         })
  
-        Potree.Utils.setCameraLayers(camera, ['pointcloud'])
-        camera.layers.set(Potree.config.renderLayers.pointcloud);
+        Potree.Utils.setCameraLayers(camera, ['pointcloud']) //设置多少都会渲染出来，因为渲染里没有sort
+        //camera.layers.set(Potree.config.renderLayers.pointcloud);
 		
         //TODO adapt to multiple lights
 		//this.renderShadowMap(visiblePointClouds2, camera, lights);  //???????