summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Thompson <dthompson2@worcester.edu>2023-05-24 07:29:59 -0400
committerDavid Thompson <dthompson2@worcester.edu>2023-05-24 07:30:22 -0400
commit81abe5c60a48650ffe7ce646f983007418f81a19 (patch)
tree1cf828e728a5068291a516f2cb813d68c28010af
parenteb5588476a6ee10b6e57632539012143a160aa87 (diff)
Move pixbuf module to (chickadee graphics ...) namespace.
-rw-r--r--Makefile.am2
-rw-r--r--chickadee/graphics/framebuffer.scm2
-rw-r--r--chickadee/graphics/pixbuf.scm (renamed from chickadee/pixbuf.scm)2
-rw-r--r--chickadee/graphics/skybox.scm2
-rw-r--r--chickadee/graphics/text.scm2
-rw-r--r--chickadee/graphics/texture.scm2
-rw-r--r--chickadee/image.scm2
7 files changed, 7 insertions, 7 deletions
diff --git a/Makefile.am b/Makefile.am
index 4b3593d..00162a3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -63,7 +63,6 @@ SOURCES = \
chickadee/audio/vorbis.scm \
chickadee/audio/wav.scm \
chickadee/audio.scm \
- chickadee/pixbuf.scm \
chickadee/image.scm \
chickadee/image/jpeg.scm \
chickadee/image/png.scm \
@@ -76,6 +75,7 @@ SOURCES = \
chickadee/graphics/stencil.scm \
chickadee/graphics/multisample.scm \
chickadee/graphics/buffer.scm \
+ chickadee/graphics/pixbuf.scm \
chickadee/graphics/texture.scm \
chickadee/graphics/shader.scm \
chickadee/graphics/viewport.scm \
diff --git a/chickadee/graphics/framebuffer.scm b/chickadee/graphics/framebuffer.scm
index a05d6ef..bee4b7d 100644
--- a/chickadee/graphics/framebuffer.scm
+++ b/chickadee/graphics/framebuffer.scm
@@ -29,9 +29,9 @@
#:use-module (chickadee graphics color)
#:use-module (chickadee graphics engine)
#:use-module (chickadee graphics gl)
+ #:use-module (chickadee graphics pixbuf)
#:use-module ((chickadee graphics texture) #:select (make-texture null-texture))
#:use-module (chickadee graphics viewport)
- #:use-module (chickadee pixbuf)
#:export (make-framebuffer
framebuffer?
framebuffer-texture
diff --git a/chickadee/pixbuf.scm b/chickadee/graphics/pixbuf.scm
index c15a0b7..c6a9e13 100644
--- a/chickadee/pixbuf.scm
+++ b/chickadee/graphics/pixbuf.scm
@@ -19,7 +19,7 @@
;;
;;; Code:
-(define-module (chickadee pixbuf)
+(define-module (chickadee graphics pixbuf)
#:use-module (chickadee graphics color)
#:use-module (chickadee utils)
#:use-module (ice-9 exceptions)
diff --git a/chickadee/graphics/skybox.scm b/chickadee/graphics/skybox.scm
index 57e2f81..31fcd76 100644
--- a/chickadee/graphics/skybox.scm
+++ b/chickadee/graphics/skybox.scm
@@ -26,10 +26,10 @@
#:use-module (chickadee graphics color)
#:use-module (chickadee graphics depth)
#:use-module (chickadee graphics engine)
+ #:use-module (chickadee graphics pixbuf)
#:use-module (chickadee graphics polygon)
#:use-module (chickadee graphics shader)
#:use-module (chickadee graphics texture)
- #:use-module (chickadee pixbuf)
#:use-module (srfi srfi-9)
#:export (make-skybox
skybox?
diff --git a/chickadee/graphics/text.scm b/chickadee/graphics/text.scm
index 12269ac..20b8ca5 100644
--- a/chickadee/graphics/text.scm
+++ b/chickadee/graphics/text.scm
@@ -37,10 +37,10 @@
#:use-module (chickadee math matrix)
#:use-module (chickadee math rect)
#:use-module (chickadee math vector)
- #:use-module (chickadee pixbuf)
#:use-module (chickadee graphics blend)
#:use-module (chickadee graphics color)
#:use-module (chickadee graphics engine)
+ #:use-module (chickadee graphics pixbuf)
#:use-module (chickadee graphics shader)
#:use-module (chickadee graphics sprite)
#:use-module (chickadee graphics texture)
diff --git a/chickadee/graphics/texture.scm b/chickadee/graphics/texture.scm
index b6595ee..c78db50 100644
--- a/chickadee/graphics/texture.scm
+++ b/chickadee/graphics/texture.scm
@@ -29,8 +29,8 @@
#:use-module (chickadee graphics color)
#:use-module (chickadee graphics engine)
#:use-module (chickadee graphics gl)
+ #:use-module (chickadee graphics pixbuf)
#:use-module (chickadee image)
- #:use-module (chickadee pixbuf)
#:use-module (chickadee utils)
#:export (make-texture
make-texture-region
diff --git a/chickadee/image.scm b/chickadee/image.scm
index 48dddac..015891e 100644
--- a/chickadee/image.scm
+++ b/chickadee/image.scm
@@ -21,9 +21,9 @@
(define-module (chickadee image)
#:use-module (chickadee graphics color)
+ #:use-module (chickadee graphics pixbuf)
#:use-module (chickadee image jpeg)
#:use-module (chickadee image png)
- #:use-module (chickadee pixbuf)
#:use-module (chickadee utils)
#:use-module (ice-9 exceptions)
#:use-module (ice-9 match)