summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Thompson <dthompson2@worcester.edu>2014-11-07 22:36:24 -0500
committerDavid Thompson <dthompson2@worcester.edu>2014-11-07 22:36:24 -0500
commitcb7e515475150fe6aea6517ad0dee59cd7f98b9c (patch)
treed7ecce29ab1a9f468d15855e42f86fa1a2a97c20
parent40f21faf0413748213066632c3f2ad7e11668d71 (diff)
render: Move shader module to sly/render directory.
* sly/shader.scm: Delete. * sly/render/shader.scm: New file. * Makefile.am (SOURCES): Add new file and delete old one. * sly/font.scm: Use (sly render shader). * sly/mesh.scm: Likewise. * sly/render/context.scm: Likewise. * sly/render/renderer.scm: Likewise. * sly/render/sprite.scm: Likewise. * sly/render/vertex-array.scm: Likewise. * sly/shape.scm: Likewise.
-rw-r--r--Makefile.am2
-rw-r--r--sly/font.scm2
-rw-r--r--sly/mesh.scm2
-rw-r--r--sly/render/context.scm2
-rw-r--r--sly/render/renderer.scm2
-rw-r--r--sly/render/shader.scm (renamed from sly/shader.scm)2
-rw-r--r--sly/render/sprite.scm2
-rw-r--r--sly/render/vertex-array.scm2
-rw-r--r--sly/shape.scm2
9 files changed, 9 insertions, 9 deletions
diff --git a/Makefile.am b/Makefile.am
index 9921ff2..994ffc6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -42,7 +42,6 @@ SOURCES = \
sly/rect.scm \
sly/repl.scm \
sly/scene.scm \
- sly/shader.scm \
sly/shape.scm \
sly/signal.scm \
sly/tileset.scm \
@@ -54,6 +53,7 @@ SOURCES = \
sly/render/camera.scm \
sly/render/framebuffer.scm \
sly/render/texture.scm \
+ sly/render/shader.scm \
sly/render/sprite.scm \
sly/render/vertex-array.scm \
sly/render/context.scm \
diff --git a/sly/font.scm b/sly/font.scm
index c14905b..26762d5 100644
--- a/sly/font.scm
+++ b/sly/font.scm
@@ -34,7 +34,7 @@
#:use-module (sly color)
#:use-module (sly config)
#:use-module (sly mesh)
- #:use-module (sly shader)
+ #:use-module (sly render shader)
#:use-module (sly render sprite)
#:use-module (sly render texture)
#:export (enable-fonts
diff --git a/sly/mesh.scm b/sly/mesh.scm
index eb6a53b..a382256 100644
--- a/sly/mesh.scm
+++ b/sly/mesh.scm
@@ -30,7 +30,7 @@
#:use-module (gl low-level)
#:use-module (sly wrappers gl)
#:use-module (sly color)
- #:use-module (sly shader)
+ #:use-module (sly render shader)
#:use-module (sly render texture)
#:use-module (sly math vector)
#:use-module (sly signal)
diff --git a/sly/render/context.scm b/sly/render/context.scm
index 447dac0..541661d 100644
--- a/sly/render/context.scm
+++ b/sly/render/context.scm
@@ -27,7 +27,7 @@
#:use-module (gl enums)
#:use-module (gl low-level)
#:use-module (sly wrappers gl)
- #:use-module (sly shader)
+ #:use-module (sly render shader)
#:use-module (sly render texture)
#:use-module (sly render utils)
#:use-module (sly render vertex-array)
diff --git a/sly/render/renderer.scm b/sly/render/renderer.scm
index d04bf16..d2c1f7b 100644
--- a/sly/render/renderer.scm
+++ b/sly/render/renderer.scm
@@ -28,7 +28,7 @@
#:use-module (srfi srfi-26)
#:use-module (gl)
#:use-module (gl low-level)
- #:use-module (sly shader)
+ #:use-module (sly render shader)
#:use-module (sly render texture)
#:use-module (sly transform)
#:use-module (sly math vector)
diff --git a/sly/shader.scm b/sly/render/shader.scm
index 5ad97ab..7a6c9c0 100644
--- a/sly/shader.scm
+++ b/sly/render/shader.scm
@@ -15,7 +15,7 @@
;;; along with this program. If not, see
;;; <http://www.gnu.org/licenses/>.
-(define-module (sly shader)
+(define-module (sly render shader)
#:use-module (ice-9 rdelim)
#:use-module (ice-9 match)
#:use-module (system foreign)
diff --git a/sly/render/sprite.scm b/sly/render/sprite.scm
index 5bdaac7..afcb4da 100644
--- a/sly/render/sprite.scm
+++ b/sly/render/sprite.scm
@@ -34,7 +34,7 @@
#:use-module (sly utils)
#:use-module (sly math)
#:use-module (sly mesh)
- #:use-module (sly shader)
+ #:use-module (sly render shader)
#:use-module (sly signal)
#:use-module (sly render texture)
#:use-module (sly math vector)
diff --git a/sly/render/vertex-array.scm b/sly/render/vertex-array.scm
index 51caad1..3c385ae 100644
--- a/sly/render/vertex-array.scm
+++ b/sly/render/vertex-array.scm
@@ -33,7 +33,7 @@
#:use-module (sly wrappers gl)
#:use-module (sly math vector)
#:use-module (sly color)
- #:use-module (sly shader)
+ #:use-module (sly render shader)
#:export (make-vertex-array
vertex-array?
vertex-array-id vertex-array-length
diff --git a/sly/shape.scm b/sly/shape.scm
index e7b7d26..6633602 100644
--- a/sly/shape.scm
+++ b/sly/shape.scm
@@ -24,7 +24,7 @@
(define-module (sly shape)
#:use-module (sly math)
#:use-module (sly mesh)
- #:use-module (sly shader)
+ #:use-module (sly render shader)
#:use-module (sly render texture)
#:use-module (sly math vector)
#:export (make-cube))