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

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

Modified Files:
	AL.java 
Log Message:
fix: call base destroy
fix: null references

Index: AL.java
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/openal/AL.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/openal/AL.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- AL.java	28 Apr 2003 21:50:11 -0000	1.7
+++ AL.java	28 Apr 2003 22:43:27 -0000	1.8
@@ -123,6 +123,12 @@
 		alc.destroyContext(context.context);
 		alc.closeDevice(device.device);
 		alc.destroy();
+    
+    alc = null;
+    device = null;
+    context = null;
+    
+    super.destroy();
 	}
 	
 	/**

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

Modified Files:
	AL.java 
Log Message:
Added destroy() method to prevent a crash

Index: AL.java
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/openal/AL.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/openal/AL.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- AL.java	27 Apr 2003 21:26:01 -0000	1.6
+++ AL.java	28 Apr 2003 21:50:11 -0000	1.7
@@ -42,84 +42,102 @@
  * @version $Revision$
  */
 public class AL extends CoreAL {
-  
-  /** ALC instance. */
-  protected ALC alc;
 
-  /** ALCdevice instance. */
-  protected ALCdevice device;
+	/** ALC instance. */
+	protected ALC alc;
 
-  /** Current ALCcontext. */
-  protected ALCcontext context;
-  
-  /** 
-   * String that requests a certain device or device configuration. 
-   * If null is specified, the implementation will provide an 
-   * implementation specific default. */
-  protected String deviceArguments;
-  
-  /** Frequency for mixing output buffer, in units of Hz. */
-  protected int contextFrequency = -1;
-  
-  /** Refresh intervalls, in units of Hz. */
-  protected int contextRefresh = -1;
-  
-  /** Flag, indicating a synchronous context. */
-  protected int contextSynchronized = ALC.FALSE;
+	/** ALCdevice instance. */
+	protected ALCdevice device;
 
-  /**
-   * Creates an OpenAL instance. The empty constructor will cause OpenAL to
-   * open the default device, and create a context using default values. 
-   */
-  public AL() {
-  }
+	/** Current ALCcontext. */
+	protected ALCcontext context;
+
+	/** 
+	 * String that requests a certain device or device configuration. 
+	 * If null is specified, the implementation will provide an 
+	 * implementation specific default. */
+	protected String deviceArguments;
+
+	/** Frequency for mixing output buffer, in units of Hz. */
+	protected int contextFrequency = -1;
+
+	/** Refresh intervalls, in units of Hz. */
+	protected int contextRefresh = -1;
+
+	/** Flag, indicating a synchronous context. */
+	protected int contextSynchronized = ALC.FALSE;
 
 	/**
-   * Creates an OpenAL instance. Using this constructor will cause OpenAL to
-   * open the device using supplied device argument, and create a context using the context values
-   * supplied. 
-   * 
-   * @param deviceArguments Arguments supplied to native device
-   * @param contextFrequency Frequency for mixing output buffer, in units of Hz (Common values include 11025, 22050, and 44100).
-   * @param contextRefresh Refresh intervalls, in units of Hz.
-   * @param contextSynchronized Flag, indicating a synchronous context.* 
+	 * Creates an OpenAL instance. The empty constructor will cause OpenAL to
+	 * open the default device, and create a context using default values. 
+	 */
+	public AL() {
+	}
+
+	/**
+	* Creates an OpenAL instance. Using this constructor will cause OpenAL to
+	* open the device using supplied device argument, and create a context using the context values
+	* supplied. 
+	* 
+	* @param deviceArguments Arguments supplied to native device
+	* @param contextFrequency Frequency for mixing output buffer, in units of Hz (Common values include 11025, 22050, and 44100).
+	* @param contextRefresh Refresh intervalls, in units of Hz.
+	* @param contextSynchronized Flag, indicating a synchronous context.* 
 	 */
 	public AL(String deviceArguments, int contextFrequency, int contextRefresh, boolean contextSynchronized) {
-    this.deviceArguments = deviceArguments;
-    this.contextFrequency = contextFrequency;
-    this.contextRefresh = contextRefresh;
-    this.contextSynchronized = contextSynchronized ? ALC.TRUE : ALC.FALSE;
+		this.deviceArguments = deviceArguments;
+		this.contextFrequency = contextFrequency;
+		this.contextRefresh = contextRefresh;
+		this.contextSynchronized = contextSynchronized ? ALC.TRUE : ALC.FALSE;
 	}
-  
-  
-  /**
+
+	/**
 	 * @see org.lwjgl.openal.BaseAL#create()
 	 */
 	public void create() throws OpenALException {
 		super.create();
-    
-    alc = new ALC(this);
-    alc.create();
-    
-    device = alc.openDevice(deviceArguments);
 
-    //check if doing default values or not
-    if (contextFrequency == -1) {
-      context = alc.createContext(device.device, 0);    
-    } else {
-    context = alc.createContext(device.device, 
-                Sys.getDirectBufferAddress(
-                  ALCcontext.createAttributeList(contextFrequency, contextRefresh, contextSynchronized)));
-    }
+		alc = new ALC(this);
+		alc.create();
 
-                  
-    alc.makeContextCurrent(context.context);     
+		device = alc.openDevice(deviceArguments);
+
+		//check if doing default values or not
+		if (contextFrequency == -1) {
+			context = alc.createContext(device.device, 0);
+		} else {
+			context =
+				alc.createContext(
+					device.device,
+					Sys.getDirectBufferAddress(
+						ALCcontext.createAttributeList(contextFrequency, contextRefresh, contextSynchronized)));
+		}
+
+		alc.makeContextCurrent(context.context);
+	}
+	
+	/**
+	 * Exit cleanly by calling destroy.
+	 */
+	public void destroy() {
+		alc.destroyContext(context.context);
+		alc.closeDevice(device.device);
+		alc.destroy();
+	}
+	
+	/**
+	 * Emergency finalizer!
+	 */
+	protected void finalize() throws Throwable {
+		super.finalize();
+		
+		destroy();
+	}
+
+	/**
+	 * Retrieves the AL Context class 
+	 */
+	public final ALC getALC() {
+		return alc;
 	}
-  
-  /**
-   * Retrieves the AL Context class 
-   */
-  public ALC getALC() {
-    return alc;
-  }
 }

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

Modified Files:
	CoreGLConstants.java 
Log Message:
Fixed a typo

Index: CoreGLConstants.java
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/CoreGLConstants.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/CoreGLConstants.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- CoreGLConstants.java	21 Dec 2002 12:37:19 -0000	1.5
+++ CoreGLConstants.java	28 Apr 2003 16:41:39 -0000	1.6
@@ -1166,7 +1166,7 @@
 	/* ClientAttribMask */
 	public static final int CLIENT_PIXEL_STORE_BIT         = 0x00000001;
 	public static final int CLIENT_VERTEX_ARRAY_BIT        = 0x00000002;
-	public static final int CLIENT_ALL_ATTRIB_BITS         = 0xffffffff;
+	public static final int ALL_CLIENT_ATTRIB_BITS         = 0xffffffff;
 
 	/* polygon_offset */
 	public static final int POLYGON_OFFSET_FACTOR          = 0x8038;

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

Modified Files:
	Matrix4f.java 
Log Message:
Added scale to Matrix4f

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.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- Matrix4f.java	28 Apr 2003 11:12:53 -0000	1.13
+++ Matrix4f.java	28 Apr 2003 12:10:54 -0000	1.14
@@ -463,6 +463,27 @@
 		m33 += m03 * vec.x + m13 * vec.y + m23 * vec.z;
 		return this;
 	}
+
+	/**
+	 * Scales this matrix
+	 * @param vec The vector to scale by
+	 * @return this
+	 */
+	public Matrix4f scale(Vector3f vec) {
+		m00 *= vec.x;
+		m01 *= vec.x;
+		m02 *= vec.x;
+		m03 *= vec.x;
+		m10 *= vec.y;
+		m11 *= vec.y;
+		m12 *= vec.y;
+		m13 *= vec.y;
+		m20 *= vec.z;
+		m21 *= vec.z;
+		m22 *= vec.z;
+		m23 *= vec.z;
+		return this;
+	}
 	
 	/**
 	 * Rotates the matrix around the given axis the specified angle

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

Modified Files:
	extgl.c 
Log Message:
Reverted the glu loading

Index: extgl.c
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/common/extgl.c
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/extgl.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- extgl.c	28 Apr 2003 11:04:15 -0000	1.13
+++ extgl.c	28 Apr 2003 11:20:55 -0000	1.14
@@ -3275,7 +3275,7 @@
     lib_gl_handle = dlopen("libGL.so.1", RTLD_LAZY | RTLD_GLOBAL);
     if (lib_gl_handle == NULL)
         return 1;
-    lib_glu_handle = dlopen("libGLU.so", RTLD_LAZY | RTLD_GLOBAL);
+    lib_glu_handle = dlopen("libGLU.so.1", RTLD_LAZY | RTLD_GLOBAL);
     if (lib_glu_handle == NULL)
         return 1;
     return 0;

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

Modified Files:
	Matrix4f.java 
Log Message:


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.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- Matrix4f.java	21 Dec 2002 12:37:20 -0000	1.12
+++ Matrix4f.java	28 Apr 2003 11:12:53 -0000	1.13
@@ -31,6 +31,7 @@
  */
 package org.lwjgl.vector;
 
+import org.lwjgl.Math;
 import java.nio.FloatBuffer;
 
 /**
@@ -50,6 +51,18 @@
 	}
 
 	/**
+	 * Returns a string representation of this matrix
+	 */
+	public String toString() {
+		StringBuffer buf = new StringBuffer();
+		buf.append(m00).append(' ').append(m10).append(' ').append(m20).append(' ').append(m30).append('\n');
+		buf.append(m01).append(' ').append(m11).append(' ').append(m21).append(' ').append(m31).append('\n');
+		buf.append(m02).append(' ').append(m12).append(' ').append(m22).append(' ').append(m32).append('\n');
+		buf.append(m03).append(' ').append(m13).append(' ').append(m23).append(' ').append(m33).append('\n');
+		return buf.toString();
+	}
+
+	/**
 	 * Set this matrix to be the identity matrix.
 	 * @return this
 	 */
@@ -450,8 +463,108 @@
 		m33 += m03 * vec.x + m13 * vec.y + m23 * vec.z;
 		return this;
 	}
-		
 	
+	/**
+	 * Rotates the matrix around the given axis the specified angle
+	 * @param angle the angle, in degrees.
+	 * @param axis The vector representing the rotation axis. Must be normalized.
+	 * @return this
+	 */
+	public Matrix4f rotate(float angle, Vector3f axis) {
+		float c = Math.cos(angle);
+		float s = Math.sin(angle);
+		float oneminusc = 1.0f - c;
+		float xy = axis.x*axis.y;
+		float yz = axis.y*axis.z;
+		float xz = axis.x*axis.z;
+		float xs = axis.x*s;
+		float ys = axis.y*s;
+		float zs = axis.z*s;
+
+		float f00 = axis.x*axis.x*oneminusc+c;
+		float f01 = xy*oneminusc+zs;
+		float f02 = xz*oneminusc-ys;
+		// n[3] not used
+		float f10 = xy*oneminusc-zs;
+		float f11 = axis.y*axis.y*oneminusc+c;
+		float f12 = yz*oneminusc+xs;
+		// n[7] not used
+		float f20 = xz*oneminusc+ys;
+		float f21 = yz*oneminusc-xs;
+		float f22 = axis.z*axis.z*oneminusc+c;
+
+		float t00 = m00 * f00 + m10 * f01 + m20 * f02;
+		float t01 = m01 * f00 + m11 * f01 + m21 * f02;
+		float t02 = m02 * f00 + m12 * f01 + m22 * f02;
+		float t03 = m03 * f00 + m13 * f01 + m23 * f02;
+		float t10 = m00 * f10 + m10 * f11 + m20 * f12;
+		float t11 = m01 * f10 + m11 * f11 + m21 * f12;
+		float t12 = m02 * f10 + m12 * f11 + m22 * f12;
+		float t13 = m03 * f10 + m13 * f11 + m23 * f12;
+		m20 = m00 * f20 + m10 * f21 + m20 * f22;
+		m21 = m01 * f20 + m11 * f21 + m21 * f22;
+		m22 = m02 * f20 + m12 * f21 + m22 * f22;
+		m23 = m03 * f20 + m13 * f21 + m23 * f22;
+                m00 = t00;
+                m01 = t01;
+                m02 = t02;
+                m03 = t03;
+                m10 = t10;
+                m11 = t11;
+                m12 = t12;
+                m13 = t13;
+                return this;
+	}
+
+	/**
+	 * Rotates the matrix around the given axis the specified angle, and stores it in the specified destination
+	 * @param angle the angle, in degrees.
+	 * @param axis The vector representing the rotation axis. Must be normalized.
+	 * @param dest The destination matrix or null if a new matrix is to be created
+	 * @return The rotated matrix
+	 */
+	public Matrix4f rotate(float angle, Vector3f axis, Matrix4f dest) {
+		if (dest == null)
+			dest = new Matrix4f();
+		else if (dest == this)
+			return rotate(angle, axis);
+		float c = Math.cos(angle);
+		float s = Math.sin(angle);
+		float oneminusc = 1.0f - c;
+		float xy = axis.x*axis.y;
+		float yz = axis.y*axis.z;
+		float xz = axis.x*axis.z;
+		float xs = axis.x*s;
+		float ys = axis.y*s;
+		float zs = axis.z*s;
+
+		float f0 = axis.x*axis.x*oneminusc+c;
+		float f1 = xy*oneminusc+zs;
+		float f2 = xz*oneminusc-ys;
+		// n[3] not used
+		float f4 = xy*oneminusc-zs;
+		float f5 = axis.y*axis.y*oneminusc+c;
+		float f6 = yz*oneminusc+xs;
+		// n[7] not used
+		float f8 = xz*oneminusc+ys;
+		float f9 = yz*oneminusc-xs;
+		float f10 = axis.z*axis.z*oneminusc+c;
+
+		/* m[12] to m[15] are not changed by a rotate */
+		dest.m00 = m00 * f0 + m10 * f1 + m20 * f2;
+		dest.m01 = m01 * f0 + m11 * f1 + m21 * f2;
+		dest.m02 = m02 * f0 + m12 * f1 + m22 * f2;
+		dest.m03 = m03 * f0 + m13 * f1 + m23 * f2;
+		dest.m10 = m00 * f4 + m10 * f5 + m20 * f6;
+		dest.m11 = m01 * f4 + m11 * f5 + m21 * f6;
+		dest.m12 = m02 * f4 + m12 * f5 + m22 * f6;
+		dest.m13 = m03 * f4 + m13 * f5 + m23 * f6;
+		dest.m20 = m00 * f8 + m10 * f9 + m20 * f10;
+		dest.m21 = m01 * f8 + m11 * f9 + m21 * f10;
+		dest.m22 = m02 * f8 + m12 * f9 + m22 * f10;
+		dest.m23 = m03 * f8 + m13 * f9 + m23 * f10;
+                return dest;
+	}
 
 	/**
 	 * Translate this matrix and stash the result in another matrix

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

Modified Files:
	extgl.c 
Log Message:


Index: extgl.c
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/common/extgl.c
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/extgl.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- extgl.c	13 Apr 2003 09:28:01 -0000	1.12
+++ extgl.c	28 Apr 2003 11:04:15 -0000	1.13
@@ -1250,7 +1250,7 @@
 glCullParameterdvEXTPROC glCullParameterdvEXT = NULL;
 #endif /* GL_EXT_cull_vertex */
 
-#ifdef GL_EXT_blend_function_sepatate
+#ifdef GL_EXT_blend_function_separate
 glBlendFuncSeparateEXTPROC glBlendFuncSeparateEXT = NULL;
 glBlendFuncSeparateINGRPROC glBlendFuncSeparateINGR = NULL;
 #endif /* GL_EXT_blend_func_separate */
@@ -3275,7 +3275,7 @@
     lib_gl_handle = dlopen("libGL.so.1", RTLD_LAZY | RTLD_GLOBAL);
     if (lib_gl_handle == NULL)
         return 1;
-    lib_glu_handle = dlopen("libGLU.so.1", RTLD_LAZY | RTLD_GLOBAL);
+    lib_glu_handle = dlopen("libGLU.so", RTLD_LAZY | RTLD_GLOBAL);
     if (lib_glu_handle == NULL)
         return 1;
     return 0;