diff options
Diffstat (limited to '')
-rw-r--r-- | res/images/awesomeface.png | bin | 0 -> 59277 bytes | |||
-rw-r--r-- | res/images/container.jpg | bin | 0 -> 184939 bytes | |||
-rw-r--r-- | res/shaders/triangle.fs | 14 | ||||
-rw-r--r-- | res/shaders/triangle.vs | 14 |
4 files changed, 28 insertions, 0 deletions
diff --git a/res/images/awesomeface.png b/res/images/awesomeface.png new file mode 100644 index 0000000..9840caf --- /dev/null +++ b/res/images/awesomeface.png Binary files differdiff --git a/res/images/container.jpg b/res/images/container.jpg new file mode 100644 index 0000000..d07bee4 --- /dev/null +++ b/res/images/container.jpg Binary files differdiff --git a/res/shaders/triangle.fs b/res/shaders/triangle.fs new file mode 100644 index 0000000..70a5f6d --- /dev/null +++ b/res/shaders/triangle.fs @@ -0,0 +1,14 @@ +#version 330 core + +out vec4 FragColor; + +in vec3 our_color; +in vec2 TexCoord; + +uniform sampler2D texture1; +uniform sampler2D texture2; + +void main() +{ + FragColor = mix(texture(texture1, TexCoord), texture(texture2, TexCoord), 0.2); +} diff --git a/res/shaders/triangle.vs b/res/shaders/triangle.vs new file mode 100644 index 0000000..57cbc74 --- /dev/null +++ b/res/shaders/triangle.vs @@ -0,0 +1,14 @@ +#version 330 core +layout (location = 0) in vec3 a_pos; +layout (location = 1) in vec3 a_color; +layout (location = 2) in vec2 a_tex_coord; + +out vec3 our_color; +out vec2 TexCoord; + +void main() +{ + gl_Position = vec4(a_pos, 1.0); + our_color = a_color; + TexCoord = vec2(a_tex_coord.x, a_tex_coord.y); +} |