Add ColourMult material variable to more materials

rumblesan · Aug 5, 2021 · 0fcd624 · 0fcd624
1 parent 7a4cb0c
commit 0fcd624
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/materials/barycentric.yaml b/materials/barycentric.yaml
@@ -18,8 +18,10 @@ fragmentShader: |
 
   in vec3 Barycentric;
 
+  uniform vec4 ColourMult;
+
   out vec4 finalColour;
 
   void main(void) {
-    finalColour = vec4(Barycentric, 1.0);
+    finalColour = vec4(Barycentric, 1.0) * ColourMult;
   }
diff --git a/materials/ceed.yaml b/materials/ceed.yaml
@@ -22,14 +22,15 @@ fragmentShader: |
   in vec3 Normal;
   in vec3 Barycentric;
 
+  uniform vec4 ColourMult;
   uniform float StrokeSize;
   float ssize = StrokeSize / 2;
 
   out vec4 finalColour;
 
   void main(void) {
     if(Barycentric.x < ssize || Barycentric.y < ssize || Barycentric.z < ssize) {
-      finalColour = vec4( 0.5 * Normal + 0.5, 1.0 );
+      finalColour = vec4( 0.5 * Normal + 0.5, 1.0 ) * ColourMult;
     } else {
       discard;
     }

diff --git a/materials/wobbler.yaml b/materials/wobbler.yaml
@@ -24,6 +24,7 @@ fragmentShader: |
   uniform float Freq;
   uniform float Depth;
   uniform float TextureAlpha;
+  uniform vec4 ColourMult;
 
   out vec4 finalColour;
 
@@ -34,5 +35,5 @@ fragmentShader: |
   }
 
   void main() {
-      finalColour = texture(Texture, Texcoord + wobble(Texcoord, Freq)) * vec4(1, 1, 1, TextureAlpha);
+      finalColour = texture(Texture, Texcoord + wobble(Texcoord, Freq)) * vec4(1, 1, 1, TextureAlpha) * ColourMult;
   }