xzw il y a 5 mois
Parent
commit
c96a44601e
2 fichiers modifiés avec 41 ajouts et 37 suppressions
  1. 1 1
      gulpfile.js
  2. 40 36
      src/custom/start.js

+ 1 - 1
gulpfile.js

@@ -97,7 +97,7 @@ gulp.task('webserver', gulp.series(async function() {
 	server = connect.server({
 		port: 1234,
         host:'0.0.0.0',
-		https: false,
+		https: true,
         middleware: function(connect, opt) {
           return [
             // 首先,使用addResponseHeaders中间件来设置响应头

+ 40 - 36
src/custom/start.js

@@ -420,45 +420,49 @@ export function start(dom, mapDom, number ){ //t-Zvd3w0m
             
             if(browser.urlHasValue('path')){  //https://192.168.0.59:1234/examples/4dkk.html?m=SG-r0dwv5D8vY8&formal&showAxis&path
                 let fileName =  'pathPointsNew'   
-                Potree.loadFile(Potree.resourcePath+'/' +fileName+'.json', null, (data)=>{
+                setTimeout(()=>{
+                    Potree.loadFile(Potree.resourcePath+'/' +fileName+'.json', null, (data)=>{
                     
-                    console.log(data)
-                    window.pathPoints = data
-                    let points = [] 
-                     
-                    data.forEach((e,i)=>{ 
-                        if(data[i-1] && data[i-1][0] == e[0] && data[i-1][1] == e[1] && data[i-1][2] == e[2]   )return 
-                        //e[2]+=0.2 
-                        let pos = /* Potree.math.convertVector.YupToZup(  */new THREE.Vector3().fromArray(e)/*  ) */
-                        //pos.x *= -1
-                        //pos.y *= -1
-                        let x = pos.x , y = pos.y, z=pos.z
-                        //pos.x = -x, pos.y = -y
-                        
-                        //pos.z *= -1
-                        pos.applyMatrix4(viewer.scene.pointclouds[0].transformMatrix)  //是4dkk场景里坐标 
-                        points.push(pos)
-                    }) 
+                        console.log(data)
+                        window.pathPoints = data
+                        let points = [] 
+                         
+                        data.forEach((e,i)=>{ 
+                            if(data[i-1] && data[i-1][0] == e[0] && data[i-1][1] == e[1] && data[i-1][2] == e[2]   )return 
+                            //e[2]+=0.2 
+                            let pos = /* Potree.math.convertVector.YupToZup(  */new THREE.Vector3().fromArray(e)/*  ) */
+                            //pos.x *= -1
+                            //pos.y *= -1
+                            let x = pos.x , y = pos.y, z=pos.z
+                            //pos.x = -x, pos.y = -y
+                            
+                            //pos.z *= -1
+                            pos.applyMatrix4(viewer.scene.pointclouds[0].transformMatrix)  //是4dkk场景里坐标 
+                            points.push(pos)
+                        }) 
+                            
+                         /* let fakeMeasure ={
+                            "measureType": "Hor MulDistance",  "unit": "metric","color": "#00c8af",
+                            points  , "datasetId": null,  "title": "test path", showDistances:false,
+                            "bus": {
+                                "all": {}
+                            },  
+                        }
+                        viewer.measuringTool.createMeasureFromData(fakeMeasure)
+                        viewer.scene.measurements[0].edgeLabels.forEach(e=>Potree.Utils.updateVisible(e,'f',false,10))
+                        */
+                        let fakeMeasure ={
+                            type : 'Path', "unit": "metric", points, width:0.1
+                        }
+                        let path = viewer.measuringTool.createMeasureFromData(fakeMeasure)
+                        for(let i=0;i<points.length;i++){
+                            path.setMarkerTitle(i,'')
+                        }
                         
-                     /* let fakeMeasure ={
-                        "measureType": "Hor MulDistance",  "unit": "metric","color": "#00c8af",
-                        points  , "datasetId": null,  "title": "test path", showDistances:false,
-                        "bus": {
-                            "all": {}
-                        },  
-                    }
-                    viewer.measuringTool.createMeasureFromData(fakeMeasure)
-                    viewer.scene.measurements[0].edgeLabels.forEach(e=>Potree.Utils.updateVisible(e,'f',false,10))
-                    */
-                    let fakeMeasure ={
-                        type : 'Path', "unit": "metric", points, width:0.1
-                    }
-                    let path = viewer.measuringTool.createMeasureFromData(fakeMeasure)
-                    for(let i=0;i<points.length;i++){
-                        path.setMarkerTitle(i,'')
-                    }
+                    })
                     
-                })
+                },1000)
+                
             }
                 
         }