From 114b48dcfbc87174c56de8e45b382ddca9afbbba Mon Sep 17 00:00:00 2001 From: Tom Payne Date: Thu, 21 Nov 2013 10:12:47 +0100 Subject: [PATCH] Use goog.vec.Mat4.getElement in ol.vec.Mat4.multVec2 --- src/ol/vec/mat4.js | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/ol/vec/mat4.js b/src/ol/vec/mat4.js index d2f86b96ed..108369bf1d 100644 --- a/src/ol/vec/mat4.js +++ b/src/ol/vec/mat4.js @@ -39,8 +39,14 @@ ol.vec.Mat4.equal2D = function(mat1, mat2) { * chained together. */ ol.vec.Mat4.multVec2 = function(mat, vec, resultVec) { + var m00 = goog.vec.Mat4.getElement(mat, 0, 0); + var m10 = goog.vec.Mat4.getElement(mat, 1, 0); + var m01 = goog.vec.Mat4.getElement(mat, 0, 1); + var m11 = goog.vec.Mat4.getElement(mat, 1, 1); + var m03 = goog.vec.Mat4.getElement(mat, 0, 3); + var m13 = goog.vec.Mat4.getElement(mat, 1, 3); var x = vec[0], y = vec[1]; - resultVec[0] = x * mat[0] + y * mat[4] + mat[12]; - resultVec[1] = x * mat[1] + y * mat[5] + mat[13]; + resultVec[0] = m00 * x + m01 * y + m03; + resultVec[1] = m10 * x + m11 * y + m13; return resultVec; };