diff options
author | David Thompson <dthompson2@worcester.edu> | 2014-06-07 19:57:06 -0400 |
---|---|---|
committer | David Thompson <dthompson2@worcester.edu> | 2014-06-07 19:57:06 -0400 |
commit | c2a4f0636569978a40cb5c98875d798624909eb2 (patch) | |
tree | ca0d993826c0adde719e3a88aec255626281340d /2d/sprite.scm | |
parent | def69615603e49bb17b09c7352295578f9dd67af (diff) |
Replace vector2 module with a more generic vector module.
* 2d/vector2.scm: Delete it.
* 2d/vector.scm: New file.
* Makefile.am (SOURCES): s/vector2/vector.
* 2d/font.scm:
* 2d/keyboard.scm:
* 2d/mouse.scm:
* 2d/rect.scm:
* 2d/shader.scm:
* 2d/sprite.scm:
* 2d/texture.scm:
* 2d/transform.scm:
* 2d/window.scm:
* examples/2048/2048:
* examples/animation.scm:
* examples/coroutine.scm:
* examples/font.scm:
* examples/particles.scm:
* examples/simple.scm:
* examples/tilemap.scm: Use vectors instead of defunct vector2.
Diffstat (limited to '2d/sprite.scm')
-rw-r--r-- | 2d/sprite.scm | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/2d/sprite.scm b/2d/sprite.scm index 39bc746..a672d58 100644 --- a/2d/sprite.scm +++ b/2d/sprite.scm @@ -38,7 +38,7 @@ #:use-module (2d shader) #:use-module (2d signal) #:use-module (2d texture) - #:use-module (2d vector2) + #:use-module (2d vector) #:use-module (2d window) #:use-module (2d wrappers gl) #:export (enable-sprites @@ -101,17 +101,17 @@ (texture-t2 texture)))) (define* (make-sprite drawable #:optional #:key - (position (vector2 0 0)) (scale (vector2 1 1)) + (position #(0 0)) (scale #(1 1)) (rotation 0) (color white) (anchor 'center)) "Create a new sprite object. DRAWABLE is either a texture or animation object. All keyword arguments are optional. POSITION is a -vector2 object with a default of (0, 0). SCALE is a vector2 object -that describes how much DRAWABLE should be strected on the x and y -axes, with a default of 1x scale. ROTATION is an angle in degrees -with a default of 0. COLOR is a color object with a default of white. -ANCHOR is either a vector2 that represents the center point of the -sprite, or 'center which will place the anchor at the center of -DRAWABLE. Sprites are centered by default." +vector with a default of (0, 0). SCALE is a vector that describes how +much DRAWABLE should be strected on the x and y axes, with a default +of 1x scale. ROTATION is an angle in degrees with a default of 0. +COLOR is a color object with a default of white. ANCHOR is either a +vector that represents the center point of the sprite, or 'center +which will place the anchor at the center of DRAWABLE. Sprites are +centered by default." (let* ((vertices (make-packed-array texture-vertex 4)) (animator (if (animation? drawable) (make-animator drawable) @@ -123,7 +123,7 @@ DRAWABLE. Sprites are centered by default." sprite)) (define* (load-sprite filename #:optional #:key - (position (vector2 0 0)) (scale (vector2 1 1)) + (position #(0 0)) (scale #(1 1)) (rotation 0) (color white) (anchor 'center)) "Load a sprite from the file at FILENAME. See make-sprite for optional keyword arguments." |