1

src/custom/modules/panos/DepthImageSampler.js

@@ -30,7 +30,7 @@ class DepthImageSampler extends THREE.EventDispatcher{
     }
     
     changeImg(img, pano){
-        
+        console.warn('changeImg', pano.id)
         this.pano = pano
         let item = this.imgDatas.find(p=>p.pano == pano) 
         if(/* this.img == img ||  */item){
@@ -42,28 +42,32 @@ class DepthImageSampler extends THREE.EventDispatcher{
             //console.log('重复使用',item.pano.id)
             return
         }
-        
-        viewer.addTimeMark('depthSampler','start')
-        this.canvas.width = img.width 
-        this.canvas.height = img.height 
-        this.context.drawImage(img, 0, 0) 
-        let data = this.context.getImageData(0, 0, img.width , img.height ).data;     //getImageData 1px时 ： pc chrome 耗时0.01毫秒左右（排除第一次的50） , 但firefox: 4。但换贴图之后就多达5甚至几十  
-        //console.log('changeImg',pano.id ) 
-        //this.img = img
-         
-         
-        if(this.imgDatas.length >= this.maxDataCount){
-            let old = this.imgDatas.find(e=>!this.nearPanos.includes(e.pano))   
-            //console.log('推出',old.pano.id)
-            this.imgDatas.splice(this.imgDatas.indexOf(old), 1)//推出使用时间最早的一个非nearPano
-        } 
-        this.imgDatas.push({pano, data})
-        
-        
-        
-        this.dispatchEvent({type:'changeImg',pano})
-        viewer.addTimeMark('depthSampler','end') //耗时chrome 25ms,firefox: 38ms, iphoneX:33ms
-        
+        try{
+            viewer.addTimeMark('depthSampler','start')
+            this.canvas.width = img.width 
+            this.canvas.height = img.height 
+            this.context.drawImage(img, 0, 0) 
+            let data = this.context.getImageData(0, 0, img.width , img.height ).data;     //getImageData 1px时 ： pc chrome 耗时0.01毫秒左右（排除第一次的50） , 但firefox: 4。但换贴图之后就多达5甚至几十  
+            //console.log('changeImg',pano.id ) 
+            //this.img = img
+             
+             
+            if(this.imgDatas.length >= this.maxDataCount){
+                let old = this.imgDatas.find(e=>!this.nearPanos.includes(e.pano))   
+                //console.log('推出',old.pano.id)
+                this.imgDatas.splice(this.imgDatas.indexOf(old), 1)//推出使用时间最早的一个非nearPano
+            } 
+            this.imgDatas.push({pano, data})
+            
+            
+            
+            this.dispatchEvent({type:'changeImg',pano})
+            viewer.addTimeMark('depthSampler','end') //耗时chrome 25ms,firefox: 38ms, iphoneX:33ms
+        }catch(e){
+            console.error(e ); //内存不足  Failed to execute 'getImageData' on 'CanvasRenderingContext2D': Out of memory at ImageData creation
+            return false
+        }
+	        
         
         
          /* pano.depthData = {}

src/custom/modules/panos/Images360.js

@@ -1554,14 +1554,14 @@ Images360.prototype.getNeighbours = function(){ //逐渐自动获取neighbours
         let panos = [this.currentPano, ...nearPanos ]
         this.depthSampler.updateNearPanos(panos)
         
-        let maxWaitDur = browser.isMobile() ? 40 : 60  
-        let changeCount = 0, getCount = 0
+        let maxWaitDur = browser.isMobile() ? 30 : 60  
+        let changeCount = 0, maxChangeTex = browser.isMobile() ? 2 : 4, getCount = 0
         let changeTexCount = ()=>{
             changeCount ++;
-        }
+        } 
         let median = Math.max(10, Potree.timeCollect.depthSampler.median) 
         let ifOverTime = ()=>{ 
-            let is = changeCount * median  +  getCount * 0.01 > maxWaitDur//不换贴图也要一丢丢计算时间 
+            let is = changeCount >= maxChangeTex || changeCount * median  +  getCount * 0.01 > maxWaitDur//不换贴图也要一丢丢计算时间 
             /* if(is){
                 console.log(1)
             } */

src/custom/settings.js

@@ -459,6 +459,6 @@ let settings = {//设置   可修改
 settings.isLocalhost = settings.prefix.includes('localhost')
 Potree.config = config
 Potree.settings = settings
-console.log('2023-1')
+Potree.versionDate = '20231229-0'
  
 export {config, settings}