diff options
author | David Thompson <dthompson2@worcester.edu> | 2014-11-08 08:53:02 -0500 |
---|---|---|
committer | David Thompson <dthompson2@worcester.edu> | 2014-11-08 08:53:02 -0500 |
commit | 6e27a3e4696ede3eab720f25d169e8f6ed00bd0b (patch) | |
tree | acf8a15825b4f65eba3db7818aa22eaaa8102ffb | |
parent | d16e22d04ca6fe31fa8387fd5ca3cb014357f159 (diff) |
render: Move color module to sly/render directory.
* sly/color.scm: Delete.
* sly/render/color.scm: New file.
* Makefile.am (SOURCES): Add new file. Delete old one.
* sly/font.scm: Use (sly render color) module.
* sly/render/camera.scm: Likewise.
* sly/render/mesh.scm: Likewise.
* sly/render/shader.scm: Likewise.
* sly/render/sprite.scm: Likewise.
* sly/render/texture.scm: Likewise.
* sly/render/vertex-array.scm: Likewise.
* sly/transition.scm: Likewise.
* examples/font.scm: Likewise.
* examples/simple.scm: Likewise.
* examples/tilemap.scm: Likewise.
* examples/transition.scm: Likewise.
-rw-r--r-- | Makefile.am | 2 | ||||
-rw-r--r-- | examples/font.scm | 2 | ||||
-rw-r--r-- | examples/simple.scm | 2 | ||||
-rw-r--r-- | examples/tilemap.scm | 2 | ||||
-rw-r--r-- | examples/transition.scm | 2 | ||||
-rw-r--r-- | sly/font.scm | 2 | ||||
-rw-r--r-- | sly/render/camera.scm | 2 | ||||
-rw-r--r-- | sly/render/color.scm (renamed from sly/color.scm) | 2 | ||||
-rw-r--r-- | sly/render/mesh.scm | 2 | ||||
-rw-r--r-- | sly/render/shader.scm | 2 | ||||
-rw-r--r-- | sly/render/sprite.scm | 2 | ||||
-rw-r--r-- | sly/render/texture.scm | 2 | ||||
-rw-r--r-- | sly/render/vertex-array.scm | 2 | ||||
-rw-r--r-- | sly/transition.scm | 2 |
14 files changed, 14 insertions, 14 deletions
diff --git a/Makefile.am b/Makefile.am index 24ebbb9..7a03e2a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -25,7 +25,6 @@ SOURCES = \ sly/agenda.scm \ sly/animation.scm \ sly/audio.scm \ - sly/color.scm \ sly/config.scm \ sly/coroutine.scm \ sly/event.scm \ @@ -46,6 +45,7 @@ SOURCES = \ sly/transition.scm \ sly/window.scm \ sly/render/utils.scm \ + sly/render/color.scm \ sly/render/camera.scm \ sly/render/framebuffer.scm \ sly/render/mesh.scm \ diff --git a/examples/font.scm b/examples/font.scm index d011899..8ce7976 100644 --- a/examples/font.scm +++ b/examples/font.scm @@ -17,7 +17,7 @@ (use-modules (sly agenda) (sly fps) - (sly color) + (sly render color) (sly font) (sly game) (sly input mouse) diff --git a/examples/simple.scm b/examples/simple.scm index cef0edb..0fd4503 100644 --- a/examples/simple.scm +++ b/examples/simple.scm @@ -23,7 +23,7 @@ (sly math transform) (sly vector) (sly window) - (sly color)) + (sly render color)) (load "common.scm") diff --git a/examples/tilemap.scm b/examples/tilemap.scm index 3c0d6f0..8aabdf9 100644 --- a/examples/tilemap.scm +++ b/examples/tilemap.scm @@ -28,7 +28,7 @@ (sly render scene) (sly signal) (sly camera) - (sly color) + (sly render color) (sly transition) (sly utils) (sly input keyboard)) diff --git a/examples/transition.scm b/examples/transition.scm index 1e18e0e..9370f00 100644 --- a/examples/transition.scm +++ b/examples/transition.scm @@ -19,7 +19,7 @@ (sly render sprite) (sly vector) (sly window) - (sly color) + (sly render color) (sly signal) (sly render texture) (sly transition)) diff --git a/sly/font.scm b/sly/font.scm index 79fc16f..2a9fcf4 100644 --- a/sly/font.scm +++ b/sly/font.scm @@ -31,7 +31,7 @@ #:use-module ((sdl ttf) #:prefix SDL:) #:use-module (gl) #:use-module (sly wrappers gl) - #:use-module (sly color) + #:use-module (sly render color) #:use-module (sly config) #:use-module (sly render mesh) #:use-module (sly render shader) diff --git a/sly/render/camera.scm b/sly/render/camera.scm index f7f0294..3ec7089 100644 --- a/sly/render/camera.scm +++ b/sly/render/camera.scm @@ -29,7 +29,7 @@ #:use-module (gl enums) #:use-module (sly wrappers gl) #:use-module (sly utils) - #:use-module (sly color) + #:use-module (sly render color) #:use-module (sly math rect) #:use-module (sly math transform) #:export (make-viewport viewport? diff --git a/sly/color.scm b/sly/render/color.scm index 2611b31..6497339 100644 --- a/sly/color.scm +++ b/sly/render/color.scm @@ -21,7 +21,7 @@ ;; ;;; Code: -(define-module (sly color) +(define-module (sly render color) #:use-module (ice-9 match) #:use-module (gl) #:use-module (srfi srfi-9) diff --git a/sly/render/mesh.scm b/sly/render/mesh.scm index a7ed468..2aca38f 100644 --- a/sly/render/mesh.scm +++ b/sly/render/mesh.scm @@ -29,7 +29,7 @@ #:use-module (gl) #:use-module (gl low-level) #:use-module (sly wrappers gl) - #:use-module (sly color) + #:use-module (sly render color) #:use-module (sly render shader) #:use-module (sly render texture) #:use-module (sly math vector) diff --git a/sly/render/shader.scm b/sly/render/shader.scm index 93c5217..cf89427 100644 --- a/sly/render/shader.scm +++ b/sly/render/shader.scm @@ -28,7 +28,7 @@ #:use-module (sly utils) #:use-module (sly math transform) #:use-module (sly math vector) - #:use-module (sly color) + #:use-module (sly render color) #:use-module (sly config) #:use-module (sly wrappers gl) #:export (make-shader diff --git a/sly/render/sprite.scm b/sly/render/sprite.scm index a152b89..950a81b 100644 --- a/sly/render/sprite.scm +++ b/sly/render/sprite.scm @@ -28,7 +28,7 @@ #:use-module (gl) #:use-module (gl contrib packed-struct) #:use-module ((sdl sdl) #:prefix SDL:) - #:use-module (sly color) + #:use-module (sly render color) #:use-module (sly config) #:use-module (sly agenda) #:use-module (sly utils) diff --git a/sly/render/texture.scm b/sly/render/texture.scm index fbb97bb..e1a8ac5 100644 --- a/sly/render/texture.scm +++ b/sly/render/texture.scm @@ -28,7 +28,7 @@ #:use-module (gl) #:use-module (gl low-level) #:use-module (gl contrib packed-struct) - #:use-module (sly color) + #:use-module (sly render color) #:use-module (sly utils) #:use-module (sly math vector) #:use-module (sly wrappers gl) diff --git a/sly/render/vertex-array.scm b/sly/render/vertex-array.scm index 3c385ae..45fcdd7 100644 --- a/sly/render/vertex-array.scm +++ b/sly/render/vertex-array.scm @@ -32,7 +32,7 @@ #:use-module (gl low-level) #:use-module (sly wrappers gl) #:use-module (sly math vector) - #:use-module (sly color) + #:use-module (sly render color) #:use-module (sly render shader) #:export (make-vertex-array vertex-array? diff --git a/sly/transition.scm b/sly/transition.scm index 53ac4c4..ab2129a 100644 --- a/sly/transition.scm +++ b/sly/transition.scm @@ -24,7 +24,7 @@ (define-module (sly transition) #:use-module (ice-9 match) #:use-module (sly agenda) - #:use-module (sly color) + #:use-module (sly render color) #:use-module (sly coroutine) #:use-module (sly math) #:use-module (sly math quaternion) |