diff options
author | David Thompson <dthompson2@worcester.edu> | 2014-10-01 20:52:09 -0400 |
---|---|---|
committer | David Thompson <dthompson2@worcester.edu> | 2014-10-01 20:52:09 -0400 |
commit | 0735ffb5a06e71a27b215ab342522557bb51b7d1 (patch) | |
tree | 6d5f269030dfbf990ba1027ad3138538123edef7 /sly/window.scm | |
parent | 5e5920afad058cbb7a179b2be92271f1603da9e1 (diff) |
Rewrite vector math module.
* .gitignore: Ignore '*.log' files.
* sly/vector.scm: Delete file.
* sly/math/vector.scm: New file.
* tests/math/vector.scm: New file.
* Makefile.am: Add new file and remove the old one.
* sly/font.scm: Remove import.
* sly/game.scm: Change import.
* sly/joystick.scm (make-directional-signal-raw, make-directional): Use
'vector2'.
* sly/keyboard.scm (key-directions): Use 'vector2'.
* sly/mesh.scm (vertices-bytevector): Use new vector procedures.
* sly/mouse.scm (mouse-position): Use 'vector2'.
* sly/quaternion.scm (axis-angle->quaternion, quaternion->vector,
vector->quaternion): Use new vector procedures.
* sly/rect.scm (rect-position, rect-top-right, rect-bottom-left,
rect-bottom-right, rect-center, rect-size): Use 'vector2'.
* sly/scene.scm (make-scene-node): Use 'vector2'.
* sly/shader.scm: Change import.
* sly/shape.scm (make-cube): Use new vector procedures.
* sly/sprite.scm (make-sprite): Use new vector procedures.
* sly/texture.scm (anchor-texture): Use 'vector2'.
* sly/transform.scm (transform-vector2): Use 'vector2'.
(translate, scale): Use new vector procedures.
* sly/transition.scm (guess-interpolator): Use new vector procedures.
* sly/window.scm (make-window, window-size, open-window): Use 'vector2'.
Diffstat (limited to 'sly/window.scm')
-rw-r--r-- | sly/window.scm | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/sly/window.scm b/sly/window.scm index 0e400f5..10aee4d 100644 --- a/sly/window.scm +++ b/sly/window.scm @@ -28,7 +28,7 @@ #:use-module (sly event) #:use-module (sly signal) #:use-module (sly transform) - #:use-module (sly vector) + #:use-module (sly math vector) #:export (make-window window? window-title @@ -53,7 +53,7 @@ (define* (make-window #:optional #:key (title "Sly Window") - (resolution #(640 480)) + (resolution (vector2 640 480)) (fullscreen? #f)) (%make-window title resolution fullscreen?)) @@ -70,9 +70,8 @@ (define-signal window-size (hook->signal window-resize-hook - #(0 0) - (lambda (width height) - (vector width height)))) + (vector2 0 0) + vector2)) (define-signal window-width (signal-map vx window-size)) (define-signal window-height (signal-map vy window-size)) @@ -95,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 (vector width height)) + (signal-set! window-size (vector2 width height)) ;; Initialize everything (SDL:enable-unicode #t) (SDL:init 'everything) |