|
|
@@ -28837,6 +28837,8 @@ window.Modernizr = function(n, e, t) {
|
|
|
this.priorityCriteria.upcomingPanos && this.queueTilesForPanos(r, this.priorityCriteria.upcomingPanos, a, s, n.MAX_UPCOMING_PANOS_TOADD),
|
|
|
this.priorityCriteria.upcomingPanos && this.queueTilesForPanos(r, this.priorityCriteria.upcomingPanos, a, 1024, n.MAX_UPCOMING_PANOS_TOADD), //更清晰些
|
|
|
|
|
|
+
|
|
|
+
|
|
|
i.length = 0,
|
|
|
this.canDownloadSize(l) && this.queueTilesInDirectionForPano(i, a, this.priorityCriteria.pano, l, this.priorityCriteria.cameraPosition, this.priorityCriteria.cameraDir, n.DIRECTIONAL_FOV_NARROW),
|
|
|
n.sortPanoTiles(i, this.priorityCriteria.pano, this.priorityCriteria.cameraDir),
|
|
|
@@ -58692,8 +58694,9 @@ function initTransitionPass(THREE){
|
|
|
|
|
|
const float maxRadius = 0.708; // sqrt(0.5^2+0.5^2)
|
|
|
const float minRadius = 0.0 ;
|
|
|
- float radius = sqrt((vUv.x - 0.5)*(vUv.x - 0.5) + (vUv.y - 0.5)*(vUv.y - 0.5)/screenRatio);
|
|
|
- float diff = 0.15;
|
|
|
+
|
|
|
+ float radius = screenRatio>1.0 ? sqrt((vUv.x - 0.5)*(vUv.x - 0.5) + (vUv.y - 0.5)*(vUv.y - 0.5)/screenRatio) : sqrt((vUv.x - 0.5)*(vUv.x - 0.5)*screenRatio+ (vUv.y - 0.5)*(vUv.y - 0.5));
|
|
|
+ float diff = 0.292; //1.0-maxRadius;
|
|
|
float radiusIn = maxRadius * progress + minRadius * (1.0-progress);
|
|
|
float radiusOut = radiusIn + diff;
|
|
|
if(radius < radiusIn) {
|
xzw