xzw 1 year ago
parent
commit
d4322a6e47
2 changed files with 7 additions and 6 deletions
  1. 6 5
      src/custom/viewer/ViewerNew.js
  2. 1 1
      src/navigation/FirstPersonControlsNew.js

+ 6 - 5
src/custom/viewer/ViewerNew.js

@@ -3221,7 +3221,7 @@ export class Viewer extends ViewerBase{
  
         let viewerMaster = info.map ? this.mapViewer : this; //截图主体
         let useMap = info.type == 'measure' || info.map
-        console.log('startScreenshot',width,height)
+        
         
         if(Potree.settings.displayMode == 'showPanos' && viewer.scene.view.isFlying('pos')){//如果在飞,飞完再截图
             info.getImageDeferred = getImageDeferred , info.finishDeferred = finishDeferred
@@ -3236,7 +3236,7 @@ export class Viewer extends ViewerBase{
         var sid = Date.now()
         //抗锯齿待加 1 post处理 2截图大张再抗锯齿缩小
     
-        console.log('startScreenshot: '+sid)
+        console.warn('startScreenshot: '+sid,width,height)
         
         let updateCamera = ()=>{ 
             this.viewports.forEach(e=>{
@@ -3296,7 +3296,7 @@ export class Viewer extends ViewerBase{
                     if(!this.screenshoting){
                         //Potree.settings.pointNoLimit = false  
                         Potree.settings.pointDensity = 'high'
-                        console.log('恢复pointDensity')
+                        console.warn('恢复pointDensity')
                         if(viewer.scene.pointclouds[0].material.oldSize_ ){
                             viewer.scene.pointclouds[0].material.size = viewer.scene.pointclouds[0].material.oldSize_ 
                             viewer.scene.pointclouds[0].material.oldSize_ = null   
@@ -3305,7 +3305,7 @@ export class Viewer extends ViewerBase{
                 },500) //延迟:避免连续多次截图时释放点云
                 this.screenshoting = false
                 
-                console.log('screenshot done: '+sid)
+                console.warn('screenshot done: '+sid)
             }
             
             {//恢复:
@@ -3465,7 +3465,8 @@ export class Viewer extends ViewerBase{
                             } 
                         },maxTime*0.5)
                         setTimeout(()=>{// 第一次降有可能没效果,因为大部分level不是最高的
-                            if(!finish && (Potree.numVisiblePoints - lastNumVisiblePoints) > -10000  ){ //没怎么降
+                            console.warn('加载时间达最长限制的60%,numVisiblePoints', Potree.numVisiblePoints)        
+                            if(!finish && (Potree.numVisiblePoints - lastNumVisiblePoints) > -20000  ){ //没怎么降
                                 console.warn('加载时间达最长限制的60%,降level, numVisiblePoints', Potree.numVisiblePoints)        
                                 decreaseLevel() //加载时间过长
                             } 

+ 1 - 1
src/navigation/FirstPersonControlsNew.js

@@ -517,7 +517,7 @@ export class FirstPersonControls extends THREE.EventDispatcher {
                 let speed
                 let pano = viewer.images360.findNearestPano()
                 if(!pano){
-                    if(!viewer.bound)return
+                    if(!viewer.bound || viewer.bound.boundSize.x == 0)return
                     let boundFloor = viewer.bound.boundingBox.clone();
                     boundFloor.max.z = boundFloor.min.z
                     speed = boundFloor.distanceToPoint(viewer.mainViewport.view.position)