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/vector2.scm | 112 ---------------------------------------------------------
 1 file changed, 112 deletions(-)
 delete mode 100644 2d/vector2.scm

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

diff --git a/2d/vector2.scm b/2d/vector2.scm
deleted file mode 100644
index bc425a1..0000000
--- a/2d/vector2.scm
+++ /dev/null
@@ -1,112 +0,0 @@
-;;; guile-2d
-;;; Copyright (C) 2013, 2014 David Thompson <dthompson2@worcester.edu>
-;;;
-;;; This program is free software: you can redistribute it and/or
-;;; modify it under the terms of the GNU General Public License as
-;;; published by the Free Software Foundation, either version 3 of the
-;;; License, or (at your option) any later version.
-;;;
-;;; This program is distributed in the hope that it will be useful,
-;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-;;; General Public License for more details.
-;;;
-;;; You should have received a copy of the GNU General Public License
-;;; along with this program.  If not, see
-;;; <http://www.gnu.org/licenses/>.
-
-;;; Commentary:
-;;
-;; 2D vector math operations.
-;;
-;;; Code:
-
-(define-module (2d vector2)
-  #:use-module (ice-9 match)
-  #:use-module (srfi srfi-1)
-  #:use-module (srfi srfi-9)
-  #:export (<vector2>
-            vector2
-            vector2?
-            vx
-            vy
-            null-vector2
-            identity-vector2
-            vector2-polar
-            v+
-            v*
-            vmag
-            vnorm
-            vdot
-            vcross))
-
-(define-record-type <vector2>
-  (vector2 x y)
-  vector2?
-  (x vx)
-  (y vy))
-
-(define null-vector2 (vector2 0 0))
-(define identity-vector2 (vector2 1 1))
-
-(define (vector2-polar r theta)
-  "Convert the polar coordinates (R, THETA) into a cartesian vector."
-  (vector2 (* r (cos theta))
-           (* r (sin theta))))
-
-(define (v= v1 v2)
-  "Return #t if V1 and V2 are equivalent, #f otherwise."
-  (and (= (vx v1) (vx v2))
-       (= (vy v1) (vy v2))))
-
-(define (v+ . vectors)
-  "Return the sum of all VECTORS."
-  (define (add-vectors x y vectors)
-    (cond ((null? vectors)
-           (vector2 x y))
-          (else
-           (add-vectors (+ x (vx (car vectors)))
-                        (+ y (vy (car vectors)))
-                        (cdr vectors)))))
-  (add-vectors 0 0 vectors))
-
-(define (v* . vectors)
-  "Return the product of all VECTORS.  Alternatively, a single vector
-and a scalar can be specified to perform scalar multiplication."
-  (define (multiply-vectors x y vectors)
-    (cond ((null? vectors)
-           (vector2 x y))
-          (else
-           (multiply-vectors (* x (vx (car vectors)))
-                             (* y (vy (car vectors)))
-                             (cdr vectors)))))
-  (match vectors
-    ((($ <vector2> x y) (? number? k))
-     (vector2 (* x k) (* y k)))
-    (_ (multiply-vectors 1 1 vectors))))
-
-(define (vmag v)
-  "Return the magnitude of the vector V."
-  (sqrt (+ (expt (vx v) 2)
-           (expt (vy v) 2))))
-
-(define (vnorm v)
-  "Normalize the vector V."
-  (let ((m (vmag v)))
-    (if (zero? m)
-        null-vector2
-        (vector2 (/ (vx v) m)
-                 (/ (vy v) m)))))
-
-(define (vdot v1 v2)
-  "Return the dot product of the vectors V1 and V2."
-  (+ (* (vx v1) (vx v2))
-     (* (vy v1) (vy v2))))
-
-(define (vcross v1 v2)
-  "Return the cross product of the vectors V1 and V2. Technically, the
-cross product of a 2D vector is not defined. This function instead
-returns the Z coordinate of the cross product as if the vectors were
-in 3D space."
-  (- (* (vx v1) (vy v2))
-     (* (vy v1) (vx v2))))
-- 
cgit v1.2.3