From 32c030c9fca7046b3a3edfa15584050251aeba4f Mon Sep 17 00:00:00 2001 From: David Thompson Date: Mon, 17 Feb 2014 20:59:34 -0500 Subject: Remove shader example. * examples/Makefile.am (examples_DATA): Remove 'shader.scm'. (shaderdir, shader_DATA): Remove. * examples/shader.scm: Delete file. * examples/shaders/fragment-shader.glsl: Delete file. * examples/shaders/vertex-shader.glsl: Delete file. --- examples/Makefile.am | 6 ------ examples/shader.scm | 33 --------------------------------- examples/shaders/fragment-shader.glsl | 7 ------- examples/shaders/vertex-shader.glsl | 13 ------------- 4 files changed, 59 deletions(-) delete mode 100644 examples/shader.scm delete mode 100644 examples/shaders/fragment-shader.glsl delete mode 100644 examples/shaders/vertex-shader.glsl diff --git a/examples/Makefile.am b/examples/Makefile.am index aa71173..319b359 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -4,7 +4,6 @@ examples_DATA = \ coroutine.scm \ font.scm \ particles.scm \ - shader.scm \ simple.scm \ tilemap.scm @@ -15,8 +14,3 @@ image_DATA = \ images/princess.png \ images/stars.png \ images/tiles.png - -shaderdir = $(pkgdatadir)/examples/shaders -shader_DATA = \ - shaders/vertex-shader.glsl \ - shaders/fragment-shader.glsl diff --git a/examples/shader.scm b/examples/shader.scm deleted file mode 100644 index 49893ad..0000000 --- a/examples/shader.scm +++ /dev/null @@ -1,33 +0,0 @@ -(use-modules (2d game) - (2d shader) - (2d sprite) - (2d vector2) - (2d window)) - -(load "common.scm") - -(define vertex-shader - (load-vertex-shader "shaders/vertex-shader.glsl")) -(define fragment-shader - (load-fragment-shader "shaders/fragment-shader.glsl")) -(define program (make-shader-program vertex-shader fragment-shader)) - -(define window-width 800) -(define window-height 600) -(define sprite - (load-sprite "images/p1_front.png" - #:position (vector2 (/ window-width 2) - (/ window-height 2)))) - -(define (draw dt alpha) - (with-shader-program program - ;; Shake the sprite around a bit. - (uniforms ((angle (/ (random:uniform) 100))) - (draw-sprite sprite)))) - -(add-hook! draw-hook draw) - -(with-window (make-window #:title "Shaders" - #:resolution (vector2 window-width - window-height)) - (run-game-loop)) diff --git a/examples/shaders/fragment-shader.glsl b/examples/shaders/fragment-shader.glsl deleted file mode 100644 index 9be52f0..0000000 --- a/examples/shaders/fragment-shader.glsl +++ /dev/null @@ -1,7 +0,0 @@ -#version 120 - -uniform sampler2D color_texture; - -void main (void) { - gl_FragColor = texture2D(color_texture, gl_TexCoord[0].st); -} diff --git a/examples/shaders/vertex-shader.glsl b/examples/shaders/vertex-shader.glsl deleted file mode 100644 index 2a7a4a4..0000000 --- a/examples/shaders/vertex-shader.glsl +++ /dev/null @@ -1,13 +0,0 @@ -#version 120 - -uniform float angle; - -void main(void) { - mat4 RotationMatrix = mat4(cos(angle), -sin(angle), 0.0, 0.0, - sin(angle), cos(angle), 0.0, 0.0, - 0.0, 0.0, 1.0, 0.0, - 0.0, 0.0, 0.0, 1.0); - - gl_Position = gl_ModelViewProjectionMatrix * RotationMatrix * gl_Vertex; - gl_TexCoord[0] = gl_MultiTexCoord0; -} -- cgit v1.2.3