shadowfacts/lwjgl2-arm64
1
0
Fork 0
mirror of https://github.com/shadowfacts/lwjgl2-arm64.git synced 2026-04-04 14:07:52 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Various org.lwjgl.vector bugs found by cfmdobbie fixed

Browse source
This commit is contained in:
Elias Naur 2003-08-30 14:25:10 +00:00
parent ba3acc79b9
commit bdfd1735c5
10 changed files with 85 additions and 197 deletions
Download patch file Download diff file Expand all files Collapse all files

31
src/java/org/lwjgl/vector/Matrix3f.java
View file

@ -330,25 +330,22 @@ public class Matrix3f extends Matrix implements Serializable {
* @return the transposed matrix
*/
public Matrix3f transpose(Matrix3f dest) {
if (dest == null)
if (dest == null) {
dest = new Matrix3f();
if (this != dest) {
m00 = dest.m00;
m01 = dest.m10;
m02 = dest.m20;
m10 = dest.m01;
m11 = dest.m11;
m12 = dest.m21;
m20 = dest.m02;
m21 = dest.m12;
m22 = dest.m22;
} else
dest.m00 = m00;
dest.m01 = m10;
dest.m02 = m20;
dest.m10 = m01;
dest.m11 = m11;
dest.m12 = m21;
dest.m20 = m02;
dest.m21 = m12;
dest.m22 = m22;
return dest;
} else {
transpose();
return this;
return this;
}
}
/**

43
src/java/org/lwjgl/vector/Matrix4f.java
View file

@ -635,28 +635,29 @@ public class Matrix4f extends Matrix implements Serializable {
* @return the transposed matrix
*/
public Matrix4f transpose(Matrix4f dest) {
if (this != dest) {
m00 = dest.m00;
m01 = dest.m10;
m02 = dest.m20;
m03 = dest.m30;
m10 = dest.m01;
m11 = dest.m11;
m12 = dest.m21;
m13 = dest.m31;
m20 = dest.m02;
m21 = dest.m12;
m22 = dest.m22;
m23 = dest.m32;
m30 = dest.m03;
m31 = dest.m13;
m32 = dest.m23;
m33 = dest.m33;
} else
if (dest == null) {
dest = new Matrix4f();
dest.m00 = m00;
dest.m01 = m10;
dest.m02 = m20;
dest.m03 = m30;
dest.m10 = m01;
dest.m11 = m11;
dest.m12 = m21;
dest.m13 = m31;
dest.m20 = m02;
dest.m21 = m12;
dest.m22 = m22;
dest.m23 = m32;
dest.m30 = m03;
dest.m31 = m13;
dest.m32 = m23;
dest.m33 = m33;
return dest;
} else {
transpose();
return dest;
return this;
}
}
/**

2
src/java/org/lwjgl/vector/Vector.java
View file

@ -82,7 +82,7 @@ public abstract class Vector implements Serializable {
* Normalise this vector
* @return this
*/
public final Vector normalize() {
public final Vector normalise() {
float len = length();
if (len != 0.0f) {
float l = 1.0f / len;

15
src/java/org/lwjgl/vector/Vector2f.java
View file

@ -60,7 +60,7 @@ public class Vector2f extends Vector implements Serializable {
public Vector2f(Vector2f src) {
set(src);
}
/**
* Constructor
*/
@ -241,4 +241,17 @@ public class Vector2f extends Vector implements Serializable {
return this;
}
/* (non-Javadoc)
* @see java.lang.Object#toString()
*/
public String toString() {
StringBuffer sb = new StringBuffer(64);
sb.append("Vector2f[");
sb.append(x);
sb.append(", ");
sb.append(y);
sb.append(']');
return sb.toString();
}
}