From 7a9bca4236be4aada18ea88b43097f680fe56165 Mon Sep 17 00:00:00 2001 From: Ryan Oldenburg <guzba8@gmail.com> Date: Sun, 29 Nov 2020 23:52:10 -0600 Subject: [PATCH] more --- src/vmath.nim | 32 ++++++++++++-------------------- 1 file changed, 12 insertions(+), 20 deletions(-) diff --git a/src/vmath.nim b/src/vmath.nim index f1c9fbb..7609136 100644 --- a/src/vmath.nim +++ b/src/vmath.nim @@ -550,27 +550,19 @@ proc `*`*(a: Mat3, b: Mat3): Mat3 = result[2, 1] += b[2, 0] * a[0, 1] + b[2, 1] * a[1, 1] + b[2, 2] * a[2, 1] result[2, 2] += b[2, 0] * a[0, 2] + b[2, 1] * a[1, 2] + b[2, 2] * a[2, 2] -proc scale*(a: Mat3, v: Vec2): Mat3 = - result[0] = v.x * a[0] - result[1] = v.x * a[1] - result[2] = v.x * a[2] - result[3] = v.y * a[3] - result[4] = v.y * a[4] - result[5] = v.y * a[5] - result[6] = a[6] - result[7] = a[7] - result[8] = a[8] +proc scale*(a: Mat3, v: Vec2): Mat3 {.inline.} = + [ + v.x * a[0], v.x * a[1], v.x * a[2], + v.y * a[3], v.y * a[4], v.y * a[5], + a[6], a[7], a[8] + ] -proc scale*(a: Mat3, v: Vec3): Mat3 = - result[0] = v.x * a[0] - result[1] = v.x * a[1] - result[2] = v.x * a[2] - result[3] = v.y * a[3] - result[4] = v.y * a[4] - result[5] = v.y * a[5] - result[6] = v.z * a[6] - result[7] = v.z * a[7] - result[8] = v.z * a[8] +proc scale*(a: Mat3, v: Vec3): Mat3 {.inline.} = + [ + v.x * a[0], v.x * a[1], v.x * a[2], + v.y * a[3], v.y * a[4], v.y * a[5], + v.z * a[6], v.z * a[7], v.z * a[8] + ] proc translate*(v: Vec2): Mat3 {.inline.} = [