Merge pull request #8706 from YuktiNandwana/feature/finalColor-texCoord-2.0

feat(webgl): add texCoord parameter to getFinalColor hook

Author: davepagurek

src/webgl/p5.RendererGL.js

@@ -723,7 +723,7 @@ class RendererGL extends Renderer3D {
                 color.a = components.opacity;
                 return color;
               }`,
-              "vec4 getFinalColor": "(vec4 color) { return color; }",
+              "vec4 getFinalColor": "(vec4 color, vec2 texCoord) { return color; }",
               "void afterFragment": "() {}",
             },
           }
@@ -760,7 +760,7 @@ class RendererGL extends Renderer3D {
           },
           fragment: {
             "void beforeFragment": "() {}",
-            "vec4 getFinalColor": "(vec4 color) { return color; }",
+            "vec4 getFinalColor": "(vec4 color, vec2 texCoord) { return color; }",
             "void afterFragment": "() {}",
           },
         }
@@ -788,7 +788,7 @@ class RendererGL extends Renderer3D {
           },
           fragment: {
             "void beforeFragment": "() {}",
-            "vec4 getFinalColor": "(vec4 color) { return color; }",
+            "vec4 getFinalColor": "(vec4 color, vec2 texCoord) { return color; }",
             "void afterFragment": "() {}",
           },
         }
@@ -820,7 +820,7 @@ class RendererGL extends Renderer3D {
           fragment: {
             "void beforeFragment": "() {}",
             "Inputs getPixelInputs": "(Inputs inputs) { return inputs; }",
-            "vec4 getFinalColor": "(vec4 color) { return color; }",
+            "vec4 getFinalColor": "(vec4 color, vec2 texCoord) { return color; }",
             "bool shouldDiscard": "(bool outside) { return outside; }",
             "void afterFragment": "() {}",
           },

src/webgl/p5.Shader.js

@@ -172,7 +172,7 @@ class Shader {
    *                 color.a = components.opacity;
    *                 return color;
    *               }
-   * vec4 getFinalColor(vec4 color) { return color; }
+   * vec4 getFinalColor(vec4 color, vec2 texCoord) { return color; }
    * void afterFragment() {}
    * ```
    *

src/webgl/shaders/basic.frag

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

src/webgl/shaders/line.frag

@@ -69,6 +69,6 @@ void main() {
       discard;
     }
   }
-  OUT_COLOR = HOOK_getFinalColor(vec4(inputs.color.rgb, 1.) * inputs.color.a);
+  OUT_COLOR = HOOK_getFinalColor(vec4(inputs.color.rgb, 1.) * inputs.color.a, vec2(0.0, 0.0));
   HOOK_afterFragment();
 }

src/webgl/shaders/normal.frag

@@ -1,6 +1,7 @@
 IN vec3 vVertexNormal;
+IN highp vec2 vVertTexCoord;
 void main(void) {
   HOOK_beforeFragment();
-  OUT_COLOR = HOOK_getFinalColor(vec4(vVertexNormal, 1.0));
+  OUT_COLOR = HOOK_getFinalColor(vec4(vVertexNormal, 1.0), vVertTexCoord);
   HOOK_afterFragment();
-}
+}

src/webgl/shaders/phong.frag

@@ -77,7 +77,7 @@ void main(void) {
   c.ambient = inputs.ambientLight;
   c.specular = specular;
   c.emissive = inputs.emissiveMaterial;
-  OUT_COLOR = HOOK_getFinalColor(HOOK_combineColors(c));
+  OUT_COLOR = HOOK_getFinalColor(HOOK_combineColors(c), vTexCoord);
   OUT_COLOR.rgb *= OUT_COLOR.a; // Premultiply alpha before rendering
   HOOK_afterFragment();
 }

src/webgpu/p5.RendererWebGPU.js

@@ -2345,7 +2345,7 @@ function rendererWebGPU(p5, fn) {
                 rgb += components.emissive;
                 return vec4<f32>(rgb, components.opacity);
               }`,
-              "vec4f getFinalColor": "(color: vec4<f32>) { return color; }",
+              "vec4f getFinalColor": "(color: vec4<f32>, texCoord: vec2<f32>) { return color; }",
               "void afterFragment": "() {}",
             },
           }
@@ -2370,7 +2370,7 @@ function rendererWebGPU(p5, fn) {
             },
             fragment: {
               "void beforeFragment": "() {}",
-              "vec4<f32> getFinalColor": "(color: vec4<f32>) { return color; }",
+              "vec4<f32> getFinalColor": "(color: vec4<f32>, texCoord: vec2<f32>) { return color; }",
               "void afterFragment": "() {}",
             },
           }
@@ -2396,7 +2396,7 @@ function rendererWebGPU(p5, fn) {
             fragment: {
               "void beforeFragment": "() {}",
               "Inputs getPixelInputs": "(inputs: Inputs) { return inputs; }",
-              "vec4<f32> getFinalColor": "(color: vec4<f32>) { return color; }",
+              "vec4<f32> getFinalColor": "(color: vec4<f32>, texCoord: vec2<f32>) { return color; }",
               "bool shouldDiscard": "(outside: bool) { return outside; };",
               "void afterFragment": "() {}",
             },

src/webgpu/shaders/color.js

@@ -119,7 +119,7 @@ ${uniforms}
 @fragment
 fn main(input: FragmentInput) -> @location(0) vec4<f32> {
   HOOK_beforeFragment();
-  var outColor = HOOK_getFinalColor(input.vColor);
+  var outColor = HOOK_getFinalColor(input.vColor, input.vVertTexCoord);
   outColor = vec4<f32>(outColor.rgb * outColor.a, outColor.a);
   HOOK_afterFragment();
   return outColor;

src/webgpu/shaders/line.js

@@ -362,7 +362,7 @@ fn main(input: StrokeFragmentInput) -> @location(0) vec4<f32> {
       discard;
     }
   }
-  var col = HOOK_getFinalColor(inputs.color);
+  var col = HOOK_getFinalColor(inputs.color, vec2<f32>(0.0, 0.0));
   col = vec4<f32>(col.rgb, 1.0) * col.a;
   HOOK_afterFragment();
   return vec4<f32>(col);

src/webgpu/shaders/material.js

@@ -416,9 +416,9 @@ fn main(input: FragmentInput) -> @location(0) vec4<f32> {
     inputs.emissiveMaterial
   );
 
-  var outColor = HOOK_getFinalColor(
-    HOOK_combineColors(components)
-  );
+   var outColor = HOOK_getFinalColor(
+     HOOK_combineColors(components), input.vTexCoord
+   );
   outColor = vec4<f32>(outColor.rgb * outColor.a, outColor.a);
   HOOK_afterFragment();
   return outColor;