xzw 7 месяцев назад
Родитель
Сommit
a5bf5d473e
3 измененных файлов с 10 добавлено и 9 удалено
  1. 8 7
      public/lib/potree/potree.js
  2. 1 1
      public/lib/potree/potree.js.map
  3. 1 1
      src/sdk/cover/index.js

+ 8 - 7
public/lib/potree/potree.js

@@ -27120,7 +27120,7 @@
 	    var mapping = Potree.settings.isLocal2 ? '' : this.pointcloud.datasetData.mapping; //非离线包的话加mapping
 	    var src;
 	    if (Potree.settings.urls.templates.depthTex) {
-	      src = Potree.Common.replaceAll(Potree.settings.urls.templates.depthTex, '{sceneCode}', this.pointcloud.sceneCode) + "${this.originID}.png";
+	      src = Potree.Common.replaceAll(Potree.settings.urls.templates.depthTex, '{sceneCode}', this.pointcloud.sceneCode) + "/".concat(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");
 	    }
@@ -88023,12 +88023,13 @@
 	    path = sceneCode;
 	  } else {
 	    var prefix = Potree.settings.urls.panoPrefix || 'https://4dkk.4dage.com';
-	    path = "".concat(prefix, "/swkk/").concat(sceneCode, "/wwwroot/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 = `${prefix}/scene_view_data/${sceneCode}/images/vision.txt`
-	    }  */
+
+	    //path = `${prefix}/swkk/${sceneCode}/wwwroot/scene_view_data/${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


+ 1 - 1
src/sdk/cover/index.js

@@ -71,7 +71,7 @@ export const enter = ({ dom, mapDom, isLocal, lonlat, scenes, laserRoot, laserOS
     if(window.offline){//离线版 
    
         Potree.settings.urls.templates = {
-            depthTex : 'swss\{sceneCode}\www\{sceneCode}\wwwroot\{sceneCode}\data\{sceneCode}\depthmap',
+            depthTex : 'swss/{sceneCode}/www/{sceneCode}/wwwroot/{sceneCode}/data/{sceneCode}/depthmap',
             vision : '/swkk/{sceneCode}/wwwroot/scene_view_data/{sceneCode}/images/vision.txt'
         }
         Potree.fileStorage = {