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/window.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/window.scm')
-rw-r--r-- | 2d/window.scm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/2d/window.scm b/2d/window.scm index 9b01e13..fe971c3 100644 --- a/2d/window.scm +++ b/2d/window.scm @@ -29,7 +29,7 @@ #:use-module (2d event) #:use-module (2d signal) #:use-module (2d transform) - #:use-module (2d vector2) + #:use-module (2d vector) #:export (make-window window? window-title @@ -54,7 +54,7 @@ (define* (make-window #:optional #:key (title "Guile-2D Window") - (resolution (vector2 640 480)) + (resolution #(640 480)) (fullscreen? #f)) (%make-window title resolution fullscreen?)) @@ -69,9 +69,9 @@ (define-signal window-size (hook->signal window-resize-hook - null-vector2 + #(0 0) (lambda (width height) - (vector2 width height)))) + #(width height)))) (define-signal window-width (signal-map vx window-size)) (define-signal window-height (signal-map vy window-size)) @@ -94,7 +94,7 @@ (let ((flags (if (window-fullscreen? window) '(opengl fullscreen) 'opengl)) (width (vx (window-resolution window))) (height (vy (window-resolution window)))) - (signal-set! window-size (vector2 width height)) + (signal-set! window-size (vector width height)) ;; Initialize everything (SDL:enable-unicode #t) (SDL:init 'everything) |