diff options
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | examples/coroutine.scm | 2 | ||||
| -rw-r--r-- | examples/joystick.scm | 2 | ||||
| -rw-r--r-- | examples/particles.scm | 2 | ||||
| -rw-r--r-- | examples/tilemap.scm | 2 | ||||
| -rw-r--r-- | examples/transition.scm | 2 | ||||
| -rw-r--r-- | sly/animation.scm | 2 | ||||
| -rw-r--r-- | sly/font.scm | 2 | ||||
| -rw-r--r-- | sly/mesh.scm | 2 | ||||
| -rw-r--r-- | sly/render/context.scm | 2 | ||||
| -rw-r--r-- | sly/render/framebuffer.scm | 2 | ||||
| -rw-r--r-- | sly/render/renderer.scm | 2 | ||||
| -rw-r--r-- | sly/render/texture.scm (renamed from sly/texture.scm) | 2 | ||||
| -rw-r--r-- | sly/shape.scm | 2 | ||||
| -rw-r--r-- | sly/sprite.scm | 2 | ||||
| -rw-r--r-- | sly/tileset.scm | 2 |
16 files changed, 16 insertions, 16 deletions
diff --git a/Makefile.am b/Makefile.am index 7a65af2..a5f1aa8 100644 --- a/Makefile.am +++ b/Makefile.am @@ -46,7 +46,6 @@ SOURCES = \ sly/shape.scm \ sly/signal.scm \ sly/sprite.scm \ - sly/texture.scm \ sly/tileset.scm \ sly/transform.scm \ sly/transition.scm \ @@ -55,6 +54,7 @@ SOURCES = \ sly/render/utils.scm \ sly/render/camera.scm \ sly/render/framebuffer.scm \ + sly/render/texture.scm \ sly/render/vertex-array.scm \ sly/render/context.scm \ sly/render/renderer.scm \ diff --git a/examples/coroutine.scm b/examples/coroutine.scm index ea7f881..708f174 100644 --- a/examples/coroutine.scm +++ b/examples/coroutine.scm @@ -20,7 +20,7 @@ (sly coroutine) (sly game) (sly sprite) - (sly texture) + (sly render texture) (sly vector) (sly window)) diff --git a/examples/joystick.scm b/examples/joystick.scm index 3df938d..268c1ee 100644 --- a/examples/joystick.scm +++ b/examples/joystick.scm @@ -25,7 +25,7 @@ (sly game) (sly repl) (sly sprite) - (sly texture) + (sly render texture) (sly joystick) (sly signal) (sly window) diff --git a/examples/particles.scm b/examples/particles.scm index a6c19a7..1d2f335 100644 --- a/examples/particles.scm +++ b/examples/particles.scm @@ -20,7 +20,7 @@ (sly agenda) (sly game) (sly sprite) - (sly texture) + (sly render texture) (sly vector) (sly window)) diff --git a/examples/tilemap.scm b/examples/tilemap.scm index bfe41b0..8ce7f81 100644 --- a/examples/tilemap.scm +++ b/examples/tilemap.scm @@ -21,7 +21,7 @@ (srfi srfi-42) (sly game) (sly sprite) - (sly texture) + (sly render texture) (sly tileset) (sly vector) (sly window) diff --git a/examples/transition.scm b/examples/transition.scm index 39f7a93..606942f 100644 --- a/examples/transition.scm +++ b/examples/transition.scm @@ -21,7 +21,7 @@ (sly window) (sly color) (sly signal) - (sly texture) + (sly render texture) (sly transition)) (load "common.scm") diff --git a/sly/animation.scm b/sly/animation.scm index d9ac11c..c64ee5d 100644 --- a/sly/animation.scm +++ b/sly/animation.scm @@ -23,7 +23,7 @@ (define-module (sly animation) #:use-module (srfi srfi-9) - #:use-module (sly texture)) + #:use-module (sly render texture)) ;;; ;;; Animations diff --git a/sly/font.scm b/sly/font.scm index 8ec62dc..9d28f74 100644 --- a/sly/font.scm +++ b/sly/font.scm @@ -36,7 +36,7 @@ #:use-module (sly mesh) #:use-module (sly shader) #:use-module (sly sprite) - #:use-module (sly texture) + #:use-module (sly render texture) #:export (enable-fonts load-font load-default-font diff --git a/sly/mesh.scm b/sly/mesh.scm index 2a0c8ec..eb6a53b 100644 --- a/sly/mesh.scm +++ b/sly/mesh.scm @@ -31,7 +31,7 @@ #:use-module (sly wrappers gl) #:use-module (sly color) #:use-module (sly shader) - #:use-module (sly texture) + #:use-module (sly render texture) #:use-module (sly math vector) #:use-module (sly signal) #:use-module (sly transform) diff --git a/sly/render/context.scm b/sly/render/context.scm index 67e233d..447dac0 100644 --- a/sly/render/context.scm +++ b/sly/render/context.scm @@ -28,7 +28,7 @@ #:use-module (gl low-level) #:use-module (sly wrappers gl) #:use-module (sly shader) - #:use-module (sly texture) + #:use-module (sly render texture) #:use-module (sly render utils) #:use-module (sly render vertex-array) #:export (make-render-context diff --git a/sly/render/framebuffer.scm b/sly/render/framebuffer.scm index c8e891f..a8c93d1 100644 --- a/sly/render/framebuffer.scm +++ b/sly/render/framebuffer.scm @@ -106,7 +106,7 @@ dimensions WIDTH x HEIGHT." (glBindRenderbuffer (version-3-0 renderbuffer) 0) (glBindFramebuffer (version-3-0 framebuffer) 0) ;; Build high-level framebuffer object. - (let ((texture ((@@ (sly texture) %make-texture) + (let ((texture ((@@ (sly render texture) %make-texture) texture-id #f width height 0 0 1 1))) (%make-framebuffer framebuffer-id renderbuffer-id texture)))))) diff --git a/sly/render/renderer.scm b/sly/render/renderer.scm index 19ab170..d04bf16 100644 --- a/sly/render/renderer.scm +++ b/sly/render/renderer.scm @@ -29,7 +29,7 @@ #:use-module (gl) #:use-module (gl low-level) #:use-module (sly shader) - #:use-module (sly texture) + #:use-module (sly render texture) #:use-module (sly transform) #:use-module (sly math vector) #:use-module (sly render utils) diff --git a/sly/texture.scm b/sly/render/texture.scm index b7221de..fbb97bb 100644 --- a/sly/texture.scm +++ b/sly/render/texture.scm @@ -22,7 +22,7 @@ ;; ;;; Code: -(define-module (sly texture) +(define-module (sly render texture) #:use-module (ice-9 match) #:use-module (srfi srfi-9) #:use-module (gl) diff --git a/sly/shape.scm b/sly/shape.scm index ed9e440..e7b7d26 100644 --- a/sly/shape.scm +++ b/sly/shape.scm @@ -25,7 +25,7 @@ #:use-module (sly math) #:use-module (sly mesh) #:use-module (sly shader) - #:use-module (sly texture) + #:use-module (sly render texture) #:use-module (sly math vector) #:export (make-cube)) diff --git a/sly/sprite.scm b/sly/sprite.scm index 33c679f..e452247 100644 --- a/sly/sprite.scm +++ b/sly/sprite.scm @@ -36,7 +36,7 @@ #:use-module (sly mesh) #:use-module (sly shader) #:use-module (sly signal) - #:use-module (sly texture) + #:use-module (sly render texture) #:use-module (sly math vector) #:export (make-sprite load-sprite diff --git a/sly/tileset.scm b/sly/tileset.scm index f66b6a8..24bbf54 100644 --- a/sly/tileset.scm +++ b/sly/tileset.scm @@ -25,7 +25,7 @@ (define-module (sly tileset) #:use-module (srfi srfi-9) #:use-module (srfi srfi-42) - #:use-module (sly texture) + #:use-module (sly render texture) #:export (<tileset> make-tileset load-tileset |