|
|
@@ -34271,10 +34271,12 @@
|
|
|
} else {
|
|
|
if (toPano.retryUntilArrive) {
|
|
|
//一直试直到可以飞成功
|
|
|
+ //console.log('wait for reFly to pano ', toPano.pano.id)
|
|
|
var retry = e => {
|
|
|
//重飞
|
|
|
if (e.makeIt) {
|
|
|
this.removeEventListener('flyToPanoDone', retry);
|
|
|
+ //console.log('reFly to pano ', toPano.pano.id)
|
|
|
this.flyToPano(toPano);
|
|
|
}
|
|
|
};
|
|
|
@@ -34290,24 +34292,26 @@
|
|
|
toPano.deferred && toPano.deferred.resolve(makeIt); //测量线截图时发现，resolve需要写在flying=false 后才行。
|
|
|
};
|
|
|
if (!toPano.pano.enabled) return done(false, true);
|
|
|
- Potree.Log('hope flyToPano: ' + toPano.pano.id /* , toPano.pano.position.toArray() */);
|
|
|
+ //Potree.Log('hope flyToPano: '+toPano.pano.id/* , toPano.pano.position.toArray() */)
|
|
|
+
|
|
|
if (!toPano.canCancelLast && this.latestToPano && this.latestToPano != toPano && (
|
|
|
//还在飞
|
|
|
this.latestToPano.pano != this.currentPano || !this.isAtPano())) {
|
|
|
//如果旧的toPano只在pano旋转镜头，就直接取消旧的，继续执行
|
|
|
- console.log('还在飞', this.latestToPano.pano.id);
|
|
|
+ //console.log('还在飞', this.latestToPano.pano.id)
|
|
|
return done(false);
|
|
|
}
|
|
|
if (this.currentPano == toPano.pano && this.isAtPano() && !toPano.target && !toPano.quaternion) {
|
|
|
//已在该pano
|
|
|
- console.log('已在该pano', this.currentPano.id);
|
|
|
+ //console.log('已在该pano', this.currentPano.id)
|
|
|
this.dispatchEvent({
|
|
|
type: 'flyToPano',
|
|
|
toPano
|
|
|
});
|
|
|
return done(true);
|
|
|
}
|
|
|
- Potree.Log('flyToPano: ' + toPano.pano.id /*, toPano.pano.position.toArray() this.latestToPano && this.latestToPano.pano.id */);
|
|
|
+ //Potree.Log('flyToPano: '+toPano.pano.id /*, toPano.pano.position.toArray() this.latestToPano && this.latestToPano.pano.id */ )
|
|
|
+
|
|
|
var target = toPano.target;
|
|
|
var config = Potree.config.displayMode[Potree.settings.displayMode];
|
|
|
var pano = toPano.pano;
|
|
|
@@ -50478,6 +50482,7 @@
|
|
|
}
|
|
|
[this.edge, this.endCaps[0].children[0]].forEach(e => {
|
|
|
e.material.color.set(color);
|
|
|
+ e.material.uniforms.maxClipFactor.value = this.selectStates.click ? 0.3 : this.selectStates.hover ? 0.6 : 1;
|
|
|
});
|
|
|
}
|
|
|
removeMarker(index) {
|
xzw