diff options
author | David Thompson <dthompson2@worcester.edu> | 2014-11-07 22:22:17 -0500 |
---|---|---|
committer | David Thompson <dthompson2@worcester.edu> | 2014-11-07 22:22:17 -0500 |
commit | e3f07cfd92adfcd62d6605af16e122f85a4249dd (patch) | |
tree | de68e575c9f99cb180128ab95083970df1eedc43 /sly | |
parent | 694b82193877fdf2abbf790b61dbe0c8db8945a8 (diff) |
render: Move texture module to sly/render directory.
* sly/texture.scm: Delete.
* sly/render/texture.scm: New file.
* Makefile.am (SOURCES): Add it.
* sly/animation.scm: Use (sly render texture).
* sly/font.scm: Likewise.
* sly/mesh.scm: Likewise.
* sly/render/context.scm: Likewise.
* sly/render/framebuffer.scm: Likewise.
* sly/render/renderer.scm: Likewise.
* sly/shape.scm: Likewise.
* sly/sprite.scm: Likewise.
* sly/tileset.scm: Likewise.
* examples/coroutine.scm: Likewise.
* examples/joystick.scm: Likewise.
* examples/particles.scm: Likewise.
* examples/tilemap.scm: Likewise.
* examples/transition.scm: Likewise.
Diffstat (limited to 'sly')
-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 |
10 files changed, 10 insertions, 10 deletions
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 |