1

src/custom/modules/panos/Images360.js

@@ -779,7 +779,7 @@ export class Images360 extends THREE.EventDispatcher{
         let duration = toPano.duration == void 0 ? (T.flyMinTime+Math.min(T.flytimeDistanceMultiplier * dis, maxTime)) : toPano.duration 
          */
         let maxDis = this.isAtPano() ? T.maxDistanceThreshold : T.maxDistanceThresholdFlyIn
-        let duration = Math.min(dis, T.maxDistanceThreshold) * T.flytimeDistanceMultiplier + T.flyMinTime
+        let duration = toPano.duration == void 0 ? Math.min(dis, T.maxDistanceThreshold) * T.flytimeDistanceMultiplier + T.flyMinTime : toPano.duration 
          
         
         

src/custom/viewer/ViewerNew.js

@@ -3478,7 +3478,7 @@ export class Viewer extends ViewerBase{
         
         let screenshot = ()=>{ 
             let pose
-            
+            console.log('screenshot',sid, Date.now())
             useMap && (viewer.mapViewer.needRender = true)
             
             this.needRender = true
@@ -3531,7 +3531,7 @@ export class Viewer extends ViewerBase{
                     if(!this.screenshoting){
                         //Potree.settings.pointNoLimit = false  
                         Potree.settings.pointDensity = 'high'
-                        console.warn('恢复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   
@@ -3652,7 +3652,7 @@ export class Viewer extends ViewerBase{
                 let levels = viewer.scene.pointclouds[0].visibleNodes.map(e=>e.getLevel()) 
                 //console.log(levels)
                 let actMaxLevel = Math.max.apply(null, levels) //实际加载到的最高的node level
-                console.warn('decreaseLevel， 新maxLevel', actMaxLevel - 1, '原maxlevel', viewer.scene.pointclouds[0].maxLevel, 'numVisiblePoints', Potree.numVisiblePoints) 
+                //console.warn('decreaseLevel， 新maxLevel', actMaxLevel - 1, '原maxlevel', viewer.scene.pointclouds[0].maxLevel, 'numVisiblePoints', Potree.numVisiblePoints) 
                 /* viewer.scene.pointclouds[0].maxLevel = actMaxLevel - 1
                 viewer.scene.pointclouds[0].material.oldSize_ = viewer.scene.pointclouds[0].material.size
                 viewer.scene.pointclouds[0].material.size *= 1.5 */
@@ -3662,12 +3662,12 @@ export class Viewer extends ViewerBase{
             }
             
             
-            let maxTime = 3000
+            let maxTime = 2000
             setTimeout(()=>{
                 if(Potree.pointsLoading && Potree.settings.displayMode == 'showPointCloud'){//如果还在加载 
                     
                     viewer.addEventListener('pointsLoaded',()=>{ //点云加载完时（不一定准确） 
-                        if(!finish)console.warn('加载完毕', ' numVisiblePoints', Potree.numVisiblePoints)                         
+                        //if(!finish)console.warn('加载完毕', ' numVisiblePoints', Potree.numVisiblePoints)                         
                         dealDone()
                     },{once:true})
                     let lastNumVisiblePoints  
@@ -3688,7 +3688,7 @@ export class Viewer extends ViewerBase{
                         },maxTime*0.6)
                     } */
                     setTimeout(()=>{//超时不候 
-                        if(!finish)console.warn('超时, numVisiblePoints', Potree.numVisiblePoints)  
+                        //if(!finish)console.warn('超时, numVisiblePoints', Potree.numVisiblePoints)  
                         dealDone()
                     },maxTime)
                 }else{
@@ -3721,7 +3721,7 @@ export class Viewer extends ViewerBase{
                 updateCamera() 
                 if(useMap){
                     let waitMap = ()=>{
-                        //console.log('waitMap: '+sid)
+                        console.log('waitMap: '+sid, Date.now(), this.mapViewer.mapLayer.loadingInProgress ) 
                         this.mapViewer.waitLoadDone(screenshot.bind(this))//等待地图所有加载完 
                     }  
                     

src/custom/viewer/map/MapViewer.js

@@ -162,7 +162,9 @@ export class MapViewer extends ViewerBase{
             callback()
         }else{
             var f = ()=>{
-                callback()
+                setTimeout(()=>{
+                    callback()
+                },500) //等待tex准备好 能渲染出来
                 this.mapLayer.removeEventListener('loadDone', f)
             } 
             this.mapLayer.addEventListener('loadDone', f)  

改bug的历史.txt

@@ -3,6 +3,27 @@
 
 
 
+
+
+2023.11.13
+
+分享测量时地图的tile经常没加载完
+
+
+1先把waitLoadDone里检测到加载完后延迟50ms再执行回调，没用。
+ 
+2后来发现一个bug，flytoPano中duration为0时重新计算了duration，导致地图恢复位置的过程被拉长，此bug修复后恢复1中所改。   但是改完后更严重了0.0。 
+
+3即使加长1中的时间到500ms也一样。
+
+
+
+
+
+
+
+--------------
+
 2023.6.16
 iphone支持 EXT_DEPTH 的 orthoCamera下， paraboloid_point_shape形状的 点云绘制不出。导致无法pick出点云位置