Anvilcraft/resonant-induction
2
1
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Removed Matrix4 as it was unused/unfinished

Browse source
This commit is contained in:
DarkGuardsman 2013-09-02 15:38:54 -04:00
parent 3e9849b45e
commit 9f34cb4748
2 changed files with 3 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/dark/prefab/helpers/Matrix4.java
View file

@ -1,9 +0,0 @@
package dark.prefab.helpers;
public class Matrix4
{
public Matrix4(float f, float g, float h, float i, float j, float k, float l, float m, float n, float o, float p, float q, float r, float s, float t, float u)
{
}
}

6
src/dark/prefab/helpers/Quaternion.java
View file

@ -4,7 +4,7 @@ import universalelectricity.core.vector.Vector3;
/** This code is converted from C code to java based off of this tutorial /** This code is converted from C code to java based off of this tutorial
* http://content.gpwiki.org/index.php/OpenGL:Tutorials:Using_Quaternions_to_represent_rotation * http://content.gpwiki.org/index.php/OpenGL:Tutorials:Using_Quaternions_to_represent_rotation
* *
* @author DarkGuardsman */ * @author DarkGuardsman */
public class Quaternion public class Quaternion
{ {
@ -142,7 +142,7 @@ public class Quaternion
normalise(); normalise();
} }
// Convert to Matrix /* Convert to Matrix
public Matrix4 getMatrix() public Matrix4 getMatrix()
{ {
float x2 = (float) (x * x); float x2 = (float) (x * x);
@ -160,7 +160,7 @@ public class Quaternion
// by // by
// OpenGL // OpenGL
return new Matrix4(1.0f - 2.0f * (y2 + z2), 2.0f * (xy - wz), 2.0f * (xz + wy), 0.0f, 2.0f * (xy + wz), 1.0f - 2.0f * (x2 + z2), 2.0f * (yz - wx), 0.0f, 2.0f * (xz - wy), 2.0f * (yz + wx), 1.0f - 2.0f * (x2 + y2), 0.0f, 0.0f, 0.0f, 0.0f, 1.0f); return new Matrix4(1.0f - 2.0f * (y2 + z2), 2.0f * (xy - wz), 2.0f * (xz + wy), 0.0f, 2.0f * (xy + wz), 1.0f - 2.0f * (x2 + z2), 2.0f * (yz - wx), 0.0f, 2.0f * (xz - wy), 2.0f * (yz + wx), 1.0f - 2.0f * (x2 + y2), 0.0f, 0.0f, 0.0f, 0.0f, 1.0f);
} }*/
// Convert to Axis/Angles // Convert to Axis/Angles
public void getAxisAngle(Vector3 axis, float angle) public void getAxisAngle(Vector3 axis, float angle)