xzw 5 miesięcy temu
rodzic
commit
04de9cdffe

+ 15 - 11
public/lib/potree/potree.js

@@ -22521,21 +22521,25 @@
 	      }
 	      return prefix;
 	    },
-	    setPrefix(num, url) {
-	      this['prefix' + num] = url;
-	      if (num === 1) {
-	        this.laserOSSRoot = url;
-	      } else if (num === 3) {
-	        this.panoOSSRoot = url;
-	      }
-	    },
-	    getPrefix(num, object) {
-	      var prefix, name;
+	    getName(num) {
+	      var name;
 	      if (num === 1) {
 	        name = 'laserOSSRoot';
 	      } else if (num === 3) {
 	        name = 'panoOSSRoot';
+	      } else if (num === 3) {
+	        name = 'panoRoot';
 	      }
+	      return name;
+	    },
+	    setPrefix(num, url) {
+	      //本地版融合有经过次设置
+	      this['prefix' + num] = url;
+	      this[this.getName(num)] = url;
+	    },
+	    getPrefix(num, object) {
+	      var prefix,
+	        name = this.getName(num);
 	      var getFromModel = () => {
 	        var _ref;
 	        var prop = (_ref = object.props || object) === null || _ref === void 0 ? void 0 : _ref.raw;
@@ -89341,7 +89345,7 @@
 	  if (sceneCode.includes('/')) {
 	    path = sceneCode;
 	  } else {
-	    var prefix = Potree.settings.urls.panoPrefix || 'https://4dkk.4dage.com';
+	    var prefix = Potree.settings.urls.getPrefix(8, model) || 'https://4dkk.4dage.com';
 
 	    //path = `${prefix}/swkk/${sceneCode}/wwwroot/scene_view_data/${sceneCode}/images/vision.txt`
 	    if (Potree.settings.urls.templates.vision) {

Plik diff jest za duży
+ 1 - 1
public/lib/potree/potree.js.map


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

@@ -99,7 +99,8 @@ export const enter = ({ dom, mapDom, isLocal, lonlat, scenes, laserRoot, laserOS
     }
     if(panoOSSRoot != void 0){
         Potree.settings.urls.setPrefix(3, panoOSSRoot)  //tile
-        Potree.settings.urls.panoPrefix = panoOSSRoot //vision.txt
+        Potree.settings.urls.setPrefix(8, panoOSSRoot)//vision.txt
+        //Potree.settings.urls.panoPrefix = panoOSSRoot //vision.txt
     }
     /* if(ossRoot){
         Potree.settings.urls.panoPrefix = Potree.settings.urls.handlePrefix(ossRoot) //vision.txt