diff options
author | omniscient <17525998+omnisci3nce@users.noreply.github.com> | 2024-10-19 13:24:31 +1100 |
---|---|---|
committer | omniscient <17525998+omnisci3nce@users.noreply.github.com> | 2024-10-19 13:24:31 +1100 |
commit | 6182860f1b1aba4128b4f66eda7977600e60d1a0 (patch) | |
tree | 388d9aff8ca19ef324633ac1bea43f1548675150 /assets/shaders/terrain.frag | |
parent | 5d1750d9adfc45b53c75310c58e31dfdbd8a6e15 (diff) | |
parent | d6d742f8a24490f885e4a1ae3fea7ec46b01f58c (diff) |
fix merge
Diffstat (limited to 'assets/shaders/terrain.frag')
-rw-r--r-- | assets/shaders/terrain.frag | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/assets/shaders/terrain.frag b/assets/shaders/terrain.frag deleted file mode 100644 index 0cc76c8..0000000 --- a/assets/shaders/terrain.frag +++ /dev/null @@ -1,13 +0,0 @@ -#version 410 core - -out vec4 FragColor; - -in vec4 Color; -in vec2 TexCoord; - -uniform sampler2D TextureSlot1; - -void main() { - vec4 tex_color = texture(TextureSlot1, TexCoord); - FragColor = Color * tex_color; -}
\ No newline at end of file |