浏览代码

fix: panoPrefix

xzw 8 月之前
父节点
当前提交
18375adaba
共有 3 个文件被更改,包括 12 次插入10 次删除
  1. 5 4
      public/lib/potree/potree.js
  2. 1 1
      public/lib/potree/potree.js.map
  3. 6 5
      src/sdk/cover/index.js

+ 5 - 4
public/lib/potree/potree.js

@@ -42453,7 +42453,7 @@
 	      fadeFar: this.fadeFar,
 	      transform2D: {
 	        x: 0,
-	        y: 0.3
+	        y: 0.2
 	      } //朝上偏移一些   配合最外层z混合增高
 	    }));
 	    if (hasHoverEvent) {
@@ -42479,7 +42479,7 @@
 	    var index = this.markers.indexOf(marker);
 	    if (this.markerLabels[index]) {
 	      this.markerLabels[index].position.copy(pos);
-	      this.markerLabels[index].position.z += 0.2; //混合增高
+	      this.markerLabels[index].position.z += 0.3; //混合增高
 	      this.markerLabels[index].updatePose();
 	    }
 	  }
@@ -56798,7 +56798,7 @@
 	  setFontSize(fontsize) {
 	    this.titleLabel.fontsize = this.fontsize = fontsize;
 	    this.titleLabel.updateTexture();
-	    this.updateTitlePos();
+	    //this.updateTitlePos()
 	    viewer.dispatchEvent('content_changed');
 	  }
 	  changeSpotScale(s) {
@@ -87106,7 +87106,8 @@
 	  if (sceneCode.includes('/')) {
 	    path = sceneCode;
 	  } else {
-	    path = "https://4dkk.4dage.com/scene_view_data/".concat(sceneCode, "/images/vision.txt");
+	    var prefix = Potree.settings.urls.panoPrefix || 'https://4dkk.4dage.com';
+	    path = "".concat(prefix, "/scene_view_data/").concat(sceneCode, "/images/vision.txt");
 	  }
 	  model.sceneCode = sceneCode;
 	  loadFile(path, {}, data => {

文件差异内容过多而无法显示
+ 1 - 1
public/lib/potree/potree.js.map


+ 6 - 5
src/sdk/cover/index.js

@@ -26,7 +26,7 @@ let cesAspect
 
 
 
-export const enter = ({ dom, mapDom, isLocal, lonlat, scenes, laserRoot, laserOSSRoot, panoOSSRoot }) => {
+export const enter = ({ dom, mapDom, isLocal, lonlat, scenes, laserRoot, laserOSSRoot, panoOSSRoot,ossRoot }) => {
     
     console.warn('新的页面')
     Potree.settings.isOfficial = true //标记为正式、非测试版本 
@@ -68,10 +68,11 @@ export const enter = ({ dom, mapDom, isLocal, lonlat, scenes, laserRoot, laserOS
         Potree.settings.urls.prefix1 = laserOSSRoot 
     }
     if(panoOSSRoot != void 0){
-        Potree.settings.urls.prefix3 = panoOSSRoot
+        Potree.settings.urls.prefix3 = panoOSSRoot //tile
+    }
+    if(ossRoot){
+        Potree.settings.urls.panoPrefix = ossRoot //vision.txt
     }
-    
-    
     const mapBus = mitt(), sceneBus = mitt()
     
     
@@ -1528,7 +1529,7 @@ export const enter = ({ dom, mapDom, isLocal, lonlat, scenes, laserRoot, laserOS
             path.functions = functions
             
             props.line && functions.changeLine(props.line)
-            functions 
+             
             
             return functions