Переглянути джерело

fix: offline use template url

xzw 7 місяців тому
батько
коміт
32d16a6b31
3 змінених файлів з 27 додано та 6 видалено
  1. 14 5
      public/lib/potree/potree.js
  2. 1 1
      public/lib/potree/potree.js.map
  3. 12 0
      src/sdk/cover/index.js

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

@@ -22458,7 +22458,9 @@
 	    //正式服 线上当前网站接口域名
 	    prefix6: 'https://mix3d.4dkankan.com/backend',
 	    //融合
-	    prefix7: 'https://xfhd.4dkankan.com/backend' //融合      
+	    prefix7: 'https://xfhd.4dkankan.com/backend',
+	    //融合   
+	    templates: {}
 	  },
 	  transitionsTime: {
 	    flyMinTime: 650,
@@ -27116,9 +27118,12 @@
 	    if (!this.pointcloud.hasDepthTex || this.depthTex || this.depthTexLoading) return;
 	    this.depthTexLoading = true;
 	    var mapping = Potree.settings.isLocal2 ? '' : this.pointcloud.datasetData.mapping; //非离线包的话加mapping
-	    var src = "".concat(Potree.settings.urls.prefix1, "/").concat(mapping ? mapping + '/' : '').concat(Potree.settings.webSite, "/").concat(this.pointcloud.sceneCode, "/data/").concat(this.pointcloud.sceneCode, "/depthmap/").concat(this.originID, ".png");
-
-	    //  `${Potree.settings.urls.prefix1}/${Potree.settings.webSite}/${this.pointcloud.sceneCode}/data/${this.pointcloud.sceneCode}/depthmap/${this.originID}.png`
+	    var src;
+	    if (Potree.settings.urls.templates.depthTex) {
+	      src = Potree.Common.replaceAll(Potree.settings.urls.templates.depthTex, '{sceneCode}', this.pointcloud.sceneCode) + "${this.originID}.png";
+	    } else {
+	      src = "".concat(Potree.settings.urls.prefix1, "/").concat(mapping ? mapping + '/' : '').concat(Potree.settings.webSite, "/").concat(this.pointcloud.sceneCode, "/data/").concat(this.pointcloud.sceneCode, "/depthmap/").concat(this.originID, ".png");
+	    }
 	    //console.log('开始下载depthImg', this.id)
 	    var texture = texLoader$3.load(src, () => {
 	      this.depthTex = texture;
@@ -88018,7 +88023,11 @@
 	    path = sceneCode;
 	  } else {
 	    var prefix = Potree.settings.urls.panoPrefix || 'https://4dkk.4dage.com';
-	    path = window.offline ? "".concat(prefix, "/swkk/").concat(sceneCode, "/wwwroot/scene_view_data/").concat(sceneCode, "/images/vision.txt") : "".concat(prefix, "/scene_view_data/").concat(sceneCode, "/images/vision.txt");
+	    if (Potree.settings.urls.templates.vision) {
+	      path = prefix + Potree.Common.replaceAll(Potree.settings.urls.templates.vision, '{sceneCode}', sceneCode);
+	    } else {
+	      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


+ 12 - 0
src/sdk/cover/index.js

@@ -69,6 +69,11 @@ export const enter = ({ dom, mapDom, isLocal, lonlat, scenes, laserRoot, laserOS
         Potree.settings.webSite = 'datav1'
     }
     if(window.offline){//离线版 
+   
+        Potree.settings.urls.templates = {
+            depthTex : 'swss\{sceneCode}\www\{sceneCode}\wwwroot\{sceneCode}\data\{sceneCode}\depthmap',
+            vision : '${prefix}/swkk/{sceneCode}/wwwroot/scene_view_data/{sceneCode}/images/vision.txt'
+        }
         Potree.fileStorage = { 
             get(url){
                 return new Promise(async function(resolve,reject){
@@ -99,6 +104,13 @@ export const enter = ({ dom, mapDom, isLocal, lonlat, scenes, laserRoot, laserOS
     if(ossRoot){
         Potree.settings.urls.panoPrefix = ossRoot //vision.txt
     }
+    
+    
+    
+    
+    
+    
+    
     const mapBus = mitt(), sceneBus = mitt()