Rename 'render' subdirectory to 'graphics'.

35 files changed, 174 insertions, 174 deletions

diff --git a/Makefile.am b/Makefile.am
index cec9e82..ffd4731 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -61,26 +61,26 @@ SOURCES = 					\
   chickadee/audio/vorbis.scm			\
   chickadee/audio/wav.scm			\
   chickadee/audio.scm				\
-  chickadee/render/color.scm			\
-  chickadee/render/gl.scm			\
-  chickadee/render/gpu.scm			\
-  chickadee/render/blend.scm			\
-  chickadee/render/depth.scm			\
-  chickadee/render/stencil.scm			\
-  chickadee/render/texture.scm			\
-  chickadee/render/shader.scm			\
-  chickadee/render/buffer.scm			\
-  chickadee/render/viewport.scm			\
-  chickadee/render/framebuffer.scm		\
-  chickadee/render.scm				\
-  chickadee/render/shapes.scm			\
-  chickadee/render/sprite.scm			\
-  chickadee/render/font.scm			\
-  chickadee/render/tiled.scm			\
-  chickadee/render/particles.scm		\
-  chickadee/render/phong.scm			\
-  chickadee/render/pbr.scm			\
-  chickadee/render/model.scm			\
+  chickadee/graphics/color.scm			\
+  chickadee/graphics/gl.scm			\
+  chickadee/graphics/gpu.scm			\
+  chickadee/graphics/blend.scm			\
+  chickadee/graphics/depth.scm			\
+  chickadee/graphics/stencil.scm			\
+  chickadee/graphics/texture.scm			\
+  chickadee/graphics/shader.scm			\
+  chickadee/graphics/buffer.scm			\
+  chickadee/graphics/viewport.scm			\
+  chickadee/graphics/framebuffer.scm		\
+  chickadee/graphics.scm				\
+  chickadee/graphics/shapes.scm			\
+  chickadee/graphics/sprite.scm			\
+  chickadee/graphics/font.scm			\
+  chickadee/graphics/tiled.scm			\
+  chickadee/graphics/particles.scm		\
+  chickadee/graphics/phong.scm			\
+  chickadee/graphics/pbr.scm			\
+  chickadee/graphics/model.scm			\
   chickadee/scripting/agenda.scm		\
   chickadee/scripting/script.scm		\
   chickadee/scripting/channel.scm		\
diff --git a/README b/README
index 55ce8d6..0886740 100644
--- a/README
+++ b/README
@@ -15,8 +15,8 @@
   #+BEGIN_SRC scheme
     (use-modules (chickadee)
                  (chickadee math vector)
-                 (chickadee render sprite)
-                 (chickadee render texture))
+                 (chickadee graphics sprite)
+                 (chickadee graphics texture))
 
     (define sprite #f)
 
diff --git a/chickadee.scm b/chickadee.scm
index 7b43888..e974b9f 100644
--- a/chickadee.scm
+++ b/chickadee.scm
@@ -27,11 +27,11 @@
   #:use-module (chickadee config)
   #:use-module (chickadee game-loop)
   #:use-module (chickadee math matrix)
-  #:use-module (chickadee render)
-  #:use-module (chickadee render color)
-  #:use-module (chickadee render gl)
-  #:use-module (chickadee render gpu)
-  #:use-module (chickadee render viewport)
+  #:use-module (chickadee graphics)
+  #:use-module (chickadee graphics color)
+  #:use-module (chickadee graphics gl)
+  #:use-module (chickadee graphics gpu)
+  #:use-module (chickadee graphics viewport)
   #:use-module (chickadee utils)
   #:use-module (gl)
   #:use-module (gl enums)
diff --git a/chickadee/render.scm b/chickadee/graphics.scm
index 23dc6d2..a41739e 100644
--- a/chickadee/render.scm
+++ b/chickadee/graphics.scm
@@ -21,15 +21,15 @@
 ;;
 ;;; Code:
 
-(define-module (chickadee render)
+(define-module (chickadee graphics)
   #:use-module (chickadee math matrix)
-  #:use-module (chickadee render gpu)
-  #:use-module (chickadee render blend)
-  #:use-module (chickadee render framebuffer)
-  #:use-module (chickadee render shader)
-  #:use-module (chickadee render texture)
-  #:use-module (chickadee render buffer)
-  #:use-module (chickadee render viewport)
+  #:use-module (chickadee graphics gpu)
+  #:use-module (chickadee graphics blend)
+  #:use-module (chickadee graphics framebuffer)
+  #:use-module (chickadee graphics shader)
+  #:use-module (chickadee graphics texture)
+  #:use-module (chickadee graphics buffer)
+  #:use-module (chickadee graphics viewport)
   #:use-module (srfi srfi-9)
   #:export (current-viewport
             current-framebuffer
diff --git a/chickadee/render/blend.scm b/chickadee/graphics/blend.scm
index 1c0b215..465a449 100644
--- a/chickadee/render/blend.scm
+++ b/chickadee/graphics/blend.scm
@@ -15,11 +15,11 @@
 ;;; along with this program.  If not, see
 ;;; <http://www.gnu.org/licenses/>.
 
-(define-module (chickadee render blend)
+(define-module (chickadee graphics blend)
   #:use-module (ice-9 match)
   #:use-module (gl)
-  #:use-module (chickadee render gl)
-  #:use-module (chickadee render gpu)
+  #:use-module (chickadee graphics gl)
+  #:use-module (chickadee graphics gpu)
   #:export (apply-blend-mode))
 
 (define (apply-blend-mode blend-mode)
diff --git a/chickadee/render/buffer.scm b/chickadee/graphics/buffer.scm
index fc66dad..cfb541f 100644
--- a/chickadee/render/buffer.scm
+++ b/chickadee/graphics/buffer.scm
@@ -21,7 +21,7 @@
 ;;
 ;;; Code:
 
-(define-module (chickadee render buffer)
+(define-module (chickadee graphics buffer)
   #:use-module (ice-9 format)
   #:use-module (ice-9 match)
   #:use-module (oop goops)
@@ -33,8 +33,8 @@
   #:use-module (system foreign)
   #:use-module (chickadee math matrix)
   #:use-module (chickadee math vector)
-  #:use-module (chickadee render gl)
-  #:use-module (chickadee render gpu)
+  #:use-module (chickadee graphics gl)
+  #:use-module (chickadee graphics gpu)
   #:export (make-buffer
             make-streaming-buffer
             buffer?
diff --git a/chickadee/render/color.scm b/chickadee/graphics/color.scm
index 52f98d7..1a0be6d 100644
--- a/chickadee/render/color.scm
+++ b/chickadee/graphics/color.scm
@@ -21,7 +21,7 @@
 ;;
 ;;; Code:
 
-(define-module (chickadee render color)
+(define-module (chickadee graphics color)
   #:use-module (ice-9 match)
   #:use-module (srfi srfi-9)
   #:use-module (srfi srfi-1)
diff --git a/chickadee/render/depth.scm b/chickadee/graphics/depth.scm
index 2eb4e55..8e622e4 100644
--- a/chickadee/render/depth.scm
+++ b/chickadee/graphics/depth.scm
@@ -15,11 +15,11 @@
 ;;; along with this program.  If not, see
 ;;; <http://www.gnu.org/licenses/>.
 
-(define-module (chickadee render depth)
+(define-module (chickadee graphics depth)
   #:use-module (ice-9 match)
   #:use-module (gl)
-  #:use-module (chickadee render gl)
-  #:use-module (chickadee render gpu)
+  #:use-module (chickadee graphics gl)
+  #:use-module (chickadee graphics gpu)
   #:use-module (srfi srfi-9)
   #:export (make-depth-test
             depth-test?
diff --git a/chickadee/render/font.scm b/chickadee/graphics/font.scm
index 128be9d..6c115b9 100644
--- a/chickadee/render/font.scm
+++ b/chickadee/graphics/font.scm
@@ -21,7 +21,7 @@
 ;;
 ;;; Code:
 
-(define-module (chickadee render font)
+(define-module (chickadee graphics font)
   #:use-module (ice-9 format)
   #:use-module (ice-9 match)
   #:use-module (ice-9 regex)
@@ -37,11 +37,11 @@
   #:use-module (chickadee math matrix)
   #:use-module (chickadee math rect)
   #:use-module (chickadee math vector)
-  #:use-module (chickadee render)
-  #:use-module (chickadee render gpu)
-  #:use-module (chickadee render shader)
-  #:use-module (chickadee render sprite)
-  #:use-module (chickadee render texture)
+  #:use-module (chickadee graphics)
+  #:use-module (chickadee graphics gpu)
+  #:use-module (chickadee graphics shader)
+  #:use-module (chickadee graphics sprite)
+  #:use-module (chickadee graphics texture)
   #:use-module (rnrs bytevectors)
   #:export (load-tile-font
             load-bitmap-font
diff --git a/chickadee/render/framebuffer.scm b/chickadee/graphics/framebuffer.scm
index 53890ba..967c115 100644
--- a/chickadee/render/framebuffer.scm
+++ b/chickadee/graphics/framebuffer.scm
@@ -21,7 +21,7 @@
 ;;
 ;;; Code:
 
-(define-module (chickadee render framebuffer)
+(define-module (chickadee graphics framebuffer)
   #:use-module (oop goops)
   #:use-module (ice-9 match)
   #:use-module (srfi srfi-9)
@@ -29,10 +29,10 @@
   #:use-module (gl)
   #:use-module (gl enums)
   #:use-module (chickadee math matrix)
-  #:use-module (chickadee render gl)
-  #:use-module (chickadee render gpu)
-  #:use-module ((chickadee render texture) #:select (make-texture null-texture))
-  #:use-module (chickadee render viewport)
+  #:use-module (chickadee graphics gl)
+  #:use-module (chickadee graphics gpu)
+  #:use-module ((chickadee graphics texture) #:select (make-texture null-texture))
+  #:use-module (chickadee graphics viewport)
   #:export (make-framebuffer
             framebuffer?
             framebuffer-texture
@@ -126,7 +126,7 @@ dimensions WIDTH x HEIGHT."
         (gl-framebuffer-texture-2d (version-3-0 framebuffer)
                                    (version-3-0 color-attachment0)
                                    (texture-target texture-2d)
-                                   ((@@ (chickadee render texture) texture-id)
+                                   ((@@ (chickadee graphics texture) texture-id)
                                     texture)
                                    0)
         (gl-draw-buffers 1 (bytevector->pointer draw-buffers))
diff --git a/chickadee/render/gl.scm b/chickadee/graphics/gl.scm
index 06c20e7..334da09 100644
--- a/chickadee/render/gl.scm
+++ b/chickadee/graphics/gl.scm
@@ -22,7 +22,7 @@
 ;;
 ;;; Code:
 
-(define-module (chickadee render gl)
+(define-module (chickadee graphics gl)
   #:use-module (srfi srfi-4)
   #:use-module ((system foreign) #:select (bytevector->pointer))
   #:use-module (gl)
diff --git a/chickadee/render/gpu.scm b/chickadee/graphics/gpu.scm
index 8921062..b8c8ca5 100644
--- a/chickadee/render/gpu.scm
+++ b/chickadee/graphics/gpu.scm
@@ -15,8 +15,8 @@
 ;;; along with this program.  If not, see
 ;;; <http://www.gnu.org/licenses/>.
 
-(define-module (chickadee render gpu)
-  #:use-module (chickadee render gl)
+(define-module (chickadee graphics gpu)
+  #:use-module (chickadee graphics gl)
   #:use-module (gl enums)
   #:use-module (oop goops)
   #:use-module (srfi srfi-9)
@@ -139,14 +139,14 @@ from the GPU's memory."
     (car (string-split (pointer->string (gl-get-string attr)) #\space)))
   (let ((textures (make-vector 32))
         ;; Lazily resolve bindings to avoid circular dependencies.
-        (blend-module (resolve-interface '(chickadee render blend)))
-        (depth-module (resolve-interface '(chickadee render depth)))
-        (stencil-module (resolve-interface '(chickadee render stencil)))
-        (buffer-module (resolve-interface '(chickadee render buffer)))
-        (framebuffer-module (resolve-interface '(chickadee render framebuffer)))
-        (shader-module (resolve-interface '(chickadee render shader)))
-        (texture-module (resolve-interface '(chickadee render texture)))
-        (viewport-module (resolve-interface '(chickadee render viewport)))
+        (blend-module (resolve-interface '(chickadee graphics blend)))
+        (depth-module (resolve-interface '(chickadee graphics depth)))
+        (stencil-module (resolve-interface '(chickadee graphics stencil)))
+        (buffer-module (resolve-interface '(chickadee graphics buffer)))
+        (framebuffer-module (resolve-interface '(chickadee graphics framebuffer)))
+        (shader-module (resolve-interface '(chickadee graphics shader)))
+        (texture-module (resolve-interface '(chickadee graphics texture)))
+        (viewport-module (resolve-interface '(chickadee graphics viewport)))
         (gl-version (extract-version (string-name version)))
         (glsl-version (extract-version (version-2-0 shading-language-version))))
     ;; Create state for 32 texture units.
diff --git a/chickadee/render/model.scm b/chickadee/graphics/model.scm
index a9133c4..6e696f7 100644
--- a/chickadee/render/model.scm
+++ b/chickadee/graphics/model.scm
@@ -21,19 +21,19 @@
 ;;
 ;;; Code:
 
-(define-module (chickadee render model)
+(define-module (chickadee graphics model)
   #:use-module (chickadee array-list)
   #:use-module (chickadee json)
   #:use-module (chickadee math matrix)
   #:use-module (chickadee math vector)
-  #:use-module (chickadee render)
-  #:use-module (chickadee render buffer)
-  #:use-module (chickadee render color)
-  #:use-module (chickadee render depth)
-  #:use-module (chickadee render pbr)
-  #:use-module (chickadee render phong)
-  #:use-module (chickadee render shader)
-  #:use-module (chickadee render texture)
+  #:use-module (chickadee graphics)
+  #:use-module (chickadee graphics buffer)
+  #:use-module (chickadee graphics color)
+  #:use-module (chickadee graphics depth)
+  #:use-module (chickadee graphics pbr)
+  #:use-module (chickadee graphics phong)
+  #:use-module (chickadee graphics shader)
+  #:use-module (chickadee graphics texture)
   #:use-module (ice-9 format)
   #:use-module (ice-9 match)
   #:use-module (ice-9 rdelim)
diff --git a/chickadee/render/particles.scm b/chickadee/graphics/particles.scm
index c81209a..0cd275e 100644
--- a/chickadee/render/particles.scm
+++ b/chickadee/graphics/particles.scm
@@ -15,7 +15,7 @@
 ;;; along with this program.  If not, see
 ;;; <http://www.gnu.org/licenses/>.
 
-(define-module (chickadee render particles)
+(define-module (chickadee graphics particles)
   #:use-module (rnrs bytevectors)
   #:use-module (srfi srfi-1)
   #:use-module (srfi srfi-4)
@@ -26,11 +26,11 @@
   #:use-module (chickadee math matrix)
   #:use-module (chickadee math rect)
   #:use-module (chickadee math vector)
-  #:use-module (chickadee render)
-  #:use-module (chickadee render buffer)
-  #:use-module (chickadee render color)
-  #:use-module (chickadee render shader)
-  #:use-module (chickadee render texture)
+  #:use-module (chickadee graphics)
+  #:use-module (chickadee graphics buffer)
+  #:use-module (chickadee graphics color)
+  #:use-module (chickadee graphics shader)
+  #:use-module (chickadee graphics texture)
   #:export (make-particle-emitter
             particle-emitter?
             particle-emitter-spawn-area
diff --git a/chickadee/render/pbr.scm b/chickadee/graphics/pbr.scm
index 167334e..375f5d0 100644
--- a/chickadee/render/pbr.scm
+++ b/chickadee/graphics/pbr.scm
@@ -21,12 +21,12 @@
 ;;
 ;;; Code:
 
-(define-module (chickadee render pbr)
+(define-module (chickadee graphics pbr)
   #:use-module (chickadee math vector)
-  #:use-module (chickadee render)
-  #:use-module (chickadee render color)
-  #:use-module (chickadee render shader)
-  #:use-module (chickadee render texture)
+  #:use-module (chickadee graphics)
+  #:use-module (chickadee graphics color)
+  #:use-module (chickadee graphics shader)
+  #:use-module (chickadee graphics texture)
   #:use-module (srfi srfi-9)
   #:export (make-pbr-material
             pbr-material?
diff --git a/chickadee/render/phong.scm b/chickadee/graphics/phong.scm
index 1c718a8..ab34fce 100644
--- a/chickadee/render/phong.scm
+++ b/chickadee/graphics/phong.scm
@@ -21,12 +21,12 @@
 ;;
 ;;; Code:
 
-(define-module (chickadee render phong)
+(define-module (chickadee graphics phong)
   #:use-module (chickadee math vector)
-  #:use-module (chickadee render)
-  #:use-module (chickadee render color)
-  #:use-module (chickadee render shader)
-  #:use-module (chickadee render texture)
+  #:use-module (chickadee graphics)
+  #:use-module (chickadee graphics color)
+  #:use-module (chickadee graphics shader)
+  #:use-module (chickadee graphics texture)
   #:use-module (srfi srfi-9)
   #:export (make-phong-material
             phong-material?
diff --git a/chickadee/render/shader.scm b/chickadee/graphics/shader.scm
index 6df77f1..fc6f5ea 100644
--- a/chickadee/render/shader.scm
+++ b/chickadee/graphics/shader.scm
@@ -15,7 +15,7 @@
 ;;; along with this program.  If not, see
 ;;; <http://www.gnu.org/licenses/>.
 
-(define-module (chickadee render shader)
+(define-module (chickadee graphics shader)
   #:use-module (ice-9 format)
   #:use-module (ice-9 rdelim)
   #:use-module (ice-9 match)
@@ -31,10 +31,10 @@
   #:use-module (gl)
   #: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)
+  #:use-module (chickadee graphics color)
+  #:use-module (chickadee graphics gl)
+  #:use-module (chickadee graphics gpu)
+  #:use-module (chickadee graphics texture)
   #:export (shader-data-type?
             bool
             int
diff --git a/chickadee/render/shapes.scm b/chickadee/graphics/shapes.scm
index dd690ec..79a73b6 100644
--- a/chickadee/render/shapes.scm
+++ b/chickadee/graphics/shapes.scm
@@ -22,17 +22,17 @@
 ;;
 ;;; Code:
 
-(define-module (chickadee render shapes)
+(define-module (chickadee graphics shapes)
   #:use-module (ice-9 match)
   #:use-module (srfi srfi-4)
   #:use-module (chickadee math bezier)
   #:use-module (chickadee math matrix)
   #:use-module (chickadee math rect)
   #:use-module (chickadee math vector)
-  #:use-module (chickadee render)
-  #:use-module (chickadee render color)
-  #:use-module (chickadee render shader)
-  #:use-module (chickadee render buffer)
+  #:use-module (chickadee graphics)
+  #:use-module (chickadee graphics color)
+  #:use-module (chickadee graphics shader)
+  #:use-module (chickadee graphics buffer)
   #:export (draw-filled-rect
             draw-line
             draw-bezier-curve
diff --git a/chickadee/render/sprite.scm b/chickadee/graphics/sprite.scm
index a5c25bc..4a78292 100644
--- a/chickadee/render/sprite.scm
+++ b/chickadee/graphics/sprite.scm
@@ -15,7 +15,7 @@
 ;;; along with this program.  If not, see
 ;;; <http://www.gnu.org/licenses/>.
 
-(define-module (chickadee render sprite)
+(define-module (chickadee graphics sprite)
   #:use-module (rnrs bytevectors)
   #:use-module (srfi srfi-4)
   #:use-module (srfi srfi-9)
@@ -23,11 +23,11 @@
   #:use-module (chickadee math matrix)
   #:use-module (chickadee math rect)
   #:use-module (chickadee math vector)
-  #:use-module (chickadee render)
-  #:use-module (chickadee render color)
-  #:use-module (chickadee render shader)
-  #:use-module (chickadee render texture)
-  #:use-module (chickadee render buffer)
+  #:use-module (chickadee graphics)
+  #:use-module (chickadee graphics color)
+  #:use-module (chickadee graphics shader)
+  #:use-module (chickadee graphics texture)
+  #:use-module (chickadee graphics buffer)
   #:export (draw-sprite*
             draw-sprite
 
@@ -363,7 +363,7 @@ texture may be specified via the TEXTURE-REGION argument."
     (f32vector-set! vertices (+ offset 26) s1)
     (f32vector-set! vertices (+ offset 27) t1)
     ;; Add tint.
-    (let ((bv ((@@ (chickadee render color) unwrap-color) tint))
+    (let ((bv ((@@ (chickadee graphics color) unwrap-color) tint))
           (byte-offset (* offset 4)))
       (bytevector-copy! bv 0 vertices (+ byte-offset 16) 16)
       (bytevector-copy! bv 0 vertices (+ byte-offset 48) 16)
diff --git a/chickadee/render/stencil.scm b/chickadee/graphics/stencil.scm
index 4a20300..b17bf21 100644
--- a/chickadee/render/stencil.scm
+++ b/chickadee/graphics/stencil.scm
@@ -15,11 +15,11 @@
 ;;; along with this program.  If not, see
 ;;; <http://www.gnu.org/licenses/>.
 
-(define-module (chickadee render stencil)
+(define-module (chickadee graphics stencil)
   #:use-module (ice-9 match)
   #:use-module (gl)
-  #:use-module (chickadee render gl)
-  #:use-module (chickadee render gpu)
+  #:use-module (chickadee graphics gl)
+  #:use-module (chickadee graphics gpu)
   #:use-module (srfi srfi-9)
   #:export (make-stencil-test
             stencil-test?
diff --git a/chickadee/render/texture.scm b/chickadee/graphics/texture.scm
index 4aea488..397ecc4 100644
--- a/chickadee/render/texture.scm
+++ b/chickadee/graphics/texture.scm
@@ -15,7 +15,7 @@
 ;;; along with this program.  If not, see
 ;;; <http://www.gnu.org/licenses/>.
 
-(define-module (chickadee render texture)
+(define-module (chickadee graphics texture)
   #:use-module (ice-9 format)
   #:use-module (ice-9 match)
   #:use-module (rnrs bytevectors)
@@ -27,9 +27,9 @@
   #:use-module ((sdl2 surface) #:prefix sdl2:)
   #:use-module (oop goops)
   #:use-module (chickadee math rect)
-  #:use-module (chickadee render color)
-  #:use-module (chickadee render gl)
-  #:use-module (chickadee render gpu)
+  #:use-module (chickadee graphics color)
+  #:use-module (chickadee graphics gl)
+  #:use-module (chickadee graphics gpu)
   #:export (make-texture
             make-texture-region
             load-image
diff --git a/chickadee/render/tiled.scm b/chickadee/graphics/tiled.scm
index 7ce8c53..4f79a63 100644
--- a/chickadee/render/tiled.scm
+++ b/chickadee/graphics/tiled.scm
@@ -21,15 +21,15 @@
 ;;
 ;;; Code:
 
-(define-module (chickadee render tiled)
+(define-module (chickadee graphics tiled)
   #:use-module (chickadee math matrix)
   #:use-module (chickadee math rect)
   #:use-module (chickadee math vector)
-  #:use-module (chickadee render)
-  #:use-module (chickadee render color)
-  #:use-module (chickadee render sprite)
-  #:use-module (chickadee render texture)
-  #:use-module (chickadee render viewport)
+  #:use-module (chickadee graphics)
+  #:use-module (chickadee graphics color)
+  #:use-module (chickadee graphics sprite)
+  #:use-module (chickadee graphics texture)
+  #:use-module (chickadee graphics viewport)
   #:use-module (ice-9 match)
   #:use-module (srfi srfi-1)
   #:use-module (srfi srfi-9)
diff --git a/chickadee/render/viewport.scm b/chickadee/graphics/viewport.scm
index 7b9a192..5fd2e9b 100644
--- a/chickadee/render/viewport.scm
+++ b/chickadee/graphics/viewport.scm
@@ -21,14 +21,14 @@
 ;;
 ;;; Code:
 
-(define-module (chickadee render viewport)
+(define-module (chickadee graphics viewport)
   #:use-module (ice-9 match)
   #: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 graphics color)
+  #:use-module (chickadee graphics gl)
+  #:use-module (chickadee graphics gpu)
   #:export (make-viewport
             viewport?
             viewport-x
diff --git a/doc/api.texi b/doc/api.texi
index 84bcaed..a227cdc 100644
--- a/doc/api.texi
+++ b/doc/api.texi
@@ -1530,7 +1530,7 @@ will@dots{}
 
 Okay, okay.  We all know what colors are.  Chickadee provides a data
 type to represent color and some convenient procedures to work with
-them in the @code{(chickadee render color)} module.  Colors are made
+them in the @code{(chickadee graphics color)} module.  Colors are made
 up of four components, or channels: red, green, blue, and alpha
 (transparency.)  Each of these values is expressed as a uniform
 floating point value in the range [0, 1].  0 means that color channel
@@ -1756,7 +1756,7 @@ Tango color palette}.
 @subsection Textures
 
 Textures are essentially images: a 2D grid of color values.  The
-@code{(chickadee render texture)} module provides an interface for
+@code{(chickadee graphics texture)} module provides an interface for
 working with texture objects.
 
 @deffn {Procedure} load-image file [#:min-filter nearest] @
@@ -1868,7 +1868,7 @@ bitmap that is rendered to the screen.  For 2D games, sprites are the
 most essential graphical abstraction.  They are used for drawing maps,
 players, NPCs, items, particles, text, etc.
 
-In Chickadee, the @code{(chickadee render sprite)} module provides the
+In Chickadee, the @code{(chickadee graphics sprite)} module provides the
 interface for working with sprites.  Bitmaps are stored in textures
 (@pxref{Textures}) and can be used to draw sprites via the
 @code{draw-sprite} procedure.
@@ -2001,7 +2001,7 @@ A tile map is a scene created by composing lots of small sprites,
 called ``tiles'', into a larger image.  One program for editing such
 maps is called @url{http://mapeditor.org,Tiled}.  Chickadee has native
 support for loading and rendering Tiled maps in the @code{(chickadee
-render tiled)} module.
+graphics tiled)} module.
 
 @deffn {Procedure} load-tile-map file-name
 Load the Tiled formatted map in @var{file-name} and return a new tile
@@ -2212,7 +2212,7 @@ Return the list of points that form @var{polygon}.
 @subsection Lines and Shapes
 
 Sprites are fun, but sometimes simple, untextured lines and polygons
-are desired.  That's where the @code{(chickadee render shapes)} module
+are desired.  That's where the @code{(chickadee graphics shapes)} module
 comes in!
 
 @deffn {Procedure} draw-line start end @
@@ -2280,7 +2280,7 @@ bitmap fonts.  A default font named Inconsolata is used for all text
 rendering operations where a font is not specified, as is the case in
 the above example.
 
-The following procedures can be found in the @code{(chickadee render
+The following procedures can be found in the @code{(chickadee graphics
 font)} module:
 
 @deffn {Procedure} load-font file-name point-size [#:char-set]
@@ -2349,14 +2349,14 @@ all of these effects, and more, can be accomplished by turning a few
 configuration knobs in a ``particle system''.  A particle system takes
 care of managing the many miniscule moving morsels so the developer
 can quickly produce an effect and move on with their life.  The
-@code{(chickadee render particles)} module provides an API for
+@code{(chickadee graphics particles)} module provides an API for
 manipulating particle systems.
 
 Below is an example of a very simple particle system that utilizes
 nearly all of the default configuration settings:
 
 @example
-(use-modules (chickadee render particles))
+(use-modules (chickadee graphics particles))
 (define texture (load-image "particle.png"))
 (define particles (make-particles 2000 #:texture texture))
 @end example
@@ -2504,7 +2504,7 @@ Here's some basic boilerplate to render a 3D model:
 (use-modules (chickadee)
              (chickadee math)
              (chickadee math matrix)
-             (chickadee render model))
+             (chickadee graphics model))
 
 (define model #f)
 (define projection-matrix
@@ -2642,7 +2642,7 @@ render to two different viewports, each occupying a different half of
 the screen.  For information about how to set the current viewport,
 see @code{with-viewport} in @ref{Rendering Engine}.
 
-The @code{(chickadee render viewport)} module provides the following
+The @code{(chickadee graphics viewport)} module provides the following
 API:
 
 @deffn {Procedure} make-viewport x y width height @
@@ -2704,7 +2704,7 @@ would be tedious to have to have to specify them each time
 @code{gpu-apply} is called.
 
 The following procedures and syntax can be found in the
-@code{(chickadee render)} module.
+@code{(chickadee graphics)} module.
 
 @deffn {Syntax} gpu-apply shader vertex-array @
                           [#:uniform-key uniform-value @dots{}]
@@ -2795,7 +2795,7 @@ Alright, let's brush aside all of those pretty high level abstractions
 and discuss what is going on under the hood.  The GPU exists as a
 discrete piece of hardware separate from the CPU.  In order to make it
 draw things, we must ship lots of data out of our memory space and
-into the GPU.  The @code{(chickadee render buffer}) module provides an
+into the GPU.  The @code{(chickadee graphics buffer}) module provides an
 API for manipulating GPU buffers.
 
 In OpenGL terminology, a chunk of data allocated on the GPU is a
@@ -2804,7 +2804,7 @@ that could be transformed into a GPU buffer that packs together vertex
 position and texture coordinates:
 
 @example
-(use-modules (chickadee render buffer) (srfi srfi-4))
+(use-modules (chickadee graphics buffer) (srfi srfi-4))
 (define data
   (f32vector -8.0 -8.0 ; 2D vertex
              0.0 0.0   ; 2D texture coordinate
@@ -3139,7 +3139,7 @@ Return the primitive rendering mode for @var{vertex-array}.
 
 Shaders are programs that the GPU can evaluate that allow the
 programmer to completely customized the final output of a GPU draw
-call.  The @code{(chickadee render shader)} module provides an API for
+call.  The @code{(chickadee graphics shader)} module provides an API for
 building custom shaders.
 
 Shaders are written in the OpenGL Shading Language, or GLSL for short.
diff --git a/examples/audio.scm b/examples/audio.scm
index b3e1de4..c9885a2 100644
--- a/examples/audio.scm
+++ b/examples/audio.scm
@@ -1,7 +1,7 @@
 (use-modules (chickadee)
              (chickadee audio)
              (chickadee math vector)
-             (chickadee render font)
+             (chickadee graphics font)
              (ice-9 match))
 
 (define effect #f)
diff --git a/examples/game-controller.scm b/examples/game-controller.scm
index 77a0ac0..44070ac 100644
--- a/examples/game-controller.scm
+++ b/examples/game-controller.scm
@@ -1,9 +1,9 @@
 (use-modules (chickadee)
              (chickadee math vector)
-             (chickadee render color)
-             (chickadee render font)
-             (chickadee render sprite)
-             (chickadee render texture)
+             (chickadee graphics color)
+             (chickadee graphics font)
+             (chickadee graphics sprite)
+             (chickadee graphics texture)
              (ice-9 match))
 
 (define batch #f)
diff --git a/examples/grid.scm b/examples/grid.scm
index e9fe2cc..58ada10 100644
--- a/examples/grid.scm
+++ b/examples/grid.scm
@@ -2,11 +2,11 @@
              (chickadee math grid)
              (chickadee math vector)
              (chickadee math rect)
-             (chickadee render)
-             (chickadee render color)
-             (chickadee render font)
-             (chickadee render shapes)
-             (chickadee render sprite))
+             (chickadee graphics)
+             (chickadee graphics color)
+             (chickadee graphics font)
+             (chickadee graphics shapes)
+             (chickadee graphics sprite))
 
 (define grid (make-grid))
 (define item-color (make-color 0.7 0.0 0.0 0.5))
diff --git a/examples/lines.scm b/examples/lines.scm
index b7a551a..6750083 100644
--- a/examples/lines.scm
+++ b/examples/lines.scm
@@ -2,8 +2,8 @@
              (srfi srfi-1)
              (chickadee)
              (chickadee math vector)
-             (chickadee render color)
-             (chickadee render shapes))
+             (chickadee graphics color)
+             (chickadee graphics shapes))
 
 (define lines
   (list-tabulate 48
diff --git a/examples/model.scm b/examples/model.scm
index 5980e85..d345988 100644
--- a/examples/model.scm
+++ b/examples/model.scm
@@ -2,9 +2,9 @@
              (chickadee math)
              (chickadee math matrix)
              (chickadee math vector)
-             (chickadee render)
-             (chickadee render model)
-             (chickadee render font)
+             (chickadee graphics)
+             (chickadee graphics model)
+             (chickadee graphics font)
              (ice-9 format))
 
 (define projection (perspective-projection (/ pi 3) (/ 4.0 3.0) 0.1 500.0))
diff --git a/examples/nine-patch.scm b/examples/nine-patch.scm
index ff5b9a8..d8988c8 100644
--- a/examples/nine-patch.scm
+++ b/examples/nine-patch.scm
@@ -1,9 +1,9 @@
 (use-modules (chickadee)
              (chickadee math rect)
              (chickadee math vector)
-             (chickadee render font)
-             (chickadee render sprite)
-             (chickadee render texture))
+             (chickadee graphics font)
+             (chickadee graphics sprite)
+             (chickadee graphics texture))
 
 (define image #f)
 
diff --git a/examples/particles.scm b/examples/particles.scm
index c51f62f..5b42025 100644
--- a/examples/particles.scm
+++ b/examples/particles.scm
@@ -1,12 +1,12 @@
 (use-modules (chickadee)
              (chickadee math rect)
              (chickadee math vector)
-             (chickadee render)
-             (chickadee render color)
-             (chickadee render font)
-             (chickadee render particles)
-             (chickadee render sprite)
-             (chickadee render texture)
+             (chickadee graphics)
+             (chickadee graphics color)
+             (chickadee graphics font)
+             (chickadee graphics particles)
+             (chickadee graphics sprite)
+             (chickadee graphics texture)
              (chickadee scripting)
              (ice-9 format)
              ((sdl2) #:select (sdl-ticks)))
diff --git a/examples/sprite-batch.scm b/examples/sprite-batch.scm
index 4bddf8f..d4cccb5 100644
--- a/examples/sprite-batch.scm
+++ b/examples/sprite-batch.scm
@@ -2,10 +2,10 @@
              (chickadee math matrix)
              (chickadee math rect)
              (chickadee math vector)
-             (chickadee render)
-             (chickadee render font)
-             (chickadee render sprite)
-             (chickadee render texture)
+             (chickadee graphics)
+             (chickadee graphics font)
+             (chickadee graphics sprite)
+             (chickadee graphics texture)
              (chickadee scripting)
              (ice-9 format)
              (ice-9 match)
diff --git a/examples/sprite.scm b/examples/sprite.scm
index 0e8b4b3..a132c92 100644
--- a/examples/sprite.scm
+++ b/examples/sprite.scm
@@ -1,7 +1,7 @@
 (use-modules (chickadee)
              (chickadee math vector)
-             (chickadee render sprite)
-             (chickadee render texture))
+             (chickadee graphics sprite)
+             (chickadee graphics texture))
 
 (define sprite #f)
 
diff --git a/examples/text.scm b/examples/text.scm
index df0a2ed..dd9c83a 100644
--- a/examples/text.scm
+++ b/examples/text.scm
@@ -1,6 +1,6 @@
 (use-modules (chickadee)
              (chickadee math vector)
-             (chickadee render font))
+             (chickadee graphics font))
 
 (define (draw alpha)
   (draw-text "The quick brown fox jumps over the lazy dog.\nFive hexing wizard bots jump quickly."
diff --git a/examples/tiled.scm b/examples/tiled.scm
index e6099df..e1bf22a 100644
--- a/examples/tiled.scm
+++ b/examples/tiled.scm
@@ -1,8 +1,8 @@
 (use-modules (chickadee)
              (chickadee math vector)
              (chickadee math rect)
-             (chickadee render font)
-             (chickadee render tiled)
+             (chickadee graphics font)
+             (chickadee graphics tiled)
              (ice-9 format)
              (ice-9 match)
              (srfi srfi-11))