|
@@ -97383,14 +97383,24 @@ ENDSEC
|
|
|
//Potree.Log('hope flyToPano: '+toPano.pano.id )
|
|
|
|
|
|
|
|
|
- if(this.latestToPano && this.latestToPano != toPano && this.latestToPano.pano != this.currentPano){//还在飞//如果旧的toPano只是旋转镜头,就直接取消旧的
|
|
|
+
|
|
|
+ //如果旧的toPano只是旋转镜头,就直接取消旧的
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+ if(this.latestToPano && this.latestToPano != toPano && (//还在飞
|
|
|
+ this.latestToPano.pano != this.currentPano || !this.isAtPano())){//如果旧的toPano只在pano旋转镜头,就直接取消旧的,继续执行
|
|
|
return done(false)
|
|
|
}
|
|
|
- //Potree.Log('flyToPano: '+toPano.pano.id, this.latestToPano && this.latestToPano.pano.id )
|
|
|
+
|
|
|
if(this.currentPano == toPano.pano && this.isAtPano() && !toPano.target && !toPano.quaternion ){
|
|
|
+ //已在该pano
|
|
|
this.dispatchEvent({type:'flyToPano', toPano});
|
|
|
return done(true);
|
|
|
}
|
|
|
+
|
|
|
+ //Potree.Log('flyToPano: '+toPano.pano.id, this.latestToPano && this.latestToPano.pano.id )
|
|
|
+
|
|
|
|
|
|
let target = toPano.target;
|
|
|
let config = Potree.config.displayMode[Potree.settings.displayMode];
|