xzw hace 1 año
padre
commit
89d4b0a9b2

+ 1 - 1
src/Potree.js

@@ -121,7 +121,7 @@ console.log('Potree ' + version.major + '.' + version.minor + version.suffix);
 export let pointBudget = 1 * 1000 * 1000;
 export let framenumber = 0;
 export let numNodesLoading = 0;
-export let maxNodesLoading = 4;
+export let maxNodesLoading = 6//4;
 
 export const debug = {};
 

+ 3 - 0
src/custom/mergeStartTest.js

@@ -48,6 +48,9 @@ var start = function(dom, mapDom, number, fileServer, webSite){ //t-Zvd3w0m
         
         viewer.transformationTool.setModeEnable('scale',false)
         //viewer.ssaaRenderPass.sampleLevel = 0 //奇怪好像没啥锯齿?  sampleLevel为1 的话,ground就不会
+        
+        viewer.composer.scaleRatio = 1
+        viewer.composer.readTarget = false
     }
     
      

+ 1 - 2
src/custom/modules/mergeModel/MergeEditor.js

@@ -166,8 +166,7 @@ let MergeEditor = {
                 this.showModelOutline(this.selected,!!this.selected)
             } 
         })
-        viewer.fxaaPass.enabled = false//viewer.ssaaRenderPass.enabled = false
-        viewer.composer.scaleRatio = 1
+        viewer.fxaaPass.enabled = false//viewer.ssaaRenderPass.enabled = false 
         viewer.outlinePass.enabled = true
         //Potree.settings.intersectWhenHover = false
         //Potree.Utils.updateVisible(viewer.reticule, 'force', false)

+ 1 - 2
src/custom/modules/panos/Images360.js

@@ -2113,8 +2113,7 @@ export class Images360 extends THREE.EventDispatcher{
                     //重新获取visibleTiles
                     Common.intervalTool.isWaiting(
                         'update4kTiles',
-                        () => {
-                            console.log('update4kTiles')
+                        () => { 
                             let vectorForward = this.getDirection()
                             this.updateTiles(vectorForward)
                         },

+ 10 - 1
src/custom/potree.shim.js

@@ -1470,11 +1470,20 @@ Potree.updateVisibility = function(pointclouds, camera, areaSize){
         
         let maxNodesLoading = Common.getBestCount('unloadedGeometry', viewer.lastFrameChanged?1:3, 6,  4, 15 /*  , true  */ )//dur在iphoneX中静止有7,pc是2  //!lastFrameChanged静止时加速下载
         //THREE.Math.clamp(Math.round(9 - dur), 1, 6 ) 
-        
+        //console.log('maxNodesLoading',)
         //主要在手机端有效果。不改之前在展示的点云较多时前进会卡。
         for (let i = 0; i < Math.min(maxNodesLoading, unloadedGeometry.length); i++) {
             unloadedGeometry[i].node.load(unloadedGeometry[i].pointcloud.pcoGeometry); 
         }   
+        if(!Potree.pointsLoading){
+            Potree.pointsLoading = true
+            //console.log('startLoad')
+        }  
+    }else{
+        if(Potree.pointsLoading){
+            Potree.pointsLoading = false
+            //console.log('load done!')
+        } 
     }