From c2a4f0636569978a40cb5c98875d798624909eb2 Mon Sep 17 00:00:00 2001
From: David Thompson <dthompson2@worcester.edu>
Date: Sat, 7 Jun 2014 19:57:06 -0400
Subject: 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.
---
 2d/rect.scm | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

(limited to '2d/rect.scm')

diff --git a/2d/rect.scm b/2d/rect.scm
index e3584d3..3a74ae2 100644
--- a/2d/rect.scm
+++ b/2d/rect.scm
@@ -24,7 +24,7 @@
 
 (define-module (2d rect)
   #:use-module (srfi srfi-9)
-  #:use-module (2d vector2)
+  #:use-module (2d vector)
   #:export (<rect>
             make-rect
             null-rect
@@ -92,23 +92,23 @@
   (+ (rect-y rect) (rect-height rect)))
 
 (define (rect-position rect)
-  "Return the top-left corner of RECT as a vector2."
-  (vector2 (rect-x rect)
-           (rect-y rect)))
+  "Return the top-left corner of RECT as a vector."
+  (vector (rect-x rect)
+          (rect-y rect)))
 
 (define rect-top-left rect-position)
 
 (define (rect-top-right rect)
-  (vector2 (rect-right rect)
-           (rect-top   rect)))
+  (vector (rect-right rect)
+          (rect-top   rect)))
 
 (define (rect-bottom-left rect)
-  (vector2 (rect-left   rect)
-           (rect-bottom rect)))
+  (vector (rect-left   rect)
+          (rect-bottom rect)))
 
 (define (rect-bottom-right rect)
-  (vector2 (rect-right  rect)
-           (rect-bottom rect)))
+  (vector (rect-right  rect)
+          (rect-bottom rect)))
 
 (define (rect-center-x rect)
   (+ (rect-x rect) (rect-half-width rect)))
@@ -117,8 +117,8 @@
   (+ (rect-y rect) (rect-half-height rect)))
 
 (define (rect-center rect)
-  (vector2 (rect-center-x rect)
-           (rect-center-y rect)))
+  (vector (rect-center-x rect)
+          (rect-center-y rect)))
 
 (define (rect-half-width rect)
   (/ (rect-width rect) 2))
@@ -127,9 +127,9 @@
   (/ (rect-height rect) 2))
 
 (define (rect-size rect)
-  "Return the size of RECT as a vector2."
-  (vector2 (rect-width rect)
-           (rect-height rect)))
+  "Return the size of RECT as a vector."
+  (vector (rect-width rect)
+          (rect-height rect)))
 
 (define (%rect-move rect x y)
   "Move RECT by the offset X, Y."
@@ -141,7 +141,7 @@
 (define rect-move
   (case-lambda
     "Create a new rectangle by moving RECT by the given
-offset. rect-move accepts a vector2 or x and y coordinates as separate
+offset. rect-move accepts a vector or x and y coordinates as separate
 arguments."
     ((rect v)
      (%rect-move rect (vx v) (vy v)))
@@ -159,7 +159,7 @@ its current center."
 (define rect-inflate
   (case-lambda
     "Create a new rectangle by growing RECT by the given amount
-without changing the center point. rect-inflate accepts a vector2 or x
+without changing the center point. rect-inflate accepts a vector or x
 and y coordinates as separate arguments."
     ((rect v)
      (%rect-inflate rect (vx v) (vy v)))
-- 
cgit v1.2.3