From f83b60e1e5af3384ee5adc3af0ff8acccab49f6d Mon Sep 17 00:00:00 2001 From: karai17 Date: Wed, 20 Jul 2016 18:36:04 -0300 Subject: [PATCH] Fixed transforms multiplying in the wrong order --- modules/mat4.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/mat4.lua b/modules/mat4.lua index 9a4c6fb..ec0ba3a 100644 --- a/modules/mat4.lua +++ b/modules/mat4.lua @@ -331,7 +331,7 @@ function mat4.scale(out, a, s) tmp[6] = s.y tmp[11] = s.z - return out:mul(a, tmp) + return out:mul(tmp, a) end function mat4.rotate(out, a, angle, axis) @@ -369,7 +369,7 @@ function mat4.translate(out, a, t) tmp[14] = t.y tmp[15] = t.z - return out:mul(a, tmp) + return out:mul(tmp, a) end function mat4.shear(out, a, yx, zx, xy, zy, xz, yz) @@ -381,7 +381,7 @@ function mat4.shear(out, a, yx, zx, xy, zy, xz, yz) tmp[9] = xz or 0 tmp[10] = yz or 0 - return out:mul(a, tmp) + return out:mul(tmp, a) end function mat4.look_at(out, a, eye, center, up)