replaced buffers with arrays

src/java/org/lwjgl/opengl/glu/GLU.java

@@ -1,8 +1,6 @@
 package org.lwjgl.opengl.glu;
 
 import java.nio.ByteBuffer;
-import java.nio.FloatBuffer;
-import java.nio.IntBuffer;
 
 import org.lwjgl.opengl.GL11;
 import org.lwjgl.opengl.GL12;
@@ -264,10 +262,10 @@ public class GLU {
 	 * @return
 	 */
 	public static boolean gluProject(float objx, float objy, float objz,
-			FloatBuffer modelMatrix,
+			float[][] modelMatrix,
-			FloatBuffer projMatrix,
+			float[][] projMatrix,
-			IntBuffer viewport,
+			int[] viewport,
-			FloatBuffer win_pos)
+			float[] win_pos)
 	{
 		return Project.gluProject(objx, objy, objz, modelMatrix, projMatrix, viewport, win_pos);
 	}
@@ -284,10 +282,10 @@ public class GLU {
 	 * @return
 	 */
 	public static boolean gluUnProject(float winx, float winy, float winz,
-			FloatBuffer modelMatrix,
+			float[][] modelMatrix,
-			FloatBuffer projMatrix,
+			float[][] projMatrix,
-			IntBuffer viewport,
+			int[] viewport,
-			FloatBuffer obj_pos)
+			float[] obj_pos)
 	{
 		return Project.gluUnProject(winx, winy, winz, modelMatrix, projMatrix, viewport, obj_pos);
 	}
@@ -305,7 +303,7 @@ public class GLU {
 			float y,
 			float width,
 			float height,
-			IntBuffer viewport) {
+			int[] viewport) {
 
 		Project.gluPickMatrix(x, y, width, height, viewport);
 	}

src/java/org/lwjgl/opengl/glu/Project.java

@@ -4,7 +4,6 @@ import org.lwjgl.BufferUtils;
 import org.lwjgl.opengl.GL11;
 
 import java.nio.FloatBuffer;
-import java.nio.IntBuffer;
 
 /**
  * Project.java
@@ -16,15 +15,15 @@ import java.nio.IntBuffer;
  */
 public class Project extends Util {
 
-	private static final float[] IDENTITY_MATRIX = new float[] {
+	private static final float[] IDENTITY_MATRIX =
-		1.0f, 0.0f, 0.0f, 0.0f,
+		new float[] {
-		0.0f, 1.0f, 0.0f, 0.0f,
+			1.0f, 0.0f, 0.0f, 0.0f,
-		0.0f, 0.0f, 1.0f, 0.0f,
+			0.0f, 1.0f, 0.0f, 0.0f,
-		0.0f, 0.0f, 0.0f, 1.0f
+			0.0f, 0.0f, 1.0f, 0.0f,
-	};
+			0.0f, 0.0f, 0.0f, 1.0f };
 
 	private static final FloatBuffer matrix = BufferUtils.createFloatBuffer(16);
-	private static final FloatBuffer finalMatrix = BufferUtils.createFloatBuffer(16);
+	private static final float[][] finalMatrix = new float[4][4];
 
 	private static final float[][] tempMatrix = new float[4][4];
 	private static final float[] in = new float[4];
@@ -43,6 +42,12 @@ public class Project extends Util {
 		m.position(oldPos);
 	}
 
+	private static void __gluMakeIdentityf(float[][] m) {
+		for (int i = 0; i < 16; i++) {
+			m[i>>2][i%4] = IDENTITY_MATRIX[i];
+		}
+	}
+	
 	/**
 	 * Method __gluMultMatrixVecf
 	 * 
@@ -50,12 +55,14 @@ public class Project extends Util {
 	 * @param in
 	 * @param out
 	 */
-	private static void __gluMultMatrixVecf(FloatBuffer finalMatrix, float[] in, float[] out) {
+	private static void __gluMultMatrixVecf(float[][] finalMatrix, float[] in, float[] out) {
-		for ( int i = 0; i < 4; i++ ) {
+		for (int i = 0; i < 4; i++) {
-			out[i] = in[0] * finalMatrix.get((0 * 4) + i)
+			out[i] =
-			         + in[1] * finalMatrix.get((1 * 4) + i)
+				in[0] * finalMatrix[0][i]
-			         + in[2] * finalMatrix.get((2 * 4) + i)
+					+ in[1] * finalMatrix[1][i]
-			         + in[3] * finalMatrix.get((3 * 4) + i);
+					+ in[2] * finalMatrix[2][1]
+					+ in[3] * finalMatrix[3][i];
+
 		}
 	}
 
@@ -65,66 +72,71 @@ public class Project extends Util {
 	 * 
 	 * @return
 	 */
-	private static boolean __gluInvertMatrixf(FloatBuffer src, FloatBuffer inverse) {
+	private static boolean __gluInvertMatrixf(float[][] src, float[][] inverse) {
 		int i, j, k, swap;
 		float t;
 		float[][] temp = Project.tempMatrix;
 
-		for ( i = 0; i < 4; i++ ) {
+		for (i = 0; i < 4; i++) {
-			for ( j = 0; j < 4; j++ ) {
+			for (j = 0; j < 4; j++) {
-				temp[i][j] = src.get((i << 2) + j);
+				temp[i][j] = src[i][j];
 			}
 		}
 		__gluMakeIdentityf(inverse);
 
-		for ( i = 0; i < 4; i++ ) {
+		for (i = 0; i < 4; i++) {
 			/*
-			 ** Look for largest element in column
+			 * * Look for largest element in column
 			 */
 			swap = i;
-			for ( j = i + 1; j < 4; j++ ) {
+			for (j = i + 1; j < 4; j++) {
-				/*if (fabs(temp[j][i]) > fabs(temp[i][i])) {
+				/*
-				 swap = j;
+				 * if (fabs(temp[j][i]) > fabs(temp[i][i])) { swap = j;
-				 }*/
+				 */
-				if ( Math.abs(temp[j][i]) > Math.abs(temp[i][i]) ) {
+				if (Math.abs(temp[j][i]) > Math.abs(temp[i][i])) {
 					swap = j;
 				}
 			}
 
-			if ( swap != i ) {
+			if (swap != i) {
 				/*
-				 ** Swap rows.
+				 * * Swap rows.
 				 */
-				for ( k = 0; k < 4; k++ ) {
+				for (k = 0; k < 4; k++) {
 					t = temp[i][k];
 					temp[i][k] = temp[swap][k];
 					temp[swap][k] = t;
 
-					t = inverse.get((i << 2) + k);
+					t = inverse[i][k];
-					inverse.put((i << 2) + k, inverse.get((swap << 2) + k));
+					inverse[i][k] = inverse[swap][k];
-					inverse.put((swap << 2) + k, t);
+					//inverse.put((i << 2) + k, inverse.get((swap << 2) + k));
+					inverse[swap][k] = t;
+					//inverse.put((swap << 2) + k, t);
 				}
 			}
 
-			if ( temp[i][i] == 0 ) {
+			if (temp[i][i] == 0) {
 				/*
-				 ** No non-zero pivot.  The matrix is singular, which shouldn't
+				 * * No non-zero pivot. The matrix is singular, which shouldn't *
-				 ** happen.  This means the user gave us a bad matrix.
+				 * happen. This means the user gave us a bad matrix.
 				 */
 				return false;
 			}
 
 			t = temp[i][i];
-			for ( k = 0; k < 4; k++ ) {
+			for (k = 0; k < 4; k++) {
 				temp[i][k] /= t;
-				inverse.put((i << 2) + k, inverse.get((i << 2) + k) / t);
+				inverse[i][k] = inverse[i][k] / t;
 			}
-			for ( j = 0; j < 4; j++ ) {
+			for (j = 0; j < 4; j++) {
-				if ( j != i ) {
+				if (j != i) {
 					t = temp[j][i];
-					for ( k = 0; k < 4; k++ ) {
+					for (k = 0; k < 4; k++) {
 						temp[j][k] -= temp[i][k] * t;
-						inverse.put((j << 2) + k, inverse.get((j << 2) + k) - inverse.get((i << 2) + k) * t);
+						inverse[j][k] = inverse[j][k] - inverse[i][k] * t;
+						/*inverse.put(
+							(j << 2) + k,
+							inverse.get((j << 2) + k) - inverse.get((i << 2) + k) * t);*/
 					}
 				}
 			}
@@ -137,14 +149,11 @@ public class Project extends Util {
 	 * @param b
 	 * @param r
 	 */
-	private static void __gluMultMatricesf(FloatBuffer a, FloatBuffer b, FloatBuffer r) {
+	private static void __gluMultMatricesf(float[][] a, float[][] b, float[][] r) {
-		for ( int i = 0; i < 4; i++ ) {
+		for (int i = 0; i < 4; i++) {
-			for ( int j = 0; j < 4; j++ ) {
+			for (int j = 0; j < 4; j++) {
-				r.put((i << 2) + j,
+				r[i][j] =
-				      a.get((i << 2) + 0) * b.get((0 * 4) + j) +
+					a[i][0] * b[0][j] + a[i][1] * b[1][j] + a[i][2] * b[2][j] + a[i][3] * b[3][j];
-				      a.get((i << 2) + 1) * b.get((1 * 4) + j) +
-				      a.get((i << 2) + 2) * b.get((2 * 4) + j) +
-				      a.get((i << 2) + 3) * b.get((3 * 4) + j));
 			}
 		}
 	}
@@ -162,19 +171,19 @@ public class Project extends Util {
 		float radians = fovy / 2 * GLU.PI / 180;
 
 		deltaZ = zFar - zNear;
-		sine = (float)Math.sin(radians);
+		sine = (float) Math.sin(radians);
 
-		if ( (deltaZ == 0) || (sine == 0) || (aspect == 0) ) {
+		if ((deltaZ == 0) || (sine == 0) || (aspect == 0)) {
 			return;
 		}
 
-		cotangent = (float)Math.cos(radians) / sine;
+		cotangent = (float) Math.cos(radians) / sine;
 
 		__gluMakeIdentityf(matrix);
 
 		matrix.put(0 * 4 + 0, cotangent / aspect);
 		matrix.put(1 * 4 + 1, cotangent);
-		matrix.put(2 * 4 + 2, -(zFar + zNear) / deltaZ);
+		matrix.put(2 * 4 + 2, - (zFar + zNear) / deltaZ);
 		matrix.put(2 * 4 + 3, -1);
 		matrix.put(3 * 4 + 2, -2 * zNear * zFar / deltaZ);
 		matrix.put(3 * 4 + 3, 0);
@@ -195,9 +204,16 @@ public class Project extends Util {
 	 * @param upy
 	 * @param upz
 	 */
-	public static void gluLookAt(float eyex, float eyey, float eyez,
+	public static void gluLookAt(
-	                             float centerx, float centery, float centerz,
+		float eyex,
-	                             float upx, float upy, float upz) {
+		float eyey,
+		float eyez,
+		float centerx,
+		float centery,
+		float centerz,
+		float upx,
+		float upy,
+		float upz) {
 		float[] forward = Project.forward;
 		float[] side = Project.side;
 		float[] up = Project.up;
@@ -249,11 +265,15 @@ public class Project extends Util {
 	 * 
 	 * @return
 	 */
-	public static boolean gluProject(float objx, float objy, float objz,
+	public static boolean gluProject(
-	                                 FloatBuffer modelMatrix,
+		float objx,
-	                                 FloatBuffer projMatrix,
+		float objy,
-	                                 IntBuffer viewport,
+		float objz,
-	                                 FloatBuffer win_pos) {
+		float[][] modelMatrix,
+		float[][] projMatrix,
+		int[] viewport,
+		float[] win_pos) {
+
 		float[] in = Project.in;
 		float[] out = Project.out;
 
@@ -265,7 +285,7 @@ public class Project extends Util {
 		__gluMultMatrixVecf(modelMatrix, in, out);
 		__gluMultMatrixVecf(projMatrix, out, in);
 
-		if ( in[3] == 0.0 )
+		if (in[3] == 0.0)
 			return false;
 
 		in[3] = (1.0f / in[3]) * 0.5f;
@@ -275,12 +295,10 @@ public class Project extends Util {
 		in[1] = in[1] * in[3] + 0.5f;
 		in[2] = in[2] * in[3] + 0.5f;
 
-		int pos = win_pos.position();
-
 		// Map x,y to viewport
-		win_pos.put(pos++, in[0] * viewport.get(2) + viewport.get(0));
+		win_pos[0] = in[0] * viewport[2] + viewport[0];
-		win_pos.put(pos++, in[1] * viewport.get(3) + viewport.get(1));
+		win_pos[1] = in[1] * viewport[3] + viewport[1];
-		win_pos.put(pos, in[2]);
+		win_pos[2] = in[2];
 
 		return true;
 	}
@@ -298,17 +316,20 @@ public class Project extends Util {
 	 * 
 	 * @return
 	 */
-	public static boolean gluUnProject(float winx, float winy, float winz,
+	public static boolean gluUnProject(
-	                                   FloatBuffer modelMatrix,
+		float winx,
-	                                   FloatBuffer projMatrix,
+		float winy,
-	                                   IntBuffer viewport,
+		float winz,
-	                                   FloatBuffer obj_pos) {
+		float[][] modelMatrix,
+		float[][] projMatrix,
+		int[] viewport,
+		float[] obj_pos) {
 		float[] in = Project.in;
 		float[] out = Project.out;
 
 		__gluMultMatricesf(modelMatrix, projMatrix, finalMatrix);
 
-		if ( !__gluInvertMatrixf(finalMatrix, finalMatrix) )
+		if (!__gluInvertMatrixf(finalMatrix, finalMatrix))
 			return false;
 
 		in[0] = winx;
@@ -317,8 +338,8 @@ public class Project extends Util {
 		in[3] = 1.0f;
 
 		// Map x and y from window coordinates
-		in[0] = (in[0] - viewport.get(0)) / viewport.get(2);
+		in[0] = (in[0] - viewport[0]) / viewport[2];
-		in[1] = (in[1] - viewport.get(1)) / viewport.get(3);
+		in[1] = (in[1] - viewport[1]) / viewport[3];
 
 		// Map to range -1 to 1
 		in[0] = in[0] * 2 - 1;
@@ -327,16 +348,14 @@ public class Project extends Util {
 
 		__gluMultMatrixVecf(finalMatrix, in, out);
 
-		if ( out[3] == 0.0 )
+		if (out[3] == 0.0)
 			return false;
 
 		out[3] = 1.0f / out[3];
 
-		int pos = obj_pos.position();
+		obj_pos[0] = out[0] * out[3];
-
+		obj_pos[1] = out[1] * out[3];
-		obj_pos.put(pos++, out[0] * out[3]);
+		obj_pos[2] = out[2] * out[3];
-		obj_pos.put(pos++, out[1] * out[3]);
-		obj_pos.put(pos, out[2] * out[3]);
 
 		return true;
 	}
@@ -350,15 +369,21 @@ public class Project extends Util {
 	 * @param deltaY
 	 * @param viewport
 	 */
-	public static void gluPickMatrix(float x, float y, float deltaX, float deltaY, IntBuffer viewport) {
+	public static void gluPickMatrix(
-		if ( deltaX <= 0 || deltaY <= 0 ) {
+		float x,
+		float y,
+		float deltaX,
+		float deltaY,
+		int[] viewport) {
+		if (deltaX <= 0 || deltaY <= 0) {
 			return;
 		}
 
 		/* Translate and scale the picked region to the entire window */
-		GL11.glTranslatef((viewport.get(2) - 2 * (x - viewport.get(0))) / deltaX,
+		GL11.glTranslatef(
-		                  (viewport.get(3) - 2 * (y - viewport.get(1))) / deltaY,
+			(viewport[2] - 2 * (x - viewport[0])) / deltaX,
-		                  0);
+			(viewport[3] - 2 * (y - viewport[1])) / deltaY,
-		GL11.glScalef(viewport.get(2) / deltaX, viewport.get(3) / deltaY, 1.0f);
+			0);
+		GL11.glScalef(viewport[2] / deltaX, viewport[3] / deltaY, 1.0f);
 	}
 }