From fc96ec3a06629583bd97bb9aa5d929ec1eb9ef88 Mon Sep 17 00:00:00 2001
From: faiface <faiface@ksp.sk>
Date: Sat, 3 Dec 2016 15:48:40 +0100
Subject: [PATCH] add MaskColor uniform
---
pixelgl/attr.go | 2 ++
window.go | 6 ++++--
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/pixelgl/attr.go b/pixelgl/attr.go
index cfae110..5757d20 100644
--- a/pixelgl/attr.go
+++ b/pixelgl/attr.go
@@ -18,6 +18,8 @@ const (
TexCoord
// Transform is an object transformation matrix
Transform
+ // MaskColor is a masking color. When drawing, each color gets multiplied by this color.
+ MaskColor
// IsTexture signals, whether a texture is present.
IsTexture
// NumStandardAttrPurposes is the number of standard attribute purposes
diff --git a/window.go b/window.go
index c6104e2..1ab4a4f 100644
--- a/window.go
+++ b/window.go
@@ -333,6 +333,7 @@ var defaultVertexFormat = pixelgl.VertexFormat{
}
var defaultUniformFormat = pixelgl.UniformFormat{
+ "maskColor": {Purpose: pixelgl.MaskColor, Type: pixelgl.Vec4},
"transform": {Purpose: pixelgl.Transform, Type: pixelgl.Mat3},
"isTexture": {Purpose: pixelgl.IsTexture, Type: pixelgl.Int},
}
@@ -364,14 +365,15 @@ in vec2 TexCoord;
out vec4 color;
+uniform vec4 maskColor;
uniform int isTexture;
uniform sampler2D tex;
void main() {
if (isTexture != 0) {
- color = Color * texture(tex, vec2(TexCoord.x, 1 - TexCoord.y));
+ color = maskColor * Color * texture(tex, vec2(TexCoord.x, 1 - TexCoord.y));
} else {
- color = Color;
+ color = maskColor * Color;
}
}
`
--
GitLab