Merge remote-tracking branch 'upstream/webgpu' into webgpu

Author: lukeplowden

src/core/p5.Renderer3D.js

@@ -1499,17 +1499,20 @@ export class Renderer3D extends Renderer {
     );
 
     // TODO: sum these here...
-    const ambientLightCount = this.states.ambientLightColors.length / 3;
-    this.mixedAmbientLight = [...this.states.ambientLightColors];
-
-    if (this.states._useMetalness > 0) {
-      this.mixedAmbientLight = this.mixedAmbientLight.map((ambientColors) => {
-        let mixing = ambientColors - this.states._useMetalness;
-        return Math.max(0, mixing);
-      });
+    let mixedAmbientLight = [0, 0, 0];
+    for (let i = 0; i < this.states.ambientLightColors.length; i += 3) {
+      for (let off = 0; off < 3; off++) {
+        if (this.states._useMetalness > 0) {
+          mixedAmbientLight[off] += Math.max(
+            0,
+            this.states.ambientLightColors[i + off] - this.states._useMetalness
+          );
+        } else {
+          mixedAmbientLight[off] += this.states.ambientLightColors[i + off];
+        }
+      }
     }
-    fillShader.setUniform("uAmbientLightCount", ambientLightCount);
-    fillShader.setUniform("uAmbientColor", this.mixedAmbientLight);
+    fillShader.setUniform("uAmbientColor", mixedAmbientLight);
 
     const spotLightCount = this.states.spotLightDiffuseColors.length / 3;
     fillShader.setUniform("uSpotLightCount", spotLightCount);

src/webgl/light.js

@@ -1620,6 +1620,8 @@ function light(p5, fn){
     angle,
     concentration
   ) {
+    if (this.states.spotLightDiffuseColors.length / 3 >= 4) return;
+
     let color, position, direction;
     const length = arguments.length;
 
@@ -1777,18 +1779,26 @@ function light(p5, fn){
         return;
     }
     this.states.setValue('spotLightDiffuseColors', [
+      ...this.states.spotLightDiffuseColors,
       color._array[0],
       color._array[1],
       color._array[2]
     ]);
 
     this.states.setValue('spotLightSpecularColors', [
+      ...this.states.spotLightSpecularColors,
       ...this.states.specularColors
     ]);
 
-    this.states.setValue('spotLightPositions', [position.x, position.y, position.z]);
+    this.states.setValue('spotLightPositions', [
+      ...this.states.spotLightPositions,
+      position.x,
+      position.y,
+      position.z
+    ]);
     direction.normalize();
     this.states.setValue('spotLightDirections', [
+      ...this.states.spotLightDirections,
       direction.x,
       direction.y,
       direction.z
@@ -1808,8 +1818,8 @@ function light(p5, fn){
     }
 
     angle = this._pInst._toRadians(angle);
-    this.states.setValue('spotLightAngle', [Math.cos(angle)]);
-    this.states.setValue('spotLightConc', [concentration]);
+    this.states.setValue('spotLightAngle', [...this.states.spotLightAngle, Math.cos(angle)]);
+    this.states.setValue('spotLightConc', [...this.states.spotLightConc, concentration]);
 
     this.states.setValue('enableLighting', true);
   }

src/webgl/p5.Shader.js

@@ -976,14 +976,18 @@ class Shader {
    * </code>
    * </div>
    */
-  setUniform(uniformName, data) {
+  setUniform(uniformName, rawData) {
     this.init();
 
     const uniform = this.uniforms[uniformName];
     if (!uniform) {
       return;
     }
 
+    const data = this._renderer._mapUniformData
+      ? this._renderer._mapUniformData(uniform, rawData)
+      : rawData;
+
     if (uniform.isArray) {
       if (
         uniform._cachedData &&

src/webgl/shaders/basic.frag

@@ -1,6 +1,7 @@
 IN vec4 vColor;
 void main(void) {
   HOOK_beforeFragment();
-  OUT_COLOR = HOOK_getFinalColor(vec4(vColor.rgb, 1.) * vColor.a);
+  OUT_COLOR = HOOK_getFinalColor(vColor);
+  OUT_COLOR.rgb *= OUT_COLOR.a; // Premultiply alpha before rendering
   HOOK_afterFragment();
 }

src/webgl/shaders/lighting.glsl

@@ -7,8 +7,6 @@ uniform mat4 uViewMatrix;
 
 uniform bool uUseLighting;
 
-uniform int uAmbientLightCount;
-uniform vec3 uAmbientColor[5];
 uniform mat3 uCameraRotation;
 uniform int uDirectionalLightCount;
 uniform vec3 uLightingDirection[5];

src/webgl/shaders/phong.frag

@@ -2,6 +2,7 @@
 precision highp int;
 
 uniform bool uHasSetAmbient;
+uniform vec3 uAmbientColor;
 uniform vec4 uSpecularMatColor;
 uniform vec4 uAmbientMatColor;
 uniform vec4 uEmissiveMatColor;
@@ -13,7 +14,6 @@ uniform bool isTexture;
 IN vec3 vNormal;
 IN vec2 vTexCoord;
 IN vec3 vViewPosition;
-IN vec3 vAmbientColor;
 IN vec4 vColor;
 
 struct ColorComponents {
@@ -45,7 +45,7 @@ void main(void) {
   Inputs inputs;
   inputs.normal = normalize(vNormal);
   inputs.texCoord = vTexCoord;
-  inputs.ambientLight = vAmbientColor;
+  inputs.ambientLight = uAmbientColor;
   inputs.color = isTexture
       ? TEXTURE(uSampler, vTexCoord) * (vec4(uTint.rgb/255., 1.) * uTint.a/255.)
       : vColor;
@@ -67,7 +67,6 @@ void main(void) {
 
   // Calculating final color as result of all lights (plus emissive term).
 
-  vec2 texCoord = inputs.texCoord;
   vec4 baseColor = inputs.color;
   ColorComponents c;
   c.opacity = baseColor.a;

src/webgl/shaders/phong.vert

@@ -7,8 +7,6 @@ IN vec3 aNormal;
 IN vec2 aTexCoord;
 IN vec4 aVertexColor;
 
-uniform vec3 uAmbientColor[5];
-
 #ifdef AUGMENTED_HOOK_getWorldInputs
 uniform mat4 uModelMatrix;
 uniform mat4 uViewMatrix;
@@ -19,7 +17,6 @@ uniform mat4 uModelViewMatrix;
 uniform mat3 uNormalMatrix;
 #endif
 uniform mat4 uProjectionMatrix;
-uniform int uAmbientLightCount;
 
 uniform bool uUseVertexColor;
 uniform vec4 uMaterialColor;
@@ -74,14 +71,6 @@ void main(void) {
   vNormal = inputs.normal;
   vColor = inputs.color;
 
-  // TODO: this should be a uniform
-  vAmbientColor = vec3(0.0);
-  for (int i = 0; i < 5; i++) {
-    if (i < uAmbientLightCount) {
-      vAmbientColor += uAmbientColor[i];
-    }
-  }
-
   gl_Position = uProjectionMatrix * vec4(inputs.position, 1.);
   HOOK_afterVertex();
 }