From 1050850d2498bb2e88f097702fe202c2260c21d2 Mon Sep 17 00:00:00 2001 From: David Thompson Date: Fri, 20 Jun 2014 08:03:59 -0400 Subject: Add support for 3D vectors in translate procedure. * 2d/transform.scm (translate): Support 3D vector as argument. --- 2d/transform.scm | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) (limited to '2d') diff --git a/2d/transform.scm b/2d/transform.scm index a1c05ea..ebb30e2 100644 --- a/2d/transform.scm +++ b/2d/transform.scm @@ -132,12 +132,25 @@ identity-transform if called without any arguments." (reduce mul identity-transform transforms)) (define (translate v) - "Return a new transform that translates the x and y axes by the -vector V." - (make-transform 1 0 0 0 - 0 1 0 0 - 0 0 1 0 - (vx v) (vy v) 0 1)) + "Return a new transform that translates by the 2D or 3D vector V." + (cond + ((vector2? v) + (let ((x (vx v)) + (y (vy v))) + (make-transform 1 0 0 0 + 0 1 0 0 + 0 0 1 0 + x y 0 1))) + ((vector3? v) + (let ((x (vx v)) + (y (vy v)) + (z (vz v))) + (make-transform 1 0 0 0 + 0 1 0 0 + 0 0 1 0 + x y z 1))) + (else + (error "Invalid scaling vector: " v)))) (define (scale v) "Return a new transform that scales by the 2D vector, 3D vector, or -- cgit v1.2.3