1

web/public/static/js/main_2020_show.js

@@ -12255,6 +12255,9 @@ window.Modernizr = function(n, e, t) {
             setSize: function(e, t) {
                 this.renderTarget1.setSize(e, t),
                 this.renderTarget2.setSize(e, t)
+                this.passes.forEach(a=>{//add
+                    a.setSize && a.setSize(e, t)
+                })
             }
         }
     }
@@ -26924,19 +26927,19 @@ window.Modernizr = function(n, e, t) {
                     const vec4 BLACK = vec4(0.0, 0.0, 0.0, 1.0);
                     const vec4 GREY  = vec4(0.5, 0.5, 0.5, 1.0);
                     vec4 colorFromPanos;
-                    vec4 colorFromPano0 = textureCube( pano0Map, vWorldPosition0.xyz);
-                    vec4 colorFromPano1 = textureCube( pano1Map, vWorldPosition1.xyz);
-                    if (blackout == 0) {colorFromPanos = mix(colorFromPano0, colorFromPano1, progress);} 
-                    else if (blackout == 1) {
-                        colorFromPanos = mix(colorFromPano0, BLACK, min(1.0, progress*2.0));
-                        colorFromPanos = mix(colorFromPanos, colorFromPano1, max(0.0, progress * 2.0 - 1.0));
-                    }   
-                    else if (blackout == 2) {colorFromPanos = mix(colorFromPano0, BLACK, progress);} 
-                    else if (blackout == 3) {colorFromPanos = mix(BLACK, colorFromPano1, max(0.0, progress * 2.0 - 1.0));} 
-                    else if (blackout == 5) {
-                        colorFromPanos = colorFromPano1;
-                        //colorFromPanos = vec4(1.0,1.0,1.0,1.0);
-                        
+                    if (blackout == 5){
+                        colorFromPanos = textureCube( pano1Map, vWorldPosition1.xyz);
+                    }else{
+                        vec4 colorFromPano0 = textureCube( pano0Map, vWorldPosition0.xyz);
+                        vec4 colorFromPano1 = textureCube( pano1Map, vWorldPosition1.xyz);
+                        if (blackout == 0) {colorFromPanos = mix(colorFromPano0, colorFromPano1, progress);} 
+                        else if (blackout == 1) {
+                            colorFromPanos = mix(colorFromPano0, BLACK, min(1.0, progress*2.0));
+                            colorFromPanos = mix(colorFromPanos, colorFromPano1, max(0.0, progress * 2.0 - 1.0));
+                        }   
+                        else if (blackout == 2) {colorFromPanos = mix(colorFromPano0, BLACK, progress);} 
+                        else if (blackout == 3) {colorFromPanos = mix(BLACK, colorFromPano1, max(0.0, progress * 2.0 - 1.0));} 
+                      
                     }