xzw 3 years ago
parent
commit
430bad0572
4 changed files with 21 additions and 12 deletions
  1. 8 4
      note笔记笔记笔记.txt
  2. 9 4
      src/modules/Images360/Images360.js
  3. 2 2
      src/settings.js
  4. 2 2
      src/viewer/viewer.js

+ 8 - 4
note笔记笔记笔记.txt

@@ -141,7 +141,7 @@ Bug	|
 导航距离很短时,只得到一个点时,地图上的箭头好像偏离了起点终点?  
 导航地图上的margin再检查下 似乎没问题
 
-
+我发现navvis的只要一进测量,细节程度自动变为8.退出后也不还原。(故放大镜里不稀疏) 
 
 
 
@@ -150,14 +150,18 @@ Bug	|
 根据鼠标所在位置来放大。 触屏时根据双指位置来缩放(缩放就是定点平移),全景图也要放大
 
 
-为了适应触屏,测量估计要改成和navvis一样,没完成前不闭合,点击到开始点时才闭合。
-测量的在点击时也要计算,而非dragChange
+试了下双指同时平移和缩放,结果太难了,做不到。但是三个指头平移可以。四指转三指为何漂移
 
+ 
+ 
+我的se打开是空白的!!连调试都不行。不过navvis也是空白
 
 
- 
 
+为了适应触屏,测量估计要改成和navvis一样,没完成前不闭合,点击到开始点时才闭合。
 
+测量的在点击时也要计算,而非dragChange
 
 
 
+检查四倍放大的闪退。手机

+ 9 - 4
src/modules/Images360/Images360.js

@@ -132,7 +132,7 @@ export class Images360 extends EventDispatcher{
         
 
         let click = (e) => {//不用"mouseup" 是因为 mouseup有drag object时也会触发
-            if(Potree.settings.unableNavigate || this.flying  || e.button != THREE.MOUSE.LEFT || e.hoverViewport != viewer.mainViewport )return //
+            if(Potree.settings.unableNavigate || this.flying  || !e.isTouch && e.button != THREE.MOUSE.LEFT || e.hoverViewport != viewer.mainViewport )return //
             
             /* if(currentlyHovered && currentlyHovered.pano){
 				this.focusPano(currentlyHovered.pano);
@@ -315,7 +315,13 @@ export class Images360 extends EventDispatcher{
                             viewport: 
                         }) */
                         viewer.mainViewport.unableChangePos = !config.canLeavePano
+                         
+                        
+                        displayMode = mode
                         
+                        
+                        
+                         
                         if(mode == 'showPanos'){  
                             camera.far = viewer.farWhenShowPano  //修改far
                             Potree.settings.pointDensity = 'panorama'
@@ -333,10 +339,9 @@ export class Images360 extends EventDispatcher{
                             
                         }  
                         camera.updateProjectionMatrix() 
-            
                         
-                        displayMode = mode
-                         
+                        
+                        
                         
                         if(this.elDisplayModel){
                             this.elDisplayModel.value = mode == 'showPointCloud' ? ">>全景" : '>>点云'

+ 2 - 2
src/settings.js

@@ -274,7 +274,7 @@ let settings = {//设置   可修改
     isTest :browser.urlHasValue('test'),
     prefix:getPrefix(),
     pointDensity: '',    UserPointDensity:'',//pointDensity会随着进入不同的模块而自动改变,UserPointDensity记录了用户的设置
-    UserDensityPercent:null,//点云密度百分比
+    UserDensityPercent:null,//点云密度百分比 
     ifShowMarker:true,//显示漫游点
     floorplanType:null,//平面图类型 'default' | 'diy'
     floorplanEnable:false,
@@ -308,7 +308,7 @@ let settings = {//设置   可修改
     },
 }
 
-
+//JSON.parse(localStorage.getItem('setting'))
 
 settings.isLocalhost = settings.prefix.includes('localhost')
 

+ 2 - 2
src/viewer/viewer.js

@@ -541,7 +541,7 @@ export class Viewer extends ViewerBase{
                 e.maxLevel = 12;//先加载到最大的直到测试完毕。由于5个level为一组来加载,所以如果写4最高能加载到5,如果写5最高能加载到下一个级别的最高也就是10
                 //console.log('maxLevel: '+e.maxLevel +  ' testingMaxLevel中 '  )                                
             }else{
-                let percent = Potree.settings.displayMode == 'showPanos' ? config.maxLevelPercent :  (Potree.settings.UserDensityPercent || config.maxLevelPercent)
+                let percent = (Potree.settings.displayMode == 'showPanos') ? config.maxLevelPercent :  (Potree.settings.UserDensityPercent == void 0 ? config.maxLevelPercent : Potree.settings.UserDensityPercent)
                 e.maxLevel = Math.round( percent * e.nodeMaxLevel); 
                 console.log('maxLevel: '+e.maxLevel +  ',   density : '+Potree.settings.pointDensity,  ",  percent :"+percent);
                 
@@ -3267,7 +3267,7 @@ export class Viewer extends ViewerBase{
         }
        
         0 === this.waitQueue.length && this.emit("loading", false) 
-    }
+    } 
     
     
     setView(o={}){