xzw hai 1 ano
pai
achega
9dd43bc70d
Modificáronse 3 ficheiros con 531 adicións e 3039 borrados
  1. 496 3031
      public/static/lib/potree/potree.js
  2. 1 1
      public/static/lib/potree/potree.js.map
  3. 34 7
      src/sdk/laser/core/enter.js

A diferenza do arquivo foi suprimida porque é demasiado grande
+ 496 - 3031
public/static/lib/potree/potree.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 1 - 1
public/static/lib/potree/potree.js.map


+ 34 - 7
src/sdk/laser/core/enter.js

@@ -280,6 +280,10 @@ var enter = ({
                     measure,
                 });
                 viewer.scene.removeMeasurement(measure);
+                
+                if(measure.isBaseLine){
+                    viewer.dispatchEvent({type: 'removeBaseLine', measure})
+                }
             },
             end: () => {
                 //完成 相当于右键
@@ -585,8 +589,12 @@ var enter = ({
                 });
                 //console.log(info)
                 
-                if(measure.isBaseLine && viewer.mainViewport.camera.type != 'OrthographicCamera'){ 
-                    Potree.Utils.updateVisible(measure,'enterOrthoView',false)//基准线仅在正交视图可见
+                if(measure.isBaseLine){ 
+                    if(viewer.mainViewport.camera.type != 'OrthographicCamera'){ 
+                        Potree.Utils.updateVisible(measure,'enterOrthoView',false)//基准线仅在正交视图可见
+                    }
+                    viewer.dispatchEvent({type: 'addBaseLine', measure})
+                    
                 } 
                  
                  
@@ -756,7 +764,7 @@ var enter = ({
 
             screenshot: (width, height) => {
                 //截图
-                console.log('截图1')
+                console.log('截图')
                 let meterPerPixel,
                     isScreenshoting = true;
                 var {
@@ -769,15 +777,12 @@ var enter = ({
                     },
                         width,
                         height);
-                console.log('截图1.1')        
                 finishPromise.done(() => {
                     isScreenshoting = false;
                 });
-                console.log('截图2')
                 if(viewer.mainViewport.camera.type == 'OrthographicCamera'){
                    meterPerPixel = 1 / viewer.mainViewport.camera.zoom
                 }
-                console.log('截图3')
                 return {finishPromise, meterPerPixel};
             },
 
@@ -984,10 +989,32 @@ var enter = ({
 
         leaveTopView(){
             viewer.navCubeViewer.dispatchEvent('leaveTopView')
-        }
+        },
 
 
+        getSceneCropSetting(){ 
+            let boxData = viewer.modules.Clip.getBoxData()
+            return {
+                top : {value:boxData.height, minTop:0, maxTop:10},
+                scale : {value: boxData.scaleXY},
+                rotate :  {value:boxData.rotAngle},
+                rotByUser : {value:boxData.rotByUser}
+            }
+            
+        };
 
+        //设置裁剪值
+        setSceneCropSetting({top,scale,rotate,rotByUser}){
+           
+            viewer.modules.Clip.boxData = {
+                height: top.value,
+                scaleXY: scale.value,
+                rotAngle: rotate.value,
+                rotByUser      
+            }
+            viewer.modules.Clip.getBoxPose()
+            
+        };
     };
     Potree.sdk = sdk;
     return sdk;