diff options
author | Sven Gothel <[email protected]> | 2014-06-28 03:02:25 +0200 |
---|---|---|
committer | Sven Gothel <[email protected]> | 2014-06-28 03:02:25 +0200 |
commit | ee774dce9e474e8ea961bd9b504d26e9321e1b15 (patch) | |
tree | 9af71ec07329226ae3882b5a586fd16292b45864 /src/test | |
parent | 0bded476868c5fdfe44502bfd55957469d0d72bb (diff) |
Enhance FloatUtil: More optimizations, concludes commit 0bded476868c5fdfe44502bfd55957469d0d72bb
FloatUtil optimizations (unroll and linear memeory access):
- transposeMatrix
- invertMatrix (diff algo as well - 50% speed bump)
- multMatrix
- multMatrixVec
FloatUtil added
- matrixDeterminant(..)
FloatUtil removed
- Certain FloatBuffer variants are removed
or at least marked deprecated.
Diffstat (limited to 'src/test')
-rw-r--r-- | src/test/com/jogamp/opengl/test/junit/jogl/math/TestFloatUtil02MatrixMatrixMultNOUI.java (renamed from src/test/com/jogamp/opengl/test/junit/jogl/math/TestFloatUtil01MatrixMatrixMultNOUI.java) | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/math/TestFloatUtil01MatrixMatrixMultNOUI.java b/src/test/com/jogamp/opengl/test/junit/jogl/math/TestFloatUtil02MatrixMatrixMultNOUI.java index ca8461d6a..feb5d3245 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/math/TestFloatUtil01MatrixMatrixMultNOUI.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/math/TestFloatUtil02MatrixMatrixMultNOUI.java @@ -3,14 +3,14 @@ * * Redistribution and use in source and binary forms, with or without modification, are * permitted provided that the following conditions are met: - * + * * 1. Redistributions of source code must retain the above copyright notice, this list of * conditions and the following disclaimer. - * + * * 2. Redistributions in binary form must reproduce the above copyright notice, this list * of conditions and the following disclaimer in the documentation and/or other materials * provided with the distribution. - * + * * THIS SOFTWARE IS PROVIDED BY JogAmp Community ``AS IS'' AND ANY EXPRESS OR IMPLIED * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JogAmp Community OR @@ -20,12 +20,12 @@ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * + * * The views and conclusions contained in the software and documentation are those of the * authors and should not be interpreted as representing official policies, either expressed * or implied, of JogAmp Community. */ - + package com.jogamp.opengl.test.junit.jogl.math; import org.junit.Assert; @@ -36,7 +36,7 @@ import org.junit.runners.MethodSorters; import com.jogamp.opengl.math.FloatUtil; @FixMethodOrder(MethodSorters.NAME_ASCENDING) -public class TestFloatUtil01MatrixMatrixMultNOUI { +public class TestFloatUtil02MatrixMatrixMultNOUI { final float[] m1 = new float[]{ 1, 3, 4, 0, 6, 7, 8, 5, @@ -48,7 +48,7 @@ public class TestFloatUtil01MatrixMatrixMultNOUI { 4, 8, 6, 2, 0, 5, 9, 5 }; - final float[] m1xm2_RM = // m2xm1_CM + final float[] m1xm2_RM = // m2xm1_CM new float[]{ 26, 59, 143, 71, 59, 174, 730, 386, 143, 730, 9770, 5370, @@ -72,19 +72,19 @@ public class TestFloatUtil01MatrixMatrixMultNOUI { @Test public void testCM_m1xm2(){ - + float[] r = new float[16]; - + FloatUtil.multMatrix(m1, 0, m2, 0, r, 0); Assert.assertArrayEquals(m2xm1_RM, r, 0f); } - + @Test public void testCM_m2xm1(){ - + float[] r = new float[16]; - + FloatUtil.multMatrix(m2, 0, m1, 0, r, 0); Assert.assertArrayEquals(m1xm2_RM, r, 0f); @@ -92,25 +92,25 @@ public class TestFloatUtil01MatrixMatrixMultNOUI { @Test public void testRM_m1xm2(){ - + float[] r = new float[16]; multMatrixf_RM(m1, 0, m2, 0, r, 0); Assert.assertArrayEquals(m1xm2_RM, r, 0f); } - + @Test public void testRM_m2xm1(){ - + float[] r = new float[16]; multMatrixf_RM(m2, 0, m1, 0, r, 0); Assert.assertArrayEquals(m2xm1_RM, r, 0f); } - + public static void main(String args[]) { - org.junit.runner.JUnitCore.main(TestFloatUtil01MatrixMatrixMultNOUI.class.getName()); + org.junit.runner.JUnitCore.main(TestFloatUtil02MatrixMatrixMultNOUI.class.getName()); } } |