java-game-lib-cvs Mailing List for Lightweight Java Game Library

Update of /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/vector
In directory sc8-pr-cvs1:/tmp/cvs-serv6179/src/java/org/lwjgl/vector

Modified Files:
	Matrix3f.java Matrix4f.java 
Log Message:
More vector fixes by cfmdobbie

Index: Matrix3f.java
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/vector/Matrix3f.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/vector/Matrix3f.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- Matrix3f.java	30 Aug 2003 14:25:09 -0000	1.19
+++ Matrix3f.java	1 Sep 2003 12:45:47 -0000	1.20
@@ -330,22 +330,27 @@
 	 * @return the transposed matrix
 	 */
 	public Matrix3f transpose(Matrix3f dest) {
-		if (dest == null) {
-			dest = new Matrix3f();
-			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;
-		}
+		if (dest == null) { 
+		   // New matrix needed to store transpose 
+		   dest = new Matrix3f(); 
+		} 
+		if (this == dest) { 
+		   // Destination and source are the same!  Run the in-place 
+		   // transpose instead as the copy transpose will be destructive. 
+		   transpose(); 
+		} else { 
+		   // Destination differs from source.  Perform copy transpose 
+		   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; 
 	}
 
 	/**

Index: Matrix4f.java
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/vector/Matrix4f.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/vector/Matrix4f.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- Matrix4f.java	30 Aug 2003 14:25:09 -0000	1.22
+++ Matrix4f.java	1 Sep 2003 12:45:47 -0000	1.23
@@ -635,30 +635,35 @@
 	 * @return the transposed matrix
 	 */
 	public Matrix4f transpose(Matrix4f dest) {
-		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 this;
-		}
-	}
+		if (dest == null) { 
+		   // New matrix needed to store transpose 
+		   dest = new Matrix4f(); 
+		} 
+		if (this == dest) { 
+		   // Destination and source are the same!  Run the in-place 
+		   // transpose instead as the copy transpose will be destructive. 
+		   transpose(); 
+		} else { 
+		   // Destination differs from source.  Perform copy transpose 
+		   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; 
+ 	}
 
 	/**
 	 * @return the determinant of the matrix

Update of /cvsroot/java-game-lib/LWJGL/src/native
In directory sc8-pr-cvs1:/tmp/cvs-serv6179/src/native

Modified Files:
	Makefile.am autogen.sh configure.in 
Added Files:
	acinclude.m4 
Log Message:
More vector fixes by cfmdobbie

CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/acinclude.m4

Index: Makefile.am
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/Makefile.am
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/Makefile.am,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Makefile.am	30 Aug 2003 14:25:09 -0000	1.3
+++ Makefile.am	1 Sep 2003 12:45:47 -0000	1.4
@@ -1,4 +1,3 @@
 SUBDIRS = common linux
 
 lib_LTLIBRARIES = liblwjgl.la
-liblwjgl_LDADD

Index: autogen.sh
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/autogen.sh
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/autogen.sh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- autogen.sh	30 Aug 2003 14:25:09 -0000	1.4
+++ autogen.sh	1 Sep 2003 12:45:47 -0000	1.5
@@ -2,7 +2,8 @@
 #WANT_AUTOMAKE_1_5=1
 
 #autoheader linux
-libtoolize --force
 aclocal
-automake --foreign --include-deps --add-missing --copy
+autoheader
+libtoolize --force
 autoconf
+automake --foreign --include-deps --add-missing --copy

Index: configure.in
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/configure.in
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/configure.in,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- configure.in	30 Aug 2003 14:25:09 -0000	1.26
+++ configure.in	1 Sep 2003 12:45:47 -0000	1.27
@@ -5,6 +5,7 @@
 AC_INIT
 AM_INIT_AUTOMAKE(LWJGL, 0.7)
 AC_CONFIG_SRCDIR([autogen.sh])
+AM_CONFIG_HEADER([config.h])
 
 AC_DISABLE_STATIC
 AC_LIBTOOL_DLOPEN
@@ -24,7 +25,15 @@
 # Checks for header files.
 AC_PATH_X
 AC_HEADER_STDC
-AC_CHECK_HEADERS([stddef.h stdlib.h string.h sys/time.h])
+
+AC_JNI_INCLUDE_DIR
+
+for JNI_INCLUDE_DIR in $JNI_INCLUDE_DIRS
+do
+    CPPFLAGS="$CPPFLAGS -I$JNI_INCLUDE_DIR"
+done
+
+AC_CHECK_HEADER([stddef.h stdlib.h string.h sys/time.h])
 
 # Checks for typedefs, structures, and compiler characteristics.
 AC_HEADER_STDBOOL