jatria-soft/etk
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

[DEBUG] correct the Matrix4f invertion

Browse Source
This commit is contained in:
Edouard DUPIN 2022-03-20 11:17:21 +01:00
parent 70bd9606ca
commit d9c9d3dae2
4 changed files with 98 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
.classpath
View File

@ -5,31 +5,27 @@
<attribute name="optional" value="true"/>
</attributes>
</classpathentry>
<classpathentry including="**/*.java" kind="src" output="out/eclipse/classes-test" path="test/src">
<classpathentry kind="src" output="out/eclipse/classes-test" path="test/src">
<attributes>
<attribute name="test" value="true"/>
<attribute name="optional" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
<attributes>
<attribute name="module" value="true"/>
</attributes>
</classpathentry>
<classpathentry exported="true" kind="lib" path="lib/spotbugs-annotations-4.2.2.jar">
<attributes>
<attribute name="module" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/5">
<attributes>
<attribute name="test" value="true"/>
</attributes>
</classpathentry>
<classpathentry combineaccessrules="false" exported="true" kind="src" path="/scenarium-logger">
<attributes>
<attribute name="module" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
<attributes>
<attribute name="module" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="lib" path="lib/spotbugs-annotations-4.2.2.jar">
<attributes>
<attribute name="module" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/5"/>
<classpathentry kind="output" path="out/eclipse/classes"/>
</classpath>

11
.project
View File

@ -21,4 +21,15 @@
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
</natures>
<filteredResources>
<filter>
<id>1646149232198</id>
<name></name>
<type>30</type>
<matcher>
<id>org.eclipse.core.resources.regexFilterMatcher</id>
<arguments>node_modules|.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
</matcher>
</filter>
</filteredResources>
</projectDescription>

41
src/org/atriasoft/etk/math/Matrix4f.java
View File

@ -166,7 +166,7 @@ public record Matrix4f(
final float cosVal = (float) Math.cos(angleRad);
final float sinVal = (float) Math.sin(angleRad);
final float invVal = 1.0f - cosVal;
// set rotation :
// set rotation :
a1 = normal.x() * normal.x() * invVal + cosVal;
b1 = normal.x() * normal.y() * invVal - normal.z() * sinVal;
c1 = normal.x() * normal.z() * invVal + normal.y() * sinVal;
@ -458,22 +458,27 @@ public record Matrix4f(
return this;
}
float a1 = coFactorRaw0Col0() / det;
float b1 = coFactorRaw0Col1() / det;
float b1 = -coFactorRaw0Col1() / det;
float c1 = coFactorRaw0Col2() / det;
float d1 = coFactorRaw0Col3() / det;
float a2 = coFactorRaw1Col0() / det;
float d1 = -coFactorRaw0Col3() / det;
float a2 = -coFactorRaw1Col0() / det;
float b2 = coFactorRaw1Col1() / det;
float c2 = coFactorRaw1Col2() / det;
float c2 = -coFactorRaw1Col2() / det;
float d2 = coFactorRaw1Col3() / det;
float a3 = coFactorRaw2Col0() / det;
float b3 = coFactorRaw2Col1() / det;
float b3 = -coFactorRaw2Col1() / det;
float c3 = coFactorRaw2Col2() / det;
float d3 = coFactorRaw2Col3() / det;
float a4 = coFactorRaw3Col0() / det;
float d3 = -coFactorRaw2Col3() / det;
float a4 = -coFactorRaw3Col0() / det;
float b4 = coFactorRaw3Col1() / det;
float c4 = coFactorRaw3Col2() / det;
float c4 = -coFactorRaw3Col2() / det;
float d4 = coFactorRaw3Col3() / det;
return new Matrix4f(a1, b1, c1, d1, a2, b2, c2, d2, a3, b3, c3, d3, a4, b4, c4, d4);
//return new Matrix4f(a1, b1, c1, a4, a2, b2, c2, b4, a3, b3, c3, c4, d1, d2, d3, d4);
}
/**
@ -533,8 +538,22 @@ public record Matrix4f(
*/
@CheckReturnValue
public Vector3f multiply(final Vector3f point) {
return new Vector3f(this.a1 * point.x() + this.b1 * point.y() + this.c1 * point.z() + this.d1, this.a2 * point.x() + this.b2 * point.y() + this.c2 * point.z() + this.d2,
this.a3 * point.x() + this.b3 * point.y() + this.c3 * point.z() + this.d3);
return new Vector3f(this.a1 * point.x() + this.b1 * point.y() + this.c1 * point.z() + this.d1, // X
this.a2 * point.x() + this.b2 * point.y() + this.c2 * point.z() + this.d2, // Y
this.a3 * point.x() + this.b3 * point.y() + this.c3 * point.z() + this.d3); // Z
}
/**
* Operator* apply matrix on a vector
* @param point Point value to apply the matrix
* @return New vector containing the value
*/
@CheckReturnValue
public Vector4f multiply(final Vector4f point) {
return new Vector4f(this.a1 * point.x() + this.b1 * point.y() + this.c1 * point.z() + this.d1 * point.w(), // X
this.a2 * point.x() + this.b2 * point.y() + this.c2 * point.z() + this.d2 * point.w(), // Y
this.a3 * point.x() + this.b3 * point.y() + this.c3 * point.z() + this.d3 * point.w(), // Z
this.a4 * point.x() + this.b4 * point.y() + this.c4 * point.z() + this.d4 * point.w()); // W
}
/**

45
test/src/test/atriasoft/etk/TestMatrix4.java Normal file
View File

@ -0,0 +1,45 @@
/*******************************************************************************
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at https://mozilla.org/MPL/2.0/.
*
* Contributors:
* Edouard DUPIN - initial API and implementation
******************************************************************************/
package test.atriasoft.etk;
import static org.junit.jupiter.api.Assertions.assertEquals;
import org.atriasoft.etk.math.Matrix4f;
import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
public class TestMatrix4 {
@Test
@Order(4)
public void invert() {
Matrix4f tmp = new Matrix4f(1, 1, 1, -1, 1, 1, -1, 1, 1, -1, 1, 1, -1, 1, 1, 1);
Matrix4f tmpInvert = tmp.invert();
assertEquals(tmpInvert.a1(), 0.25f);
assertEquals(tmpInvert.b1(), 0.25f);
assertEquals(tmpInvert.c1(), 0.25f);
assertEquals(tmpInvert.d1(), -0.25f);
assertEquals(tmpInvert.a2(), 0.25f);
assertEquals(tmpInvert.b2(), 0.25f);
assertEquals(tmpInvert.c2(), -0.25f);
assertEquals(tmpInvert.d2(), 0.25f);
assertEquals(tmpInvert.a3(), 0.25f);
assertEquals(tmpInvert.b3(), -0.25f);
assertEquals(tmpInvert.c3(), 0.25f);
assertEquals(tmpInvert.d3(), 0.25f);
assertEquals(tmpInvert.a4(), -0.25f);
assertEquals(tmpInvert.b4(), 0.25f);
assertEquals(tmpInvert.c4(), 0.25f);
assertEquals(tmpInvert.d4(), 0.25f);
}
}