diff options
author | David Thompson <dthompson2@worcester.edu> | 2014-08-16 22:08:13 -0400 |
---|---|---|
committer | David Thompson <dthompson2@worcester.edu> | 2014-08-25 19:33:07 -0400 |
commit | 39fdda4aaba16990ac271b880059ebeb0d747b43 (patch) | |
tree | 5190bd82d764237dc6371c41cec469550dccd237 /data/shaders/sprite-fragment.glsl | |
parent | 2f27f5c49a61d0d891b2d2f045915a89365762ae (diff) |
Use a single default shader for all meshes.
* data/shaders/default-fragment.glsl: New file.
* data/shaders/default-vertex.glsl: New file.
* data/shaders/font-fragment.glsl: Delete.
* data/shaders/font-vertex.glsl: Delete.
* data/shaders/sprite-fragment.glsl: Delete.
* data/shaders/sprite-vertex.glsl: Delete.
* examples/common.scm: Remove call to enable-sprites.
* sly/font.scm (font-shader): Delete.
(enable-fonts): Remove shader loading.
(make-label): Use default shader.
* sly/shape.scm (make-cube): Make texture and shader optional keyword
arguments.
* sly/sprite.scm (sprite-shader, enable-sprites): Delete.
(make-sprite): Make shader an optional keyword argument.
Diffstat (limited to 'data/shaders/sprite-fragment.glsl')
-rw-r--r-- | data/shaders/sprite-fragment.glsl | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/data/shaders/sprite-fragment.glsl b/data/shaders/sprite-fragment.glsl deleted file mode 100644 index 3dd10f1..0000000 --- a/data/shaders/sprite-fragment.glsl +++ /dev/null @@ -1,8 +0,0 @@ -#version 120 - -uniform sampler2D color_texture; -uniform vec4 color; - -void main (void) { - gl_FragColor = texture2D(color_texture, gl_TexCoord[0].st) * color; -} |