fix: 90

public/static/lib/potree/potree.js

@@ -61558,7 +61558,7 @@
 			if ((node.level % node.pcoGeometry.hierarchyStepSize) === 0) {
 				// let hurl = node.pcoGeometry.octreeDir + "/../hierarchy/" + node.name + ".hrc";
 				let hurl = node.pcoGeometry.octreeDir + '/' + node.getHierarchyPath() + '/' + node.name + '.hrc';
-	            let startLoad = ()=>{
+	            let startLoad = (hurl)=>{
 	                let xhr = XHRFactory.createXMLHttpRequest();
 	                xhr.open('GET', hurl, true);
 	                xhr.responseType = 'arraybuffer';
@@ -61580,6 +61580,10 @@
 	                    console.log('fehler beim laden der punktwolke: ' + e);
 	                } 
 	            }; 
+	            
+	            
+	            Potree.getRealUrl(hurl, startLoad);
+	            
 			}
 		}
 
@@ -71237,10 +71241,10 @@ void main()
 	    if (this.version.equalOrHigher('1.4')) {
 	        url += '.bin';
 	    }
-	    url += '?m='+node.pcoGeometry.timeStamp; //add
+	    //url += '?m='+node.pcoGeometry.timeStamp //add
 	    
 	    
-	    let startLoad = ()=>{
+	    let startLoad = (url)=>{
 	        let xhr = XHRFactory.createXMLHttpRequest();
 	        xhr.open('GET', url, true);
 	        xhr.responseType = 'arraybuffer';
@@ -71264,16 +71268,8 @@ void main()
 	        }
 	    };  
 	    
-	    if(Potree.getFileUrl){//更换url
-	        Potree.getFileUrl(hurl).then(realUrl => {
-	            hurl = realUrl;
-	            startLoad();
-	        });  
-	    }else { 
-	        startLoad();
-	    }
-
-	    
+	     
+	    Potree.getRealUrl(url, startLoad);
 	    
 	};
 
@@ -77271,10 +77267,10 @@ void main()
 	            pco.timeStamp = timeStamp;
 	            
 	             
-	            let startLoad = ()=>{
-	                pco.url = url;
+	            let startLoad = (realUrl)=>{
+	                pco.realUrl = realUrl;
 	                let xhr = XHRFactory.createXMLHttpRequest();
-	                xhr.open('GET', url /* +'?m='+timeStamp */, true);  
+	                xhr.open('GET', realUrl /* +'?m='+timeStamp */, true);  
 
 	                xhr.onreadystatechange = function () {
 	                    if (xhr.readyState === 4 && (xhr.status === 200 || xhr.status === 0)) {
@@ -77388,15 +77384,8 @@ void main()
 	                
 	            };
 	            
-	            if(Potree.getFileUrl){//更换url
-	                Potree.getFileUrl(url).then(realUrl => {
-	                    url = realUrl;
-	                    startLoad();
-	                });  
-	            }else {
-	                
-	                startLoad();
-	            }
+	            Potree.getRealUrl(url, startLoad);
+
 	           
 			} catch (e) {
 				console.log("loading failed: '" + url + "'");
@@ -95810,7 +95799,7 @@ ENDSEC
 	        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`
 	        //console.log('开始下载depthImg', this.id)
 	        
-	        let startLoad = ()=>{
+	        let startLoad = (src)=>{
 	            let texture = texLoader$4.load( src, ()=>{
 	                this.skyboxTex = texture;
 	                this.dispatchEvent({type:'loadedTex',   loaded:true});
@@ -95829,14 +95818,7 @@ ENDSEC
 	            
 	        };
 	        
-	        if(Potree.getFileUrl){//更换url
-	            Potree.getFileUrl(src).then(realUrl => {
-	                src = realUrl;
-	                startLoad();
-	            });  
-	        }else { 
-	            startLoad();
-	        }
+	        Potree.getRealUrl(src, startLoad);
 	        
 		}
 	    
@@ -95851,7 +95833,7 @@ ENDSEC
 	        
 	        //console.log('开始下载depthImg', this.id)
 	        
-	        let startLoad = ()=>{
+	        let startLoad = (src)=>{
 	            
 	            let texture = texLoader$4.load( src, ()=>{
 	                this.depthTex = texture;
@@ -95871,14 +95853,7 @@ ENDSEC
 	            texture.generateMipmaps = false;
 	        };
 	        
-	        if(Potree.getFileUrl){//更换url
-	            Potree.getFileUrl(src).then(realUrl => {
-	                src = realUrl;
-	                startLoad();
-	            });  
-	        }else { 
-	            startLoad();
-	        }
+	        Potree.getRealUrl(src, startLoad);
 	        
 		}
 	 
@@ -141275,7 +141250,16 @@ ENDSEC
 	    console.warn(`%c${str}`, `color:${color};font-size:${fontSize}px`); 
 	}
 
-	 
+	function getRealUrl(url, startLoad){
+	     if(Potree.getFileUrl){//更换url
+	        Potree.getFileUrl(url).then(realUrl => { 
+	            startLoad(realUrl);
+	        });  
+	    }else { 
+	        startLoad(url);
+	    }
+
+	}
 
 	function loadPointCloud$1(path,  timeStamp, callback, onError){
 		let loaded = function(e){
@@ -141503,6 +141487,7 @@ ENDSEC
 	exports.config = config$1;
 	exports.debug = debug;
 	exports.framenumber = framenumber;
+	exports.getRealUrl = getRealUrl;
 	exports.loadFile = loadFile;
 	exports.loadPanos = loadPanos;
 	exports.loadPointCloud = loadPointCloud$1;

src/sdk/laser/core/enter.js

@@ -64,6 +64,8 @@ var enter = ({
         Potree.settings.urls.prefix1 = Potree.settings.urls.prefix3 = staticPrefix;
         Potree.settings.webSite = "wwwroot";
     }
+    
+    
     Potree.getFileUrl = getFileUrl //转化为另一种得到url的方法