|
@@ -90340,15 +90340,16 @@ void main() {
|
|
|
|
|
|
}
|
|
|
|
|
|
- deactivateTiledPano(e) {
|
|
|
- var t = this.getActiveRenderTargetDescriptor(e.id);
|
|
|
+ deactivateTiledPano(pano) {
|
|
|
+ var t = this.getActiveRenderTargetDescriptor(pano.id);
|
|
|
if(this.isRenderTargetDescriptorValid(t)){
|
|
|
this.deactiveDescripor(t.renderTarget);
|
|
|
- this.setActiveRenderTargetDescriptor(e.id, null);
|
|
|
+ this.setActiveRenderTargetDescriptor(pano.id, null);
|
|
|
}
|
|
|
- var i = this.getUploadQueueForPano(e.id);
|
|
|
+ var i = this.getUploadQueueForPano(pano.id);
|
|
|
this.clearUploadQueue(i);
|
|
|
this.updateActivePanos();
|
|
|
+ viewer.cancelLoad(pano);//add
|
|
|
}
|
|
|
|
|
|
|
|
@@ -90481,7 +90482,7 @@ void main() {
|
|
|
&& (!(e.panoSize > this.qualityManager.getMaxNavPanoSize())|| this.zoomingActive)) {
|
|
|
|
|
|
var r = this.getUploadQueueForPano(e.panoId);
|
|
|
- console.log(window.sceneName, 'queueTileUpload: ', e.panoId, e.tileIndex, i);
|
|
|
+ //console.log(window.sceneName, 'queueTileUpload: ', e.panoId, e.tileIndex, i)
|
|
|
if(i){
|
|
|
this.uploadTile(e, !1);//提交
|
|
|
}else {
|
|
@@ -91053,7 +91054,7 @@ void main() {
|
|
|
renderTarget = this.zoomRenderTarget;
|
|
|
size = this.zoomRenderTarget.width; //this.qualityManager.getMaxZoomPanoSize(); //放大后可能2048或4096
|
|
|
}
|
|
|
- console.log(window.sceneName, 'uploadTile ', id, tileIndex);
|
|
|
+ //console.log(window.sceneName, 'uploadTile ', id, tileIndex)
|
|
|
|
|
|
|
|
|
let done = ()=>{
|
|
@@ -130993,16 +130994,20 @@ ENDSEC
|
|
|
});
|
|
|
1 === this.waitQueue.length && this.dispatchEvent({type:"loading", show:true});
|
|
|
}
|
|
|
- ifAllLoaded(object){
|
|
|
+ ifAllLoaded(/* object */){
|
|
|
if(this.waitQueue.length>0){
|
|
|
this.waitQueue = this.waitQueue.filter(function(e) {
|
|
|
return !e.isLoadedCallback()
|
|
|
});
|
|
|
- }
|
|
|
-
|
|
|
+ }
|
|
|
0 === this.waitQueue.length && this.dispatchEvent({type:"loading", show:false});
|
|
|
}
|
|
|
-
|
|
|
+ cancelLoad(object){//add 突然出现还没加载完就被deactivateTiledPano但还在loading的情况,所以加了这个
|
|
|
+ this.waitQueue = this.waitQueue.filter(function(e) {
|
|
|
+ return e.object != object
|
|
|
+ });
|
|
|
+ this.ifAllLoaded();
|
|
|
+ }
|
|
|
|
|
|
setView(o={}){
|
|
|
let callback = ()=>{
|