Przeglądaj źródła

panorama模式点云出错了

xzw 3 lat temu
rodzic
commit
755523583c

+ 1 - 1
src/Potree.js

@@ -181,7 +181,7 @@ export async function loadMapEntity(){
             
         }
         
-        viewer.mapViewer.mapLayer.addMapEntity(data.data || data)
+        viewer.mapViewer.mapLayer.addMapEntity(data.data || data )
     }
     if(Potree.fileServer){
         if(!Potree.settings.floorplanType || !Potree.settings.floorplanEnable)return /* 等待平面图类型定义好会加载 */

+ 3 - 3
src/materials/shaders/pointcloud.vs

@@ -258,8 +258,8 @@ bool isBitSet(int number, int index){
 /**
  * find the LOD at the point position
  */
-float getLOD(){
-	
+float getLOD(){//////
+	 
 	vec3 offset = vec3(0.0, 0.0, 0.0);
 	int iOffset = int(uVNStart);
 	float depth = uLevel;
@@ -1006,7 +1006,7 @@ void main() {
 
     // POINT SIZE
     float pointSize = getPointSize();
-     
+    
     gl_PointSize = pointSize;
     vPointSize = pointSize;
 

+ 2 - 2
src/settings.js

@@ -71,7 +71,7 @@ const config = {//配置参数   不可修改
     },
      
     transitionsTime:{
-        flySpeed : 200,//400, // 毫秒/米
+        flySpeed : 1000 /* 200 */,//400, // 毫秒/米
         panoToPano: 1000,//2000,
         flyIn:1000,
         flyOut:1000,
@@ -131,7 +131,7 @@ const config = {//配置参数   不可修改
     material:{//初始化
         pointSize:0.75,//0.4,
         minSize: 0.1,
-        pointSizeType: 'ADAPTIVE'// 
+        pointSizeType: 'ADAPTIVE'//'ADAPTIVE' \ FIXED 'ATTENUATED'
         //ADAPTIVE : 字会失真扭曲
         //'ATTENUATED' 往旁边看有缝隙、点在浮动
         //navvis的shader在哪里 为什么不会抖动

+ 2 - 2
src/utils/CursorDeal.js

@@ -7,10 +7,10 @@ import Common from './Common'
 
 var CursorDeal = {
     priorityEvent : [//在前面的优先级高
-        {"movePointcloud":'move'},
-        {"markerMove":'grab'},
+        {"movePointcloud":'move'}, 
         {"polygon_isIntersectSelf":'not-allowed'},
         {"polygon_AtWrongPlace":'not-allowed'},
+        {"markerMove":'grab'},
         {'mapClipMove':'move'},
         {'mapClipRotate':`url({Potree.resourcePath}/images/rotate-cursor.png), url({Potree.resourcePath}/images/rotate-cursor.cur),auto`},
         {'rotatePointcloud':`url({Potree.resourcePath}/images/rotate-cursor.png), url({Potree.resourcePath}/images/rotate-cursor.cur),auto`},

+ 1 - 1
src/utils/Measure.js

@@ -344,7 +344,7 @@ export class Measure extends ctrlPolygon{
 
 
     editStateChange(state){ //主要针对edgeLabels显示切换,编辑时显示
-         
+        super.editStateChange(state)
         if(!state){
             this.editStateTimer = setTimeout(()=>{
                 if(!this.isEditing){

+ 6 - 11
src/utils/MeasuringTool.js

@@ -445,7 +445,7 @@ export class MeasuringTool extends EventDispatcher{
             measure.isNew = false
             clearTimeout(timer) 
 			this.viewer.removeEventListener('cancel_insertions', Exit);
-            pressExit && this.viewer.inputHandler.removeEventListener('keydown', pressExit);
+            //pressExit && this.viewer.inputHandler.removeEventListener('keydown', pressExit);
             this.viewer.removeEventListener('global_click', click)
             e.remove || callback && callback() 
             /* this.viewer.dispatchEvent({
@@ -478,24 +478,19 @@ export class MeasuringTool extends EventDispatcher{
         this.viewer.addEventListener('cancel_insertions', Exit);
          
         
-        let pressExit
-        /* if(!Potree.settings.isOfficial){
+        /*let pressExit
+         if(!Potree.settings.isOfficial){
             pressExit = (e)=>{ 
                 if(e.keyCode == 27){//Esc
-                    Exit()
-                    //怎么模拟右键???
+                    //Exit()
+                    //怎么模拟右键???//现由前端发出
                 }
             } 
             this.viewer.inputHandler.addEventListener('keydown', pressExit) 
         } */ 
 		  
           
-        /* var marker = measure.addMarker({point:new THREE.Vector3(0, 0, 0)})
-        this.viewer.inputHandler.startDragging(marker , {endDragFun, notPressMouse:true} ); //notPressMouse代表不是通过按下鼠标来拖拽
-             
-        if(measure.maxMarkers > 1){
-            marker.visible = false
-        }   */          
+                 
         let click = (e)=>{
             
             var marker = measure.addMarker({point:new THREE.Vector3(0, 0, 0)})