|
@@ -61479,7 +61479,7 @@
|
|
|
this.pcoGeometry.loader.load(this);
|
|
|
}
|
|
|
|
|
|
- loadHierachyThenPoints(){
|
|
|
+ loadHierachyThenPoints(){//旧的 新的见shim
|
|
|
let node = this;
|
|
|
|
|
|
// load hierarchy
|
|
@@ -61558,31 +61558,27 @@
|
|
|
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 = (hurl)=>{
|
|
|
- let xhr = XHRFactory.createXMLHttpRequest();
|
|
|
- xhr.open('GET', hurl, true);
|
|
|
- xhr.responseType = 'arraybuffer';
|
|
|
- xhr.overrideMimeType('text/plain; charset=x-user-defined');
|
|
|
- xhr.onreadystatechange = () => {
|
|
|
- if (xhr.readyState === 4) {
|
|
|
- if (xhr.status === 200 || xhr.status === 0) {
|
|
|
- let hbuffer = xhr.response;
|
|
|
- callback(node, hbuffer);
|
|
|
- } else {
|
|
|
- console.log('Failed to load file! HTTP status: ' + xhr.status + ', file: ' + hurl);
|
|
|
- Potree.numNodesLoading--;
|
|
|
- }
|
|
|
+
|
|
|
+ let xhr = XHRFactory.createXMLHttpRequest();
|
|
|
+ xhr.open('GET', hurl, true);
|
|
|
+ xhr.responseType = 'arraybuffer';
|
|
|
+ xhr.overrideMimeType('text/plain; charset=x-user-defined');
|
|
|
+ xhr.onreadystatechange = () => {
|
|
|
+ if (xhr.readyState === 4) {
|
|
|
+ if (xhr.status === 200 || xhr.status === 0) {
|
|
|
+ let hbuffer = xhr.response;
|
|
|
+ callback(node, hbuffer);
|
|
|
+ } else {
|
|
|
+ console.log('Failed to load file! HTTP status: ' + xhr.status + ', file: ' + hurl);
|
|
|
+ Potree.numNodesLoading--;
|
|
|
}
|
|
|
- };
|
|
|
- try {
|
|
|
- xhr.send(null);
|
|
|
- } catch (e) {
|
|
|
- console.log('fehler beim laden der punktwolke: ' + e);
|
|
|
- }
|
|
|
- };
|
|
|
-
|
|
|
-
|
|
|
- Potree.getRealUrl(hurl, startLoad);
|
|
|
+ }
|
|
|
+ };
|
|
|
+ try {
|
|
|
+ xhr.send(null);
|
|
|
+ } catch (e) {
|
|
|
+ console.log('fehler beim laden der punktwolke: ' + e);
|
|
|
+ }
|
|
|
|
|
|
}
|
|
|
}
|
|
@@ -72220,28 +72216,33 @@ void main()
|
|
|
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';
|
|
|
- hurl += '?m='+node.pcoGeometry.timeStamp; //add
|
|
|
-
|
|
|
- let xhr = XHRFactory.createXMLHttpRequest();
|
|
|
- xhr.open('GET', hurl, true);
|
|
|
- xhr.responseType = 'arraybuffer';
|
|
|
- xhr.overrideMimeType('text/plain; charset=x-user-defined');
|
|
|
- xhr.onreadystatechange = () => {
|
|
|
- if (xhr.readyState === 4) {
|
|
|
- if (xhr.status === 200 || xhr.status === 0) {
|
|
|
- let hbuffer = xhr.response;
|
|
|
- callback(node, hbuffer);
|
|
|
- } else {
|
|
|
- console.log('Failed to load file! HTTP status: ' + xhr.status + ', file: ' + hurl);
|
|
|
- Potree.numNodesLoading--;
|
|
|
+ //hurl += '?m='+node.pcoGeometry.timeStamp //add
|
|
|
+ let startLoad = (hurl)=>{
|
|
|
+ let xhr = XHRFactory.createXMLHttpRequest();
|
|
|
+ xhr.open('GET', hurl, true);
|
|
|
+ xhr.responseType = 'arraybuffer';
|
|
|
+ xhr.overrideMimeType('text/plain; charset=x-user-defined');
|
|
|
+ xhr.onreadystatechange = () => {
|
|
|
+ if (xhr.readyState === 4) {
|
|
|
+ if (xhr.status === 200 || xhr.status === 0) {
|
|
|
+ let hbuffer = xhr.response;
|
|
|
+ callback(node, hbuffer);
|
|
|
+ } else {
|
|
|
+ console.log('Failed to load file! HTTP status: ' + xhr.status + ', file: ' + hurl);
|
|
|
+ Potree.numNodesLoading--;
|
|
|
+ }
|
|
|
}
|
|
|
- }
|
|
|
- };
|
|
|
- try {
|
|
|
- xhr.send(null);
|
|
|
- } catch (e) {
|
|
|
- console.log('fehler beim laden der punktwolke: ' + e);
|
|
|
- }
|
|
|
+ };
|
|
|
+ try {
|
|
|
+ xhr.send(null);
|
|
|
+ } catch (e) {
|
|
|
+ console.log('fehler beim laden der punktwolke: ' + e);
|
|
|
+ }
|
|
|
+ };
|
|
|
+
|
|
|
+ Potree.getRealUrl(hurl, startLoad);
|
|
|
+
|
|
|
+
|
|
|
}
|
|
|
};
|
|
|
PointCloudOctreeGeometryNode.prototype.loadPoints = function(){
|