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

Update of /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/util
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3912/src/java/org/lwjgl/util

Added Files:
	GLImpl.java IGL.java 
Log Message:
New Object Oriented Wank!

--- NEW FILE: GLImpl.java ---
/*
 * Copyright (c) 2002 Light Weight Java Game Library Project
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions are
 * met:
 *
 * * Redistributions of source code must retain the above copyright
 *   notice, this list of conditions and the following disclaimer.
 *
 * * Redistributions in binary form must reproduce the above copyright
 *   notice, this list of conditions and the following disclaimer in the
 *   documentation and/or other materials provided with the distribution.
 *
 * * Neither the name of 'Light Weight Java Game Library' nor the names of
 *   its contributors may be used to endorse or promote products derived
 *   from this software without specific prior written permission.
 *
[...5815 lines suppressed...]
	 * @param x
	 * @param y
	 * @param z
	 */
	public void glWindowPos3sARB(short x, short y, short z) {
		GL.glWindowPos3sARB(x, y, z);
	}
	/**
	 * @param res
	 * @param in
	 * @param outX
	 * @param outY
	 * @param outZ
	 * @param outW
	 */
	public void glWriteMaskEXT(int res, int in, int outX, int outY,
			int outZ, int outW) {
		GL.glWriteMaskEXT(res, in, outX, outY, outZ, outW);
	}
}

--- NEW FILE: IGL.java ---
/* 
 * Copyright (c) 2003 Shaven Puppy Ltd
 * All rights reserved.
 * 
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions are 
 * met:
 * 
 * * Redistributions of source code must retain the above copyright 
 *   notice, this list of conditions and the following disclaimer.
 *
 * * Redistributions in binary form must reproduce the above copyright
 *   notice, this list of conditions and the following disclaimer in the
 *   documentation and/or other materials provided with the distribution.
 *
 * * Neither the name of 'Shaven Puppy' nor the names of its contributors
 *   may be used to endorse or promote products derived from this software
 *   without specific prior written permission.
 * 
[...5199 lines suppressed...]
	 * @param size
	 * @param stride
	 * @param pPointer
	 */
	public void glVertexWeightPointerEXT(int size, int stride,
			FloatBuffer pPointer);	

	/**
	 * @param size
	 * @param type
	 * @param stride
	 * @param buffer_offset
	 */
	public void glVertexWeightPointerEXT(int size, int type, int stride,
			int buffer_offset);
	



}

Update of /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/util
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28263/src/java/org/lwjgl/util

Modified Files:
	GL.java 
Log Message:
Now with all the ARB and EXT methods!

Index: GL.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/util/GL.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- GL.java	18 Apr 2004 16:24:58 -0000	1.1
+++ GL.java	19 Apr 2004 22:24:30 -0000	1.2
@@ -32,27 +32,26 @@
 
 package org.lwjgl.util;
 
+import java.nio.Buffer;
 import java.nio.ByteBuffer;
 import java.nio.DoubleBuffer;
 import java.nio.FloatBuffer;
 import java.nio.IntBuffer;
 import java.nio.ShortBuffer;
 
-import org.lwjgl.opengl.GL11;
[...2816 lines suppressed...]
+	 * @param size
+	 * @param stride
+	 * @param pPointer
+	 */
+	public static void glVertexWeightPointerEXT(int size, int stride,
+			FloatBuffer pPointer) {
+		EXTVertexWeighting.glVertexWeightPointerEXT(size, stride, pPointer);
+	}
+	/**
+	 * @param size
+	 * @param type
+	 * @param stride
+	 * @param buffer_offset
+	 */
+	public static void glVertexWeightPointerEXT(int size, int type, int stride,
+			int buffer_offset) {
+		EXTVertexWeighting.glVertexWeightPointerEXT(size, type, stride,
+				buffer_offset);
+	}
 }

Update of /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/util/vector
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21411/src/java/org/lwjgl/util/vector

Modified Files:
	Vector3f.java Vector2f.java Vector4f.java 
Added Files:
	WritableVector4f.java WritableVector2f.java 
	WritableVector3f.java 
Log Message:
Tweaks to the Vector package, and finalized the Model structure. So I hope.

--- NEW FILE: WritableVector2f.java ---
/* 
 * Copyright (c) 2003 Shaven Puppy Ltd
 * All rights reserved.
 * 
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions are 
 * met:
 * 
 * * Redistributions of source code must retain the above copyright 
 *   notice, this list of conditions and the following disclaimer.
 *
 * * Redistributions in binary form must reproduce the above copyright
 *   notice, this list of conditions and the following disclaimer in the
 *   documentation and/or other materials provided with the distribution.
 *
 * * Neither the name of 'Shaven Puppy' nor the names of its contributors
 *   may be used to endorse or promote products derived from this software
 *   without specific prior written permission.
 * 
 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
 * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR 
 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
 * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING 
 * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
package org.lwjgl.util.vector;


/**
 * $Id: WritableVector2f.java,v 1.1 2004/04/19 21:54:58 cix_foo Exp $
 * Writable interface to Vector2fs
 * @author $author$
 * @version $revision$
 */
public interface WritableVector2f {

	/**
	 * Set the X value
	 * @param x
	 */
	public void setX(float x);
	
	/**
	 * Set the Y value
	 * @param y
	 */
	public void setY(float y);
	
	/**
	 * Set the X,Y values
	 * @param x, y
	 */
	public void set(float x, float y);
	
}
Index: Vector2f.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/util/vector/Vector2f.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Vector2f.java	18 Apr 2004 20:01:05 -0000	1.1
+++ Vector2f.java	19 Apr 2004 21:54:58 -0000	1.2
@@ -43,7 +43,7 @@
  * @version $Revision$
  */
 
-public class Vector2f extends Vector implements Serializable, ReadableVector2f {
+public class Vector2f extends Vector implements Serializable, ReadableVector2f, WritableVector2f {
 	
 	public float x, y;
 
@@ -68,14 +68,12 @@
 		set(x, y);
 	}
 
-	/**
-	 * Set values
-	 * @return this
+	/* (non-Javadoc)
+	 * @see org.lwjgl.util.vector.WritableVector2f#set(float, float)
 	 */
-	public Vector2f set(float x, float y) {
+	public void set(float x, float y) {
 		this.x = x;
 		this.y = y;
-		return this;
 	}
 
 	/**
@@ -188,7 +186,8 @@
     	if (dest == null)
     		return new Vector2f(left.x + right.x, left.y + right.y);
     	else {
-			return dest.set(left.x + right.x, left.y + right.y);
+			dest.set(left.x + right.x, left.y + right.y);
+			return dest;
     	}
     }
 
@@ -204,7 +203,8 @@
     	if (dest == null)
     		return new Vector2f(left.x - right.x, left.y - right.y);
     	else {
-			return dest.set(left.x - right.x, left.y - right.y);
+			dest.set(left.x - right.x, left.y - right.y);
+			return dest;
     	}
     }
       

--- NEW FILE: WritableVector3f.java ---
/* 
 * Copyright (c) 2003 Shaven Puppy Ltd
 * All rights reserved.
 * 
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions are 
 * met:
 * 
 * * Redistributions of source code must retain the above copyright 
 *   notice, this list of conditions and the following disclaimer.
 *
 * * Redistributions in binary form must reproduce the above copyright
 *   notice, this list of conditions and the following disclaimer in the
 *   documentation and/or other materials provided with the distribution.
 *
 * * Neither the name of 'Shaven Puppy' nor the names of its contributors
 *   may be used to endorse or promote products derived from this software
 *   without specific prior written permission.
 * 
 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
 * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR 
 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
 * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING 
 * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
package org.lwjgl.util.vector;


/**
 * $Id: WritableVector3f.java,v 1.1 2004/04/19 21:54:58 cix_foo Exp $
 * Writable interface to Vector3fs
 * @author $author$
 * @version $revision$
 */
public interface WritableVector3f extends WritableVector2f {

	/**
	 * Set the Z value
	 * @param z
	 */
	public void setZ(float z);
	
	/**
	 * Set the X,Y,Z values
	 * @param x, y, z
	 */
	public void set(float x, float y, float z);
	
}
--- NEW FILE: WritableVector4f.java ---
/* 
 * Copyright (c) 2003 Shaven Puppy Ltd
 * All rights reserved.
 * 
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions are 
 * met:
 * 
 * * Redistributions of source code must retain the above copyright 
 *   notice, this list of conditions and the following disclaimer.
 *
 * * Redistributions in binary form must reproduce the above copyright
 *   notice, this list of conditions and the following disclaimer in the
 *   documentation and/or other materials provided with the distribution.
 *
 * * Neither the name of 'Shaven Puppy' nor the names of its contributors
 *   may be used to endorse or promote products derived from this software
 *   without specific prior written permission.
 * 
 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
 * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR 
 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
 * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING 
 * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
package org.lwjgl.util.vector;


/**
 * $Id: WritableVector4f.java,v 1.1 2004/04/19 21:54:58 cix_foo Exp $
 * Writable interface to Vector4fs
 * @author $author$
 * @version $revision$
 */
public interface WritableVector4f extends WritableVector3f {

	/**
	 * Set the W value
	 * @param w
	 */
	public void setW(float w);
	
	/**
	 * Set the X,Y,Z,W values
	 * @param x, y, z, w
	 */
	public void set(float x, float y, float z, float w);
	
}
Index: Vector4f.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/util/vector/Vector4f.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Vector4f.java	18 Apr 2004 20:01:08 -0000	1.1
+++ Vector4f.java	19 Apr 2004 21:54:58 -0000	1.2
@@ -43,7 +43,7 @@
  * @version $Revision$
  */
 
-public class Vector4f extends Vector implements Serializable, ReadableVector4f {
+public class Vector4f extends Vector implements Serializable, ReadableVector4f, WritableVector4f {
 
 	public float x, y, z, w;
 
@@ -68,16 +68,31 @@
 		set(x, y, z, w);
 	}
 
-	/**
-	 * Set values
-	 * @return this
+	/* (non-Javadoc)
+	 * @see org.lwjgl.util.vector.WritableVector2f#set(float, float)
 	 */
-	public Vector4f set(float x, float y, float z, float w) {
+	public void set(float x, float y) {
+		this.x = x;
+		this.y = y;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.lwjgl.util.vector.WritableVector3f#set(float, float, float)
+	 */
+	public void set(float x, float y, float z) {
+		this.x = x;
+		this.y = y;
+		this.z = z;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.lwjgl.util.vector.WritableVector4f#set(float, float, float, float)
+	 */
+	public void set(float x, float y, float z, float w) {
 		this.x = x;
 		this.y = y;
 		this.z = z;
 		this.w = w;
-		return this;
 	}
 
 	/**
@@ -126,7 +141,8 @@
     	if (dest == null)
     		return new Vector4f(left.x + right.x, left.y + right.y, left.z + right.z, left.w + right.w);
     	else {
-			return dest.set(left.x + right.x, left.y + right.y, left.z + right.z, left.w + right.w);
+			dest.set(left.x + right.x, left.y + right.y, left.z + right.z, left.w + right.w);
+			return dest;
     	}
     }
 
@@ -142,7 +158,8 @@
     	if (dest == null)
     		return new Vector4f(left.x - right.x, left.y - right.y, left.z - right.z, left.w - right.w);
     	else {
-			return dest.set(left.x - right.x, left.y - right.y, left.z - right.z, left.w - right.w);
+			dest.set(left.x - right.x, left.y - right.y, left.z - right.z, left.w - right.w);
+			return dest;
     	}
     }
       	
@@ -294,6 +311,7 @@
 		this.z = z;
 	}
 
+
 	/* (Overrides)
 	 * @see org.lwjgl.vector.ReadableVector3f#getZ()
 	 */

Index: Vector3f.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/util/vector/Vector3f.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Vector3f.java	18 Apr 2004 20:01:06 -0000	1.1
+++ Vector3f.java	19 Apr 2004 21:54:58 -0000	1.2
@@ -43,7 +43,7 @@
  * @version $Revision$
  */
 
-public class Vector3f extends Vector implements Serializable, ReadableVector3f {
+public class Vector3f extends Vector implements Serializable, ReadableVector3f, WritableVector3f {
 
 	public float x, y, z;
 
@@ -68,15 +68,21 @@
 		set(x, y, z);
 	}
 
-	/**
-	 * Set values
-	 * @return this
+	/* (non-Javadoc)
+	 * @see org.lwjgl.util.vector.WritableVector2f#set(float, float)
 	 */
-	public Vector3f set(float x, float y, float z) {
+	public void set(float x, float y) {
+		this.x = x;
+		this.y = y;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.lwjgl.util.vector.WritableVector3f#set(float, float, float)
+	 */
+	public void set(float x, float y, float z) {
 		this.x = x;
 		this.y = y;
 		this.z = z;
-		return this;
 	}
 
 	/**
@@ -123,7 +129,8 @@
     	if (dest == null)
     		return new Vector3f(left.x + right.x, left.y + right.y, left.z + right.z);
     	else {
-			return dest.set(left.x + right.x, left.y + right.y, left.z + right.z);
+			dest.set(left.x + right.x, left.y + right.y, left.z + right.z);
+			return dest;
     	}
     }
 
@@ -139,7 +146,8 @@
     	if (dest == null)
     		return new Vector3f(left.x - right.x, left.y - right.y, left.z - right.z);
     	else {
-			return dest.set(left.x - right.x, left.y - right.y, left.z - right.z);
+			dest.set(left.x - right.x, left.y - right.y, left.z - right.z);
+			return dest;
     	}
     }
     

Update of /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/util/model
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21411/src/java/org/lwjgl/util/model

Modified Files:
	Triangle.java Vertex.java Frame.java Model.java 
Added Files:
	Skin.java 
Removed Files:
	Mesh.java 
Log Message:
Tweaks to the Vector package, and finalized the Model structure. So I hope.

Index: Frame.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/util/model/Frame.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Frame.java	18 Apr 2004 19:30:32 -0000	1.2
+++ Frame.java	19 Apr 2004 21:54:57 -0000	1.3
@@ -45,11 +45,15 @@
 	/** The new transformations for each Bone in the Skeleton */
 	private final Matrix4f[] bone;
 	
+	/** Frame time */
+	private final float time;
+	
 	/**
 	 * C'tor
 	 * @param bone[]
 	 */
-	public Frame(Matrix4f[] bone) {
+	public Frame(float time, Matrix4f[] bone) {
+		this.time = time;
 		this.bone = bone;
 	}
 	
@@ -59,4 +63,11 @@
 	public Matrix4f[] getBone() {
 		return bone;
 	}
+	
+	/**
+	 * @return the frame time
+	 */
+	public float getTime() {
+		return time;
+	}
 }

Index: Model.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/util/model/Model.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Model.java	18 Apr 2004 19:30:32 -0000	1.2
+++ Model.java	19 Apr 2004 21:54:57 -0000	1.3
@@ -51,23 +51,34 @@
 	
 	public static final long serialVersionUID = 1L;
 	
-	/** The Mesh */
-	private final Mesh mesh;
+	/** Material */
+	private final String material;
+	
+	/** Vertices */
+	private final Vertex[] vertex;
+	
+	/** Triangles */
+	private final Triangle[] triangle;
 	
 	/** The animations: a Map of string names to Frame[] arrays */
 	private final Map animation;
 	
 	/**
 	 * C'tor
-	 * @param mesh
-	 * @param frame
+	 * @param material
+	 * @param vertex
+	 * @param triangle
+	 * @param animation
 	 */
-	public Model(Mesh mesh, Map animation) {
-		this.mesh = mesh;
+	public Model(String material, Vertex[] vertex, Triangle[] triangle, Map animation) {
+		this.material = material;
+		this.vertex = vertex;
+		this.triangle = triangle;
 		this.animation = animation;
 	}
 	
 	/**
+	 * Get a named animation from the Model
 	 * @param name The name of the animation
 	 * @return the Frames of an animation (or null, if no such animation exists)
 	 */
@@ -76,10 +87,25 @@
 	}
 	
 	/**
-	 * @return the Mesh
+	 * @return Returns the material.
 	 */
-	public Mesh getMesh() {
-		return mesh;
+	public String getMaterial() {
+		return material;
+	}
+	
+	/**
+	 * @return Returns the triangles.
+	 */
+	public Triangle[] getTriangle() {
+		return triangle;
 	}
 	
+	/**
+	 * @return Returns the vertices
+	 */
+	public Vertex[] getVertex() {
+		return vertex;
+	}
+	
+
 }

--- Mesh.java DELETED ---

Index: Vertex.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/util/model/Vertex.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Vertex.java	18 Apr 2004 19:30:32 -0000	1.2
+++ Vertex.java	19 Apr 2004 21:54:57 -0000	1.3
@@ -33,10 +33,13 @@
 
 import java.io.Serializable;
 
+import org.lwjgl.util.vector.ReadableVector2f;
+import org.lwjgl.util.vector.ReadableVector3f;
+
 /**
  * $Id$
  * 
- * A single vertex in a Triangle
+ * A single vertex in a mesh.
  * 
  * @author $Author$
  * @version $Revision$
@@ -46,44 +49,56 @@
 	public static final long serialVersionUID = 1L;
 	
 	/** Coordinates */
-	private final float x, y, z;
+	private final ReadableVector3f coords;
 	
 	/** Normal */
-	private final float nx, ny, nz;
+	private final ReadableVector3f normal;
 	
 	/** Texture coordinates */
-	private final float u, v;
+	private final ReadableVector2f texCoords;
 	
-	/** Bone indices: these look up into the current Frame's bone array */
-	private final int[] bone;
+	/** Skin */
+	private final Skin[] skin;
+
+	/**
+	 * C'tor
+	 * @param coords
+	 * @param normal
+	 * @param texCoords
+	 * @param skin
+	 */
+	public Vertex(ReadableVector3f coords, ReadableVector3f normal, ReadableVector2f texCoords, Skin[] skin) {
+		this.coords = coords;
+		this.normal = normal;
+		this.texCoords = texCoords;
+		this.skin = skin;
+	}
+
+	/**
+	 * @return Returns the coords.
+	 */
+	public ReadableVector3f getCoords() {
+		return coords;
+	}
 	
-	/** Bone weights (always sum to 1.0f) */
-	private final float[] weight;
+	/**
+	 * @return Returns the normal.
+	 */
+	public ReadableVector3f getNormal() {
+		return normal;
+	}
 	
 	/**
-	 * C'tor
-	 * @param x
-	 * @param y
-	 * @param z
-	 * @param nx
-	 * @param ny
-	 * @param nz
-	 * @param u
-	 * @param v
-	 * @param bone
-	 * @param weight
+	 * @return Returns the skin.
 	 */
-	public Vertex(float x, float y, float z, float nx, float ny, float nz,
-			float u, float v, int[] bone, float[] weight) {
-		this.x = x;
-		this.y = y;
-		this.z = z;
-		this.nx = nx;
-		this.ny = ny;
-		this.nz = nz;
-		this.u = u;
-		this.v = v;
-		this.bone = bone;
-		this.weight = weight;
+	public Skin[] getSkin() {
+		return skin;
+	}
+	
+	/**
+	 * @return Returns the texCoords.
+	 */
+	public ReadableVector2f getTexCoords() {
+		return texCoords;
 	}
 }

--- NEW FILE: Skin.java ---
/* 
 * Copyright (c) 2003 Shaven Puppy Ltd
 * All rights reserved.
 * 
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions are 
 * met:
 * 
 * * Redistributions of source code must retain the above copyright 
 *   notice, this list of conditions and the following disclaimer.
 *
 * * Redistributions in binary form must reproduce the above copyright
 *   notice, this list of conditions and the following disclaimer in the
 *   documentation and/or other materials provided with the distribution.
 *
 * * Neither the name of 'Shaven Puppy' nor the names of its contributors
 *   may be used to endorse or promote products derived from this software
 *   without specific prior written permission.
 * 
 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
 * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR 
 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
 * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING 
 * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
package org.lwjgl.util.model;

import java.io.Serializable;

/**
 * $Id: Skin.java,v 1.1 2004/04/19 21:54:57 cix_foo Exp $
 * Describes how a bone influences a vertex.
 * @author $Author: cix_foo $
 * @version $Revision: 1.1 $
 */
public class Skin implements Serializable {
	
	public static final long serialVersionUID = 1L;
	
	/** Bone index */
	private final int bone;
	
	/** Weight */
	private final float weight;
	
	/**
	 * C'tor
	 */
	public Skin(int bone, float weight) {
		this.bone = bone;
		this.weight = weight;
	}
	
	/**
	 * @return Returns the bone index.
	 */
	public int getBone() {
		return bone;
	}
	
	/**
	 * @return Returns the weight.
	 */
	public float getWeight() {
		return weight;
	}
}

Index: Triangle.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/util/model/Triangle.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Triangle.java	18 Apr 2004 18:59:49 -0000	1.1
+++ Triangle.java	19 Apr 2004 21:54:57 -0000	1.2
@@ -31,24 +31,59 @@
  */
 package org.lwjgl.util.model;
 
+import java.io.Serializable;
+
 /**
  * $Id$
  * @author $Author$
  * @version $Revision$
  */
-public class Triangle {
+public class Triangle implements Serializable {
 	
 	public static final long serialVersionUID = 1L;
 	
 	/** Vertex indices: these look up into the parent Mesh's vertex array */
-	private int a, b, c;
+	private final int a, b, c;
 	
 	/** Adjacency, for stripification */
-	private int adjacency;
+	private final int adjacency;
 	
 	/**
 	 * C'tor
+	 * @param a
+	 * @param b
+	 * @param c
+	 * @param adjacency
 	 */
-	public Triangle() {
+	public Triangle(int a, int b, int c, int adjacency) {
+		this.a = a;
+		this.b = b;
+		this.c = c;
+		this.adjacency = adjacency;
+	}
+	
+	/**
+	 * @return Returns the 'a' vertex index
+	 */
+	public int getA() {
+		return a;
+	}
+	/**
+	 * @return Returns the 'b' vertex index
+	 */
+	public int getB() {
+		return b;
+	}
+	/**
+	 * @return Returns the 'c' vertex index
+	 */
+	public int getC() {
+		return c;
+	}
+	/**
+	 * @return Returns the adjacency.
+	 */
+	public int getAdjacency() {
+		return adjacency;
 	}
 }

Update of /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/util/model/renderer
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21411/src/java/org/lwjgl/util/model/renderer

Modified Files:
	Renderer.java 
Log Message:
Tweaks to the Vector package, and finalized the Model structure. So I hope.

Index: Renderer.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/util/model/renderer/Renderer.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Renderer.java	18 Apr 2004 20:01:01 -0000	1.2
+++ Renderer.java	19 Apr 2004 21:54:58 -0000	1.3
@@ -34,6 +34,7 @@
 import java.util.HashMap;
 import java.util.Map;
 
+import org.lwjgl.util.model.Frame;
 import org.lwjgl.util.model.Model;
 
 /**
@@ -63,11 +64,24 @@
 	/**
 	 * Render a Model
 	 * @param model The model to render
+	 * @param animation The name of the animation
+	 * @param time The time for the animation
 	 */
-	public void render(Model model) {
+	public void render(Model model, String animation, float time) {
 		
 		// 1. Set up GL state from the Model's material
-		Renderable material = (Renderable) materials.get(model.getMesh().getMaterial());
+		Renderable material = (Renderable) materials.get(model.getMaterial());
+		if (material != null) {
+			material.render();
+		}
+		
+		// 2. Get the animation
+		Frame[] frame = model.getAnimation(animation);
+		if (frame == null) {
+			return;
+		}
+		
+		// 3. Work out what the nearest frame is to the specified time
 		
 	}