summaryrefslogtreecommitdiff
path: root/intermediate/triangle.glsl
diff options
context:
space:
mode:
Diffstat (limited to 'intermediate/triangle.glsl')
-rw-r--r--intermediate/triangle.glsl19
1 files changed, 17 insertions, 2 deletions
diff --git a/intermediate/triangle.glsl b/intermediate/triangle.glsl
index 04f66d3..beee129 100644
--- a/intermediate/triangle.glsl
+++ b/intermediate/triangle.glsl
@@ -13,20 +13,33 @@ type: vec2
[attribute]
name: colour
type: vec3
+[attribute]
+name: uv
+type: vec2
[interpolator]
name: colour
type: vec3
+[interpolator]
+name: uv
+type: vec2
[target]
name: colour
type: vec4
+
+[texture]
+name: colour_texture
+stage: fragment
+dimension: 2
+
#endif
#ifdef VERTEX_SHADER
void main() {
- interpolator.colour = vec3(colour);
+ interpolator.colour = colour;
+ interpolator.uv = uv;
gl_Position = vec4(position, 0.0, 1.0);
}
@@ -35,7 +48,9 @@ void main() {
#ifdef FRAGMENT_SHADER
void main() {
- colour = vec4(interpolator.colour, 1.0);
+ vec3 c = texture(colour_texture, interpolator.uv).rgb;
+// c *= interpolator.colour;
+ colour = vec4(c, 1.0);
}
#endif