diff options
| author | realtradam <[email protected]> | 2022-11-25 02:55:55 -0500 |
|---|---|---|
| committer | realtradam <[email protected]> | 2022-11-25 02:55:55 -0500 |
| commit | 4e7226ad1b081982e5cbed349edca1c5b0e1b779 (patch) | |
| tree | 6d497896f979e6bbcb0841d33d3a2815333cfef9 /src/shaders | |
| parent | 6e1d0c6a3f3699e44000f411cd93261c460f75a9 (diff) | |
| download | Ogle-4e7226ad1b081982e5cbed349edca1c5b0e1b779.tar.gz Ogle-4e7226ad1b081982e5cbed349edca1c5b0e1b779.zip | |
fixed Makefile, implemented bunnymark
Diffstat (limited to 'src/shaders')
| -rw-r--r-- | src/shaders/default.frag | 17 | ||||
| -rw-r--r-- | src/shaders/default.vert | 5 |
2 files changed, 13 insertions, 9 deletions
diff --git a/src/shaders/default.frag b/src/shaders/default.frag index 2ad6732..2176a7d 100644 --- a/src/shaders/default.frag +++ b/src/shaders/default.frag @@ -9,13 +9,14 @@ uniform sampler2D texture_1; void main() { - if(v_TexId > 0) - { - FragColor = texture(texture_1, v_TexCoord) * v_Color; - } - else - { - FragColor = v_Color; - } + FragColor = texture(texture_1, v_TexCoord) * v_Color; + //if(v_TexId > 0) + //{ + // FragColor = texture(texture_1, v_TexCoord) * v_Color; + //} + //else + //{ + // FragColor = v_Color; + //} } diff --git a/src/shaders/default.vert b/src/shaders/default.vert index 38e5343..404e583 100644 --- a/src/shaders/default.vert +++ b/src/shaders/default.vert @@ -10,9 +10,12 @@ out vec4 v_Color; out vec2 v_TexCoord; out float v_TexId; +uniform mat4 transform; + void main() { - gl_Position = vec4(a_Pos, 1.0); + gl_Position = transform * vec4(a_Pos, 1.0); + //gl_Position = vec4(a_Pos, 1.0); v_Color = a_Color; v_TexCoord = a_TexCoord; v_TexId = a_TexId; |