diff options
Diffstat (limited to 'chickadee/math/matrix.scm')
| -rw-r--r-- | chickadee/math/matrix.scm | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/chickadee/math/matrix.scm b/chickadee/math/matrix.scm index 17c5f49..4616643 100644 --- a/chickadee/math/matrix.scm +++ b/chickadee/math/matrix.scm @@ -64,9 +64,9 @@ matrix4-rotate-z! matrix4-rotate-z matrix4-2d-transform! - transform-x - transform-y - transform!)) + matrix4-transform-x + matrix4-transform-y + matrix4-transform!)) ;;; @@ -690,20 +690,20 @@ happens with respect to ORIGIN, a 2D vector." (f32vector-set! bv 12 (- x (* ox q) (* oy s))) (f32vector-set! bv 13 (- y (* ox r) (* oy t))))))) -(define-inlinable (transform-x matrix x y) +(define-inlinable (matrix4-transform-x matrix x y) (let ((bv (matrix4-bv matrix))) (+ (* x (matrix4-ref bv 0 0)) (* y (matrix4-ref bv 1 0)) (matrix4-ref bv 3 0)))) -(define-inlinable (transform-y matrix x y) +(define-inlinable (matrix4-transform-y matrix x y) (let ((bv (matrix4-bv matrix))) (+ (* x (matrix4-ref bv 0 1)) (* y (matrix4-ref bv 1 1)) (matrix4-ref bv 3 1)))) -(define-inlinable (transform! matrix v) +(define-inlinable (matrix4-transform! matrix v) (let ((x (vec2-x v)) (y (vec2-y v))) - (set-vec2-x! v (transform-x matrix x y)) - (set-vec2-y! v (transform-y matrix x y)))) + (set-vec2-x! v (matrix4-transform-x matrix x y)) + (set-vec2-y! v (matrix4-transform-y matrix x y)))) |