diff options
Diffstat (limited to 'src/shaders/default.frag')
| -rw-r--r-- | src/shaders/default.frag | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/shaders/default.frag b/src/shaders/default.frag index 2176a7d..6038bb1 100644 --- a/src/shaders/default.frag +++ b/src/shaders/default.frag @@ -1,4 +1,5 @@ #version 330 core + out vec4 FragColor; in vec4 v_Color; @@ -9,14 +10,13 @@ uniform sampler2D texture_1; void main() { - FragColor = texture(texture_1, v_TexCoord) * v_Color; - //if(v_TexId > 0) - //{ - // FragColor = texture(texture_1, v_TexCoord) * v_Color; - //} - //else - //{ - // FragColor = v_Color; - //} + if(v_TexId > 0) + { + FragColor = texture(texture_1, v_TexCoord) * v_Color; + } + else + { + FragColor = v_Color; + } } |