xzw 1 ヶ月 前
コミット
f6845f0528
3 ファイル変更9 行追加7 行削除
  1. 1 1
      gulpfile.js
  2. 2 2
      src/custom/modules/panos/Panorama.js
  3. 6 4
      src/custom/viewer/ViewerNew.js

+ 1 - 1
gulpfile.js

@@ -91,7 +91,7 @@ let shaders = [
 gulp.task('webserver', gulp.series(async function() {
 	server = connect.server({
 		port: 1234,
-        host:'192.168.0.113',
+        host:'192.168.0.59',
 		https: false,
 	});
 }));

+ 2 - 2
src/custom/modules/panos/Panorama.js

@@ -97,7 +97,7 @@ class Panorama extends THREE.EventDispatcher{
             1       ifShowMarker(marker显示开关)       unvisible 
             0       pointcloudVisi(隐藏了数据集)       unvisible
          */ 
-         
+       
         this.panosData = o
            
         this.originPosition = new THREE.Vector3().copy(o.pose.translation) 
@@ -192,7 +192,7 @@ class Panorama extends THREE.EventDispatcher{
     loadTex(){ 
         if(this.skyboxTex || this.texLoading)return
         this.texLoading = true
-        let src =  `${Potree.settings.urls.prefix1}/images/${this.originID}.jpg`  //`server\test\SS-t-P1d6CwREny2\${this.id}.jpg`    //`${Potree.settings.urls.prefix1}/${Potree.settings.webSite}/${this.pointcloud.sceneCode}/data/${this.pointcloud.sceneCode}/depthmap/${this.originID}.png`
+        let src =  this.panoData.imageSrc || `${Potree.settings.urls.prefix1}/images/${this.originID}.jpg`  //`server\test\SS-t-P1d6CwREny2\${this.id}.jpg`    //`${Potree.settings.urls.prefix1}/${Potree.settings.webSite}/${this.pointcloud.sceneCode}/data/${this.pointcloud.sceneCode}/depthmap/${this.originID}.png`
         //console.log('开始下载depthImg', this.id)
         
         let startLoad = (src)=>{

+ 6 - 4
src/custom/viewer/ViewerNew.js

@@ -3443,10 +3443,12 @@ export class Viewer extends ViewerBase{
             //是否是俯视或仰视的视角,这样看马路等平面的话尽量每处点云level都一致不要密度不同:
             let floorplanView = viewer.mainViewport.camera.type == 'OrthographicCamera'  
             if(!floorplanView){
-                let pano = this.images360.findNearestPano()
-                let dis = pano?.position.distanceTo(this.mainViewport.camera.position)
-                if(dis > 3) floorplanView = true; //离远一点的平视希望也是全部加载好。勉强只能这么写
-                console.warn('floorplanView',floorplanView)
+                let pano = this.images360.findNearestPano() 
+                if(pano){
+                    let dis = pano.position.distanceTo(this.mainViewport.camera.position)
+                    if(dis > 3) floorplanView = true; //离远一点的平视希望也是全部加载好。勉强只能这么写
+                    console.warn('floorplanView',floorplanView)
+                }
             }    
                  
             let maxTime = floorplanView ? 3000 : 1500;    //注意交通一般要截图两次,先截带测量线的