diff options
| author | David Thompson <dthompson2@worcester.edu> | 2017-08-08 07:47:49 -0400 |
|---|---|---|
| committer | David Thompson <dthompson2@worcester.edu> | 2017-08-08 07:47:49 -0400 |
| commit | 7520b6c061d0474793105480a89b2319461b67ee (patch) | |
| tree | 693322ad83e362d4575c54d2aa675e3d409dfc58 | |
| parent | 5b734df51ee6fd3882a9b6c90562d4a7bafc12e2 (diff) | |
Move color module into render namespace.
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | chickadee.scm | 2 | ||||
| -rw-r--r-- | chickadee/render/color.scm (renamed from chickadee/color.scm) | 2 | ||||
| -rw-r--r-- | chickadee/render/shader.scm | 2 | ||||
| -rw-r--r-- | chickadee/render/shapes.scm | 2 | ||||
| -rw-r--r-- | chickadee/render/viewport.scm | 2 | ||||
| -rw-r--r-- | examples/lines.scm | 2 |
7 files changed, 7 insertions, 7 deletions
diff --git a/Makefile.am b/Makefile.am index 5bdd98d..d39cf38 100644 --- a/Makefile.am +++ b/Makefile.am @@ -52,7 +52,7 @@ SOURCES = \ chickadee/math/matrix.scm \ chickadee/math/rect.scm \ chickadee/math/easings.scm \ - chickadee/color.scm \ + chickadee/render/color.scm \ chickadee/render/gl.scm \ chickadee/render/gpu.scm \ chickadee/render/blend.scm \ diff --git a/chickadee.scm b/chickadee.scm index d65a265..2a282b4 100644 --- a/chickadee.scm +++ b/chickadee.scm @@ -20,10 +20,10 @@ #:use-module (sdl2) #:use-module (sdl2 events) #:use-module (sdl2 input text) - #:use-module (chickadee color) #:use-module (chickadee math matrix) #:use-module (chickadee window) #:use-module (chickadee render) + #:use-module (chickadee render color) #:use-module (chickadee render gl) #:use-module (chickadee render gpu) #:use-module (chickadee render viewport) diff --git a/chickadee/color.scm b/chickadee/render/color.scm index 2d3ac22..1480833 100644 --- a/chickadee/color.scm +++ b/chickadee/render/color.scm @@ -21,7 +21,7 @@ ;; ;;; Code: -(define-module (chickadee color) +(define-module (chickadee render color) #:use-module (ice-9 match) #:use-module (srfi srfi-9) #:use-module (srfi srfi-1) diff --git a/chickadee/render/shader.scm b/chickadee/render/shader.scm index b5f9b7d..2f0219f 100644 --- a/chickadee/render/shader.scm +++ b/chickadee/render/shader.scm @@ -27,9 +27,9 @@ #:use-module (srfi srfi-9) #:use-module (srfi srfi-9 gnu) #:use-module (gl) - #:use-module (chickadee color) #:use-module (chickadee math matrix) #:use-module (chickadee math vector) + #:use-module (chickadee render color) #:use-module (chickadee render gl) #:use-module (chickadee render gpu) #:use-module (chickadee render texture) diff --git a/chickadee/render/shapes.scm b/chickadee/render/shapes.scm index fe0df72..5161e33 100644 --- a/chickadee/render/shapes.scm +++ b/chickadee/render/shapes.scm @@ -28,7 +28,7 @@ #:use-module (chickadee math matrix) #:use-module (chickadee math vector) #:use-module (chickadee render) - #:use-module (chickadee color) + #:use-module (chickadee render color) #:use-module (chickadee render shader) #:use-module (chickadee render vertex-buffer) #:export (draw-line)) diff --git a/chickadee/render/viewport.scm b/chickadee/render/viewport.scm index ad057d1..2923819 100644 --- a/chickadee/render/viewport.scm +++ b/chickadee/render/viewport.scm @@ -26,9 +26,9 @@ #:use-module (srfi srfi-9) #:use-module (gl) #:use-module (chickadee utils) + #:use-module (chickadee render color) #:use-module (chickadee render gl) #:use-module (chickadee render gpu) - #:use-module (chickadee color) #:export (make-viewport viewport? viewport-x diff --git a/examples/lines.scm b/examples/lines.scm index 117f781..e6b1929 100644 --- a/examples/lines.scm +++ b/examples/lines.scm @@ -1,8 +1,8 @@ (use-modules (ice-9 match) (srfi srfi-1) (chickadee) - (chickadee color) (chickadee math vector) + (chickadee render color) (chickadee render shapes)) (define lines |