Fix panorama()

Author: davepagurek

src/webgl/p5.RendererGL.js

@@ -1838,7 +1838,7 @@ class RendererGL extends Renderer {
     this.sphereMapping.setUniform("uFovY", this.states.curCamera.cameraFOV);
     this.sphereMapping.setUniform("uAspect", this.states.curCamera.aspectRatio);
     this.sphereMapping.setUniform("uNewNormalMatrix", this.scratchMat3.mat3);
-    this.sphereMapping.setUniform("uSampler", img);
+    this.sphereMapping.setUniform("uEnvMap", img);
     return this.sphereMapping;
   }
 

src/webgl/shaders/sphereMapping.frag

@@ -2,7 +2,7 @@
 
 precision highp float;
 
-uniform sampler2D uSampler;
+uniform sampler2D uEnvMap;
 uniform mat3 uNewNormalMatrix;
 uniform float uFovY;
 uniform float uAspect;
@@ -11,7 +11,6 @@ varying vec2 vTexCoord;
 
 void main() {
     float uFovX = uFovY * uAspect; 
-    vec4 newTexColor = texture2D(uSampler, vTexCoord);
     float angleY = mix(uFovY/2.0,  -uFovY/2.0, vTexCoord.y);
     float angleX = mix(uFovX/2.0, -uFovX/2.0, vTexCoord.x);
     vec3 rotatedNormal = vec3( angleX, angleY, 1.0 );
@@ -22,6 +21,6 @@ void main() {
     vec2 suv;
     suv.y = 0.5 + 0.5 * (-rotatedNormal.y);
     suv.x = atan(rotatedNormal.z, rotatedNormal.x) / (2.0 * PI) + 0.5;
-    newTexColor = texture2D(uSampler, suv.xy);
+    vec4 newTexColor = texture2D(uEnvMap, suv.xy);
     gl_FragColor = newTexColor;
 }