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

Revision: 3261
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3261&view=rev
Author:   spasi
Date:     2009-12-28 15:00:06 +0000 (Mon, 28 Dec 2009)

Log Message:
-----------
Fixed MapBufferRange signature.

Modified Paths:
--------------
    trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_map_buffer_range.java
    trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_direct_state_access.java
    trunk/LWJGL/src/templates/org/lwjgl/opengl/GL30.java

Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_map_buffer_range.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_map_buffer_range.java	2009-12-04 04:49:19 UTC (rev 3260)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_map_buffer_range.java	2009-12-28 15:00:06 UTC (rev 3261)
@@ -47,8 +47,8 @@
 
 	@CachedResult
 	@GLvoid
-	ByteBuffer
-	glMapBufferRange(@GLenum int target, @GLintptr long offset, @GLsizeiptr long length, @GLbitfield int access);
+	@AutoResultSize("length")
+	ByteBuffer glMapBufferRange(@GLenum int target, @GLintptr long offset, @GLsizeiptr long length, @GLbitfield int access);
 
 	void glFlushMappedBufferRange(@GLenum int target, @GLintptr long offset, @GLsizeiptr long length);
 

Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_direct_state_access.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_direct_state_access.java	2009-12-04 04:49:19 UTC (rev 3260)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_direct_state_access.java	2009-12-28 15:00:06 UTC (rev 3261)
@@ -1286,6 +1286,7 @@
 	@Dependent("OpenGL30")
 	@CachedResult
 	@GLvoid
+	@AutoResultSize("length")
 	ByteBuffer glMapNamedBufferRangeEXT(@GLuint int buffer, @GLintptr long offset, @GLsizeiptr long length, @GLbitfield int access);
 
 	@Dependent("OpenGL30")

Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/GL30.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/GL30.java	2009-12-04 04:49:19 UTC (rev 3260)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/GL30.java	2009-12-28 15:00:06 UTC (rev 3261)
@@ -242,8 +242,8 @@
 
 	@CachedResult
 	@GLvoid
-	ByteBuffer
-	glMapBufferRange(@GLenum int target, @GLintptr long offset, @GLsizeiptr long length, @GLbitfield int access);
+	@AutoResultSize("length")
+	ByteBuffer glMapBufferRange(@GLenum int target, @GLintptr long offset, @GLsizeiptr long length, @GLbitfield int access);
 
 	void glFlushMappedBufferRange(@GLenum int target, @GLintptr long offset, @GLsizeiptr long length);
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 3260
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3260&view=rev
Author:   spasi
Date:     2009-12-04 04:49:19 +0000 (Fri, 04 Dec 2009)

Log Message:
-----------
Added generator support for null-terminated string lists.
Fixed GetUniformIndices and TransformFeedbackVaryings.
Added a ARB_uniform_buffer_object test.

Modified Paths:
--------------
    trunk/LWJGL/src/java/org/lwjgl/BufferChecks.java
    trunk/LWJGL/src/java/org/lwjgl/test/opengl/shaders/ShadersTest.java
    trunk/LWJGL/src/java/org/lwjgl/util/generator/JavaMethodsGenerator.java
    trunk/LWJGL/src/java/org/lwjgl/util/generator/NativeMethodStubsGenerator.java
    trunk/LWJGL/src/java/org/lwjgl/util/generator/NullTerminated.java
    trunk/LWJGL/src/java/org/lwjgl/util/generator/TypedefsGenerator.java
    trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_uniform_buffer_object.java
    trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_transform_feedback.java
    trunk/LWJGL/src/templates/org/lwjgl/opengl/GL30.java
    trunk/LWJGL/src/templates/org/lwjgl/opengl/GL31.java

Added Paths:
-----------
    trunk/LWJGL/src/java/org/lwjgl/test/opengl/shaders/ShaderUNI.java
    trunk/LWJGL/src/java/org/lwjgl/test/opengl/shaders/shaderUNI.vsh
    trunk/LWJGL/src/java/org/lwjgl/util/generator/StringList.java

Modified: trunk/LWJGL/src/java/org/lwjgl/BufferChecks.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/BufferChecks.java	2009-12-02 23:11:14 UTC (rev 3259)
+++ trunk/LWJGL/src/java/org/lwjgl/BufferChecks.java	2009-12-04 04:49:19 UTC (rev 3260)
@@ -74,6 +74,17 @@
 		}
 	}
 
+	public static void checkNullTerminated(ByteBuffer buf, int count) {
+		int nullFound = 0;
+		for ( int i = buf.position(); i < buf.limit(); i++ ) {
+			if ( buf.get(i) == 0 )
+				nullFound++;
+		}
+
+		if ( nullFound < count )
+			throw new IllegalArgumentException("Missing null termination");
+	}
+
 	public static void checkNotNull(Object o) {
 		if (o == null)
 			throw new IllegalArgumentException("Null argument");

Added: trunk/LWJGL/src/java/org/lwjgl/test/opengl/shaders/ShaderUNI.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/test/opengl/shaders/ShaderUNI.java	                        (rev 0)
+++ trunk/LWJGL/src/java/org/lwjgl/test/opengl/shaders/ShaderUNI.java	2009-12-04 04:49:19 UTC (rev 3260)
@@ -0,0 +1,129 @@
+/*
+ * Copyright (c) 2002-2008 LWJGL 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 'LWJGL' 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.
+ */
+/*
+ * Created by LWJGL.
+ * User: spasi
+ * Date: 2009-12-04
+ */
+
+package org.lwjgl.test.opengl.shaders;
+
+import org.lwjgl.BufferUtils;
+import org.lwjgl.opengl.ARBUniformBufferObject;
+import org.lwjgl.opengl.GL11;
+import org.lwjgl.opengl.GL20;
+
+import java.nio.ByteBuffer;
+import java.nio.IntBuffer;
+
+final class ShaderUNI extends Shader {
+
+	final String file;
+	final ByteBuffer source;
+
+	final int shaderID;
+	final int programID;
+
+	final int uniformA;
+	final int uniformB;
+
+	ShaderUNI(final String shaderFile) {
+		file = shaderFile;
+		source = getShaderText(shaderFile);
+
+		shaderID = GL20.glCreateShader(GL20.GL_VERTEX_SHADER);
+		GL20.glShaderSource(shaderID, source);
+		GL20.glCompileShader(shaderID);
+
+		printShaderObjectInfoLog(file, shaderID);
+
+		GL20.glGetShader(shaderID, GL20.GL_COMPILE_STATUS, programBuffer);
+		if ( programBuffer.get(0) == GL11.GL_FALSE )
+			ShadersTest.kill("A compilation error occured in a vertex shader.");
+
+		programID = GL20.glCreateProgram();
+
+		GL20.glAttachShader(programID, shaderID);
+		GL20.glLinkProgram(programID);
+
+		printShaderProgramInfoLog(programID);
+
+		GL20.glGetProgram(programID, GL20.GL_LINK_STATUS, programBuffer);
+		if ( programBuffer.get(0) == GL11.GL_FALSE )
+			ShadersTest.kill("A linking error occured in a shader program.");
+
+		uniformA = getUniformLocation(programID, "uniformA");
+		uniformB = getUniformLocation(programID, "uniformB");
+
+		String[] uniformNames = { "uniformA", "uniformB" };
+		IntBuffer tmp = BufferUtils.createIntBuffer(uniformNames.length);
+
+		ARBUniformBufferObject.glGetUniformIndices(programID, toByteBuffer(uniformNames), tmp);
+
+		System.out.println("uniformA index = " + tmp.get(0));
+		System.out.println("uniformB index = " + tmp.get(1));
+	}
+
+	private static ByteBuffer toByteBuffer(String[] strs) {
+		int length = 0;
+		for ( int i = 0; i < strs.length; i++ )
+			length += strs[i].length() + 1; // +1 for the NULL-character
+
+		final ByteBuffer buff = BufferUtils.createByteBuffer(length);
+		for ( int i = 0; i < strs.length; i++ ) {
+			buff.put(strs[i].getBytes());
+			buff.put((byte)0); // The ending NULL-character
+		}
+		buff.flip();
+
+		return buff;
+	}
+
+	void render() {
+		GL20.glUseProgram(programID);
+
+		GL20.glUniform2f(uniformA, ShadersTest.getSin(), ShadersTest.getSpecularity() * 8.0f);
+		GL20.glUniform3f(uniformB, 0.0f, 0.7f, 0.0f);
+
+		ShadersTest.renderObject();
+
+		GL20.glUseProgram(0);
+	}
+
+	void cleanup() {
+		GL20.glDetachShader(programID, shaderID);
+
+		GL20.glDeleteShader(shaderID);
+		GL20.glDeleteProgram(programID);
+	}
+
+}
\ No newline at end of file

Modified: trunk/LWJGL/src/java/org/lwjgl/test/opengl/shaders/ShadersTest.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/test/opengl/shaders/ShadersTest.java	2009-12-02 23:11:14 UTC (rev 3259)
+++ trunk/LWJGL/src/java/org/lwjgl/test/opengl/shaders/ShadersTest.java	2009-12-04 04:49:19 UTC (rev 3260)
@@ -1,31 +1,31 @@
-/* 
+/*
  * Copyright (c) 2002-2008 LWJGL Project
  * All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are 
+ * modification, are permitted provided that the following conditions are
  * met:
- * 
- * * Redistributions of source code must retain the above copyright 
+ *
+ * * 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 'LWJGL' nor the names of 
- *   its contributors may be used to endorse or promote products derived 
+ * * Neither the name of 'LWJGL' 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 
+ * 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 
+ * 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.
  */
@@ -45,11 +45,7 @@
 import org.lwjgl.Sys;
 import org.lwjgl.input.Keyboard;
 import org.lwjgl.input.Mouse;
-import org.lwjgl.opengl.Display;
-import org.lwjgl.opengl.DisplayMode;
-import org.lwjgl.opengl.GL11;
-import org.lwjgl.opengl.GLContext;
-import org.lwjgl.opengl.PixelFormat;
+import org.lwjgl.opengl.*;
 import org.lwjgl.util.glu.GLU;
 import org.lwjgl.util.glu.Sphere;
 
@@ -92,7 +88,8 @@
 
 				lastFrameTime = frameStart;
 
-				angle += frameTime * 90.0f;
+				//angle += frameTime * 90.0f;
+				angle += 0.1f;
 				sin = (float)Math.sin(Math.toRadians(angle));
 
 				handleIO();
@@ -138,7 +135,7 @@
 
 			System.out.println("Setting display mode to: " + displayMode);
 			Display.setDisplayMode(displayMode);
-			Display.create(new PixelFormat(8, 24, 0));
+			Display.create(new PixelFormat(8, 24, 0), "UNI".equalsIgnoreCase(args[0]) ? new ContextAttribs(3, 1) : null);
 			ShadersTest.displayMode = displayMode;
 		} catch (LWJGLException e) {
 			kill(e.getMessage());
@@ -170,6 +167,11 @@
 				kill("The ARB_fragment_shader extension is not supported.");
 
 			shader = new ShaderFSH("shaderFSH.vsh", "shaderFSH.fsh");
+		} else if ("UNI".equalsIgnoreCase(args[0]) ) {
+			if ( !GLContext.getCapabilities().OpenGL31 )
+				kill("OpenGL version 3.1 is not supported.");
+
+			shader = new ShaderUNI("shaderUNI.vsh");
 		} else {
 			argsError();
 		}

Added: trunk/LWJGL/src/java/org/lwjgl/test/opengl/shaders/shaderUNI.vsh
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/test/opengl/shaders/shaderUNI.vsh	                        (rev 0)
+++ trunk/LWJGL/src/java/org/lwjgl/test/opengl/shaders/shaderUNI.vsh	2009-12-04 04:49:19 UTC (rev 3260)
@@ -0,0 +1,25 @@
+#version 140
+
+uniform vec2 uniformA;
+uniform vec3 uniformB;
+
+void main(void) {
+	gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
+
+	vec3 normal = gl_NormalMatrix * gl_Normal;
+
+	float diffuseDot = max(dot(normal, vec3(gl_LightSource[0].position)), 0.0);
+	float specularDot = max(dot(normal, vec3(gl_LightSource[0].halfVector)), 0.0);
+	specularDot = pow(specularDot, uniformA.y);
+
+	// Normalize position, to get a {-1..1} value for each vertex.
+	// Multiply with current sin.
+	vec3 color3D = normalize(vec3(gl_Vertex)) * uniformA.x;
+	// {-1..1} => {0..1} & Intensify colors.
+	color3D = (color3D * 0.5 + 0.5) * 2.0;
+
+	// Accumulate color contributions.
+	color3D = diffuseDot * (uniformB + color3D) + vec3(gl_LightModel.ambient);
+	gl_FrontColor.rgb = specularDot * vec3(gl_LightSource[0].specular) + color3D;
+	gl_FrontColor.a = 1.0;
+}
\ No newline at end of file

Modified: trunk/LWJGL/src/java/org/lwjgl/util/generator/JavaMethodsGenerator.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/util/generator/JavaMethodsGenerator.java	2009-12-02 23:11:14 UTC (rev 3259)
+++ trunk/LWJGL/src/java/org/lwjgl/util/generator/JavaMethodsGenerator.java	2009-12-04 04:49:19 UTC (rev 3260)
@@ -41,8 +41,6 @@
  * $Id$
  */
 
-import org.lwjgl.opengl.PointerWrapper;
-
 import com.sun.mirror.apt.*;
 import com.sun.mirror.declaration.*;
 import com.sun.mirror.type.*;
@@ -471,23 +469,23 @@
 					check_value = check_annotation.value();
 					can_be_null = check_annotation.canBeNull();
 				}
-				boolean null_terminated = param.getAnnotation(NullTerminated.class) != null;
+				NullTerminated null_terminated = param.getAnnotation(NullTerminated.class);
 				if (Buffer.class.isAssignableFrom(java_type)) {
 					boolean indirect_buffer_allowed = param.getAnnotation(CachedReference.class) == null;
 					boolean out_parameter = param.getAnnotation(OutParameter.class) != null;
 					TypeInfo typeinfo = typeinfos.get(param);
 					printParameterCheck(writer, param.getSimpleName(), typeinfo.getType().getSimpleName(), check_value, can_be_null, null_terminated, indirect_buffer_allowed, out_parameter);
-				} else if (String.class.equals(java_type)) {
+				} else if ( String.class.equals(java_type)) {
 					if (!can_be_null)
 						writer.println("\t\tBufferChecks.checkNotNull(" + param.getSimpleName() + ");");
 				}
 			}
 		}
 		if (method.getAnnotation(CachedResult.class) != null)
-			printParameterCheck(writer, Utils.CACHED_BUFFER_NAME, null, null, true, false, false, false);
+			printParameterCheck(writer, Utils.CACHED_BUFFER_NAME, null, null, true, null, false, false);
 	}
 
-	private static void printParameterCheck(PrintWriter writer, String name, String type, String check_value, boolean can_be_null, boolean null_terminated, boolean indirect_buffer_allowed, boolean out_parameter) {
+	private static void printParameterCheck(PrintWriter writer, String name, String type, String check_value, boolean can_be_null, NullTerminated null_terminated, boolean indirect_buffer_allowed, boolean out_parameter) {
 		if (indirect_buffer_allowed && out_parameter) {
 			writer.println("\t\t" + type + " " + name + SAVED_PARAMETER_POSTFIX + " = " + name + ";");
 		}
@@ -507,8 +505,15 @@
 			writer.print("Direct(" + name);
 		}
 		writer.println(");");
-		if (null_terminated)
-			writer.println("\t\tBufferChecks.checkNullTerminated(" + name + ");");
+		if (null_terminated != null) {
+			writer.print("\t\tBufferChecks.checkNullTerminated(");
+			writer.print(name);
+			if ( null_terminated.value().length() > 0 ) {
+				writer.print(", ");
+				writer.print(null_terminated.value());
+			}
+			writer.println(");");
+		}
 	}
 
 	private static void printResultType(PrintWriter writer, MethodDeclaration method, boolean native_stub) {

Modified: trunk/LWJGL/src/java/org/lwjgl/util/generator/NativeMethodStubsGenerator.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/util/generator/NativeMethodStubsGenerator.java	2009-12-02 23:11:14 UTC (rev 3259)
+++ trunk/LWJGL/src/java/org/lwjgl/util/generator/NativeMethodStubsGenerator.java	2009-12-04 04:49:19 UTC (rev 3260)
@@ -52,6 +52,7 @@
 public class NativeMethodStubsGenerator {
 	private static final String BUFFER_ADDRESS_POSTFIX = "_address";
 	public static final String BUFFER_POSITION_POSTFIX = "_position";
+	private static final String STRING_LIST_POSTFIX = "_str";
 
 	public static void generateNativeMethodStubs(AnnotationProcessorEnvironment env, TypeMap type_map, PrintWriter writer, InterfaceDeclaration d, boolean generate_error_checks, boolean context_specific) {
 		for (MethodDeclaration method : d.getMethods()) {
@@ -120,6 +121,7 @@
 			writer.print(" = (" + typedef_name + ")((intptr_t)");
 			writer.println(Utils.FUNCTION_POINTER_VAR_NAME + ");");
 		}
+		generateStringListInits(writer, method.getParameters());
 		writer.print("\t");
 		if (!result_type.equals(env.getTypeUtils().getVoidType())) {
 			Declaration return_declaration;
@@ -197,17 +199,21 @@
 			writer.print(Utils.RESULT_VAR_NAME);
 		} else {
 			writer.print(param.getSimpleName());
-			if (Utils.isAddressableType(param.getType())) {
+			if ( param.getAnnotation(StringList.class) != null )
+				writer.print(STRING_LIST_POSTFIX);
+			else if (Utils.isAddressableType(param.getType()))
 				writer.print(BUFFER_ADDRESS_POSTFIX);
-			}
 		}
 	}
 
 	private static void generateStringDeallocations(PrintWriter writer, Collection<ParameterDeclaration> params) {
-		for (ParameterDeclaration param : params)
+		for (ParameterDeclaration param : params) {
 			if (Utils.getJavaType(param.getType()).equals(String.class) &&
 					param.getAnnotation(Result.class) == null)
 				writer.println("\tfree(" + param.getSimpleName() + BUFFER_ADDRESS_POSTFIX + ");");
+			else if (param.getAnnotation(StringList.class) != null ) // Free the string array mem
+				writer.println("\tfree(" + param.getSimpleName() + STRING_LIST_POSTFIX + ");");
+		}
 	}
 
 	private static void generateBufferParameterAddresses(TypeMap type_map, PrintWriter writer, MethodDeclaration method, Mode mode) {
@@ -249,5 +255,34 @@
 				throw new RuntimeException("Illegal type " + java_type);
 		}
 		writer.println(";");
+
+		if ( param.getAnnotation(StringList.class) != null ) {
+			if ( param.getAnnotation(GLchar.class) == null ||
+			     param.getAnnotation(NullTerminated.class) == null ||
+			     param.getAnnotation(NullTerminated.class).value().length() == 0
+			)
+				throw new RuntimeException("StringList annotation can only be applied on null-terminated GLchar buffers.");
+
+			// Declare string array and loop counters
+			writer.print("\tGLchar **" + param.getSimpleName() + STRING_LIST_POSTFIX + "; ");
+			writer.println("\tunsigned int " + param.getSimpleName() + "_i = 0;");
+			writer.println("\tGLchar *" + param.getSimpleName() + "_next = (GLchar *)" + param.getSimpleName() + BUFFER_ADDRESS_POSTFIX + ";");
+		}
 	}
+
+	private static void generateStringListInits(PrintWriter writer, Collection<ParameterDeclaration> params) {
+		for ( ParameterDeclaration param : params ) {
+			StringList stringList_annotation = param.getAnnotation(StringList.class);
+			if ( stringList_annotation != null ) {
+				// Allocate the string array
+				writer.println("\t" + param.getSimpleName() + STRING_LIST_POSTFIX + " = (GLchar **) malloc(" + stringList_annotation.value() + "*sizeof(GLchar*));");
+				// Fill string array with the string pointers
+				writer.println("\tdo {");
+				writer.println("\t\t" + param.getSimpleName() + STRING_LIST_POSTFIX + "[" + param.getSimpleName() + "_i++] = " + param.getSimpleName() + "_next;");
+				writer.println("\t\t" + param.getSimpleName() + "_next += strlen(" + param.getSimpleName() + "_next) + 1;");
+				writer.println("\t} while ( " + param.getSimpleName() + "_i < " + stringList_annotation.value() + " );");
+			}
+		}
+	}
+
 }

Modified: trunk/LWJGL/src/java/org/lwjgl/util/generator/NullTerminated.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/util/generator/NullTerminated.java	2009-12-02 23:11:14 UTC (rev 3259)
+++ trunk/LWJGL/src/java/org/lwjgl/util/generator/NullTerminated.java	2009-12-04 04:49:19 UTC (rev 3260)
@@ -46,4 +46,5 @@
 
 @Target(ElementType.PARAMETER)
 public @interface NullTerminated {
+	String value() default "";
 }

Added: trunk/LWJGL/src/java/org/lwjgl/util/generator/StringList.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/util/generator/StringList.java	                        (rev 0)
+++ trunk/LWJGL/src/java/org/lwjgl/util/generator/StringList.java	2009-12-04 04:49:19 UTC (rev 3260)
@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 2002-2008 LWJGL 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 'LWJGL' 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.generator;
+
+/**
+ *
+ * @author spasi <sp...@us...>
+ */
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Target;
+
+@Target({ElementType.PARAMETER, ElementType.METHOD})
+public @interface StringList {
+	String value();
+}
\ No newline at end of file

Modified: trunk/LWJGL/src/java/org/lwjgl/util/generator/TypedefsGenerator.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/util/generator/TypedefsGenerator.java	2009-12-02 23:11:14 UTC (rev 3259)
+++ trunk/LWJGL/src/java/org/lwjgl/util/generator/TypedefsGenerator.java	2009-12-04 04:49:19 UTC (rev 3260)
@@ -76,7 +76,7 @@
 		NativeTypeTranslator translator = new NativeTypeTranslator(type_map, param);
 		param.getType().accept(translator);
 		writer.print(translator.getSignature());
-		if (param.getAnnotation(Result.class) != null || param.getAnnotation(Indirect.class) != null)
+		if (param.getAnnotation(Result.class) != null || param.getAnnotation(Indirect.class) != null || param.getAnnotation(StringList.class) != null)
 			writer.print("*");
 		writer.print(" " + param.getSimpleName());
 	}

Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_uniform_buffer_object.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_uniform_buffer_object.java	2009-12-02 23:11:14 UTC (rev 3259)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_uniform_buffer_object.java	2009-12-04 04:49:19 UTC (rev 3260)
@@ -99,7 +99,7 @@
 	int GL_INVALID_INDEX = 0xFFFFFFFF;
 
 	void glGetUniformIndices(@GLuint int program, @AutoSize("uniformIndices") @GLsizei int uniformCount,
-	                         @Const @NullTerminated @GLchar ByteBuffer uniformNames,
+	                         @Const @NullTerminated("uniformIndices.remaining()") @GLchar @StringList("uniformCount") ByteBuffer uniformNames,
 	                         @OutParameter @GLuint IntBuffer uniformIndices);
 
 	@StripPostfix("params")

Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_transform_feedback.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_transform_feedback.java	2009-12-02 23:11:14 UTC (rev 3259)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_transform_feedback.java	2009-12-04 04:49:19 UTC (rev 3260)
@@ -101,7 +101,9 @@
 
 	void glEndTransformFeedbackEXT();
 
-	void glTransformFeedbackVaryingsEXT(@GLuint int program, @GLsizei int count, @Const @NullTerminated @GLchar ByteBuffer varyings, @GLenum int bufferMode);
+	void glTransformFeedbackVaryingsEXT(@GLuint int program, @GLsizei int count,
+	                                    @Const @NullTerminated("count") @GLchar @StringList("count") ByteBuffer varyings,
+	                                    @GLenum int bufferMode);
 
 	void glGetTransformFeedbackVaryingEXT(@GLuint int program, @GLuint int index,
 	                                      @AutoSize("name") @GLsizei int bufSize,

Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/GL30.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/GL30.java	2009-12-02 23:11:14 UTC (rev 3259)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/GL30.java	2009-12-04 04:49:19 UTC (rev 3260)
@@ -864,7 +864,9 @@
 
 	void glEndTransformFeedback();
 
-	void glTransformFeedbackVaryings(@GLuint int program, @GLsizei int count, @Const @NullTerminated @GLchar ByteBuffer varyings, @GLenum int bufferMode);
+	void glTransformFeedbackVaryings(@GLuint int program, @GLsizei int count,
+	                                 @Const @NullTerminated("count") @GLchar @StringList("count") ByteBuffer varyings,
+	                                 @GLenum int bufferMode);
 
 	void glGetTransformFeedbackVarying(@GLuint int program, @GLuint int index,
 	                                   @AutoSize("name") @GLsizei int bufSize,

Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/GL31.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/GL31.java	2009-12-02 23:11:14 UTC (rev 3259)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/GL31.java	2009-12-04 04:49:19 UTC (rev 3260)
@@ -234,7 +234,7 @@
 	int GL_INVALID_INDEX = 0xFFFFFFFF;
 
 	void glGetUniformIndices(@GLuint int program, @AutoSize("uniformIndices") @GLsizei int uniformCount,
-	                            @Const @NullTerminated @GLchar ByteBuffer uniformNames,
+	                            @Const @NullTerminated("uniformIndices.remaining()") @GLchar @StringList("uniformCount") ByteBuffer uniformNames,
 	                            @OutParameter @GLuint IntBuffer uniformIndices);
 
 	@StripPostfix("params")


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 3259
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3259&view=rev
Author:   matzon
Date:     2009-12-02 23:11:14 +0000 (Wed, 02 Dec 2009)

Log Message:
-----------
call InitCommonControls if no display has been created prior to Alert

Modified Paths:
--------------
    trunk/LWJGL/src/java/org/lwjgl/WindowsSysImplementation.java
    trunk/LWJGL/src/native/windows/org_lwjgl_Sys.c

Modified: trunk/LWJGL/src/java/org/lwjgl/WindowsSysImplementation.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/WindowsSysImplementation.java	2009-12-01 15:12:52 UTC (rev 3258)
+++ trunk/LWJGL/src/java/org/lwjgl/WindowsSysImplementation.java	2009-12-02 23:11:14 UTC (rev 3259)
@@ -94,9 +94,13 @@
 	}
 
 	public void alert(String title, String message) {
+		if(!Display.isCreated()) {
+			initCommonControls();
+		}
 		nAlert(getHwnd(), title, message);
 	}
 	private static native void nAlert(long parent_hwnd, String title, String message);
+	private static native void initCommonControls();
 
 	public boolean openURL(final String url) {
 		try {

Modified: trunk/LWJGL/src/native/windows/org_lwjgl_Sys.c
===================================================================
--- trunk/LWJGL/src/native/windows/org_lwjgl_Sys.c	2009-12-01 15:12:52 UTC (rev 3258)
+++ trunk/LWJGL/src/native/windows/org_lwjgl_Sys.c	2009-12-02 23:11:14 UTC (rev 3259)
@@ -44,6 +44,7 @@
 #include "org_lwjgl_WindowsSysImplementation.h"
 #include "common_tools.h"
 #include <malloc.h>
+#include <commctrl.h>
 
 JNIEXPORT jlong JNICALL Java_org_lwjgl_WindowsSysImplementation_nGetTime(JNIEnv * env, jclass unused) {
 	DWORD time;
@@ -67,6 +68,10 @@
 	free(cTitleBarText);
 }
 
+JNIEXPORT void JNICALL Java_org_lwjgl_WindowsSysImplementation_initCommonControls(JNIEnv * env, jclass unused) {
+	InitCommonControls();
+}
+
 JNIEXPORT jstring JNICALL Java_org_lwjgl_WindowsSysImplementation_nGetClipboard
   (JNIEnv * env, jclass unused)
 {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 3258
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3258&view=rev
Author:   kappa1
Date:     2009-12-01 15:12:52 +0000 (Tue, 01 Dec 2009)

Log Message:
-----------
added the Display.setInitialBackground(r,g,b) method, this will allow you to select the initial background color of the lwjgl Display window. Useful to create more polished applications and smoother looking applets.

Modified Paths:
--------------
    trunk/LWJGL/src/java/org/lwjgl/opengl/Display.java

Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/Display.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/Display.java	2009-12-01 11:39:48 UTC (rev 3257)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/Display.java	2009-12-01 15:12:52 UTC (rev 3258)
@@ -116,6 +116,9 @@
 	private static boolean window_created = false;
 
 	private static boolean parent_resized;
+	
+	/** Initial Background Color of Display */
+	private static float r = 0, g = 0, b = 0;
 
 	private static ComponentListener component_listener = new ComponentAdapter() {
 		public void componentResized(ComponentEvent e) {
@@ -861,6 +864,20 @@
 			}
 		}
 	}
+	
+	/**
+	*  Set the initial color of the Display. This method is called before the Display is created and will set the
+	*  background color to the one specified in this method.
+	*  
+	*  @param red - color value between 0 - 1
+	*  @param green - color value between 0 - 1
+	*  @param blue - color value between 0 - 1
+	*/
+	public static void setInitialBackground(float red, float green, float blue) {
+		r = red;
+		g = green;
+		b = blue;
+	}
 
 	private static void makeCurrentAndSetSwapInterval() throws LWJGLException {
 		makeCurrent();
@@ -869,6 +886,8 @@
 	}
 
 	private static void initContext() {
+		// set background clear color
+		GL11.glClearColor(r, g, b, 1.0f);
 		// Clear window to avoid the desktop "showing through"
 		GL11.glClear(GL11.GL_COLOR_BUFFER_BIT);
 		update();


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 3257
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3257&view=rev
Author:   spasi
Date:     2009-12-01 11:39:48 +0000 (Tue, 01 Dec 2009)

Log Message:
-----------
Fixed GetSync signature.

Modified Paths:
--------------
    trunk/LWJGL/src/java/org/lwjgl/test/opengl/SyncTest.java

Modified: trunk/LWJGL/src/java/org/lwjgl/test/opengl/SyncTest.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/test/opengl/SyncTest.java	2009-12-01 03:37:27 UTC (rev 3256)
+++ trunk/LWJGL/src/java/org/lwjgl/test/opengl/SyncTest.java	2009-12-01 11:39:48 UTC (rev 3257)
@@ -132,7 +132,7 @@
 		}
 
 		IntBuffer property = BufferUtils.createIntBuffer(1);
-		GL32.glGetSynciv(sync, GL32.GL_SYNC_STATUS, null, property);
+		GL32.glGetSync(sync, GL32.GL_SYNC_STATUS, null, property);
 		System.out.println("Sync Status: " + (property.get(0) == GL32.GL_UNSIGNALED ? "UNSIGNALED" : "SIGNALED"));
 
 		GL32.glDeleteSync(sync);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 3256
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3256&view=rev
Author:   spasi
Date:     2009-12-01 03:37:27 +0000 (Tue, 01 Dec 2009)

Log Message:
-----------
Updated EXT_direct_state_access to latest revision.
Improved postfix stripping and extension dependency.

Modified Paths:
--------------
    trunk/LWJGL/src/java/org/lwjgl/util/generator/ContextCapabilitiesGenerator.java
    trunk/LWJGL/src/java/org/lwjgl/util/generator/JavaMethodsGenerator.java
    trunk/LWJGL/src/java/org/lwjgl/util/generator/StripPostfix.java
    trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_sync.java
    trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_direct_state_access.java
    trunk/LWJGL/src/templates/org/lwjgl/opengl/GL30.java
    trunk/LWJGL/src/templates/org/lwjgl/opengl/GL32.java
    trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_geometry_program4.java

Modified: trunk/LWJGL/src/java/org/lwjgl/util/generator/ContextCapabilitiesGenerator.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/util/generator/ContextCapabilitiesGenerator.java	2009-11-26 22:44:17 UTC (rev 3255)
+++ trunk/LWJGL/src/java/org/lwjgl/util/generator/ContextCapabilitiesGenerator.java	2009-12-01 03:37:27 UTC (rev 3256)
@@ -215,8 +215,16 @@
 			writer.print("\t\t\t(");
 			if ( deprecated != null )
 				writer.print("forwardCompatible || ");
-			if ( dependent != null )
-				writer.print("!supported_extensions.contains(\"" + dependent.value() + "\") || ");
+			if ( dependent != null ) {
+				if ( dependent.value().indexOf(',') == -1 )
+					writer.print("!supported_extensions.contains(\"" + dependent.value() + "\") || ");
+				else {
+					writer.print("!(false");
+					for ( String extension : dependent.value().split(",") )
+						writer.print(" || supported_extensions.contains(\"" + extension + "\")");
+					writer.print(") || ");
+				}
+			}
 			if ( deprecated != null || dependent != null )
 				writer.print('(');
 			writer.print(Utils.getFunctionAddressName(d, method) + " = ");

Modified: trunk/LWJGL/src/java/org/lwjgl/util/generator/JavaMethodsGenerator.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/util/generator/JavaMethodsGenerator.java	2009-11-26 22:44:17 UTC (rev 3255)
+++ trunk/LWJGL/src/java/org/lwjgl/util/generator/JavaMethodsGenerator.java	2009-12-01 03:37:27 UTC (rev 3256)
@@ -283,22 +283,29 @@
 	private static String getPostfixStrippedName(TypeMap type_map, InterfaceDeclaration interface_decl, MethodDeclaration method) {
 		StripPostfix strip_annotation = method.getAnnotation(StripPostfix.class);
 		ParameterDeclaration postfix_parameter = Utils.findParameter(method, strip_annotation.value());
-		PostfixTranslator translator = new PostfixTranslator(type_map, postfix_parameter);
-		postfix_parameter.getType().accept(translator);
-		String postfix = translator.getSignature();
+		String postfix = strip_annotation.postfix();
+		if ( "NULL".equals(postfix) ) {
+			PostfixTranslator translator = new PostfixTranslator(type_map, postfix_parameter);
+			postfix_parameter.getType().accept(translator);
+			postfix = translator.getSignature();
+		}
 		String method_name = method.getSimpleName();
 		String extension_postfix = "NULL".equals(strip_annotation.extension()) ? getExtensionPostfix(interface_decl) : strip_annotation.extension();
 		String result;
-		if (method_name.endsWith(postfix + "v" + extension_postfix))
+
+		if ( strip_annotation.hasPostfix() && method_name.endsWith(postfix + "v" + extension_postfix))
 			result = method_name.substring(0, method_name.length() - (postfix.length() + 1 + extension_postfix.length()));
-		else if (method_name.endsWith(postfix + extension_postfix))
+		else if ( strip_annotation.hasPostfix() && method_name.endsWith(postfix + extension_postfix))
 			result = method_name.substring(0, method_name.length() - (postfix.length() + extension_postfix.length()));
-		else if ( method_name.endsWith("_v" + extension_postfix) )
-			result = method_name.substring(0, method_name.length() - (2 + extension_postfix.length()));
+		else if ( strip_annotation.hasPostfix() && method_name.endsWith(postfix + "i_v" + extension_postfix) )
+			result = method_name.substring(0, method_name.length() - (postfix.length() + 3 + extension_postfix.length()));
+		else if ( method_name.endsWith("i_v" + extension_postfix) )
+			result = method_name.substring(0, method_name.length() - (3 + extension_postfix.length()));
 		else if (method_name.endsWith("v" + extension_postfix))
 			result = method_name.substring(0, method_name.length() - (1 + extension_postfix.length()));
 		else
 			throw new RuntimeException(method + " is specified as being postfix stripped on parameter " + postfix_parameter + ", but it's postfix is not '" + postfix + "' nor 'v'");
+
 		return result + extension_postfix;
 	}
 

Modified: trunk/LWJGL/src/java/org/lwjgl/util/generator/StripPostfix.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/util/generator/StripPostfix.java	2009-11-26 22:44:17 UTC (rev 3255)
+++ trunk/LWJGL/src/java/org/lwjgl/util/generator/StripPostfix.java	2009-12-01 03:37:27 UTC (rev 3256)
@@ -48,4 +48,6 @@
 public @interface StripPostfix {
 	String value(); // The parameter to deduce the postfix from
 	String extension() default "NULL";
+	boolean hasPostfix() default true;
+	String postfix() default "NULL";
 }

Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_sync.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_sync.java	2009-11-26 22:44:17 UTC (rev 3255)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_sync.java	2009-12-01 03:37:27 UTC (rev 3256)
@@ -82,9 +82,10 @@
 
 	void glWaitSync(@GLpointer("GLsync") GLSync sync, @GLbitfield int flags, @GLuint64 long timeout);
 
-	@StripPostfix("params")
+	@StripPostfix(value = "params", postfix = "64")
 	void glGetInteger64v(@GLenum int pname, @OutParameter @Check("1") @GLint64 LongBuffer params);
 
+	@StripPostfix("values")
 	void glGetSynciv(@GLpointer("GLsync") GLSync sync, @GLenum int pname,
 	                 @AutoSize("values") @GLsizei int bufSize,
 	                 @OutParameter @GLsizei @Check(value = "1", canBeNull = true) IntBuffer length,

Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_direct_state_access.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_direct_state_access.java	2009-11-26 22:44:17 UTC (rev 3255)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/EXT_direct_state_access.java	2009-12-01 03:37:27 UTC (rev 3256)
@@ -39,6 +39,15 @@
 @DeprecatedGL
 public interface EXT_direct_state_access {
 
+	/**
+	 * Accepted by the <pname> parameter of GetBooleanIndexedvEXT,
+	 * GetIntegerIndexedvEXT, GetFloatIndexedvEXT, GetDoubleIndexedvEXT:
+	 * GetBooleani_v, GetIntegeri_v, GetFloati_vEXT, GetDoublei_vEXT:
+	 */
+	int GL_PROGRAM_MATRIX_EXT = 0x8E2D;
+	int GL_TRANSPOSE_PROGRAM_MATRIX_EXT = 0x8E2E;
+	int GL_PROGRAM_MATRIX_STACK_DEPTH_EXT = 0x8E2F;
+
 	/*
 	OpenGL 1.1: New client commands
 	 */
@@ -183,16 +192,16 @@
 	                          @GLdouble Buffer pixels);
 
 	@StripPostfix("params")
-	void glGetTextureParameterfvEXT(@GLuint int texture, @GLenum int target, @GLenum int pname, @OutParameter @Check("4")FloatBuffer params);
+	void glGetTextureParameterfvEXT(@GLuint int texture, @GLenum int target, @GLenum int pname, @OutParameter @Check("4") FloatBuffer params);
 
 	@StripPostfix("params")
-	void glGetTextureParameterivEXT(@GLuint int texture, @GLenum int target, @GLenum int pname, @OutParameter @Check("4")IntBuffer params);
+	void glGetTextureParameterivEXT(@GLuint int texture, @GLenum int target, @GLenum int pname, @OutParameter @Check("4") IntBuffer params);
 
 	@StripPostfix("params")
-	void glGetTextureLevelParameterfvEXT(@GLuint int texture, @GLenum int target, int level, @GLenum int pname, @OutParameter @Check("4")FloatBuffer params);
+	void glGetTextureLevelParameterfvEXT(@GLuint int texture, @GLenum int target, int level, @GLenum int pname, @OutParameter @Check("4") FloatBuffer params);
 
 	@StripPostfix("params")
-	void glGetTextureLevelParameterivEXT(@GLuint int texture, @GLenum int target, int level, @GLenum int pname, @OutParameter @Check("4")IntBuffer params);
+	void glGetTextureLevelParameterivEXT(@GLuint int texture, @GLenum int target, int level, @GLenum int pname, @OutParameter @Check("4") IntBuffer params);
 
 	/*
 	OpenGL 1.2: New 3D texture object commands replace "Tex" in name with
@@ -460,6 +469,19 @@
 	void glDisableClientStateIndexedEXT(@GLenum int array, @GLuint int index);
 
 	/*
+	OpenGL 3.0: New indexed texture commands and queries append "i"
+    to name and add "uint index" parameter (to identify the texture
+    unit index) after state name parameters (if any) and before state
+    value parameters
+	 */
+
+	@Dependent("OpenGL30")
+	void glEnableClientStateiEXT(@GLenum int array, @GLuint int index);
+
+	@Dependent("OpenGL30")
+	void glDisableClientStateiEXT(@GLenum int array, @GLuint int index);
+
+	/*
 	OpenGL 1.2.1: New indexed generic queries (added for indexed texture
     state) append "Indexed" to name and add "uint index" parameter
     (to identify the texture unit) after state name parameters (if any)
@@ -468,17 +490,36 @@
 
 	@Dependent("OpenGL13")
 	@StripPostfix("params")
-	void glGetFloatIndexedvEXT(@GLenum int pname, @GLuint int index, @OutParameter @Check("16")FloatBuffer params);
+	void glGetFloatIndexedvEXT(@GLenum int pname, @GLuint int index, @OutParameter @Check("16") FloatBuffer params);
 
 	@Dependent("OpenGL13")
-	@StripPostfix("params")
-	void glGetDoubleIndexedvEXT(@GLenum int pname, @GLuint int index, @OutParameter @Check("16")DoubleBuffer params);
+	@StripPostfix(value = "params", hasPostfix = false)
+	void glGetDoubleIndexedvEXT(@GLenum int pname, @GLuint int index, @OutParameter @Check("16") DoubleBuffer params);
 
 	@Dependent("OpenGL13")
 	@StripPostfix("params")
 	void glGetPointerIndexedvEXT(@GLenum int pname, @GLuint int index, @Result @GLvoid ByteBuffer params);
 
 	/*
+    OpenGL 3.0: New indexed generic queries (added for indexed texture
+    state) replace "v" for "i_v" to name and add "uint index" parameter
+    (to identify the texture unit) after state name parameters (if any)
+    and before state value parameters
+	 */
+
+	@Dependent("OpenGL30")
+	@StripPostfix("params")
+	void glGetFloati_vEXT(@GLenum int pname, @GLuint int index, @OutParameter @Check("16") FloatBuffer params);
+
+	@Dependent("OpenGL30")
+	@StripPostfix("params")
+	void glGetDoublei_vEXT(@GLenum int pname, @GLuint int index, @OutParameter @Check("16") DoubleBuffer params);
+
+	@Dependent("OpenGL30")
+	@StripPostfix(value = "params", hasPostfix = false)
+	void glGetPointeri_vEXT(@GLenum int pname, @GLuint int index, @Result @GLvoid ByteBuffer params);
+
+	/*
 	OpenGL 1.2.1:  Extend the functionality of these EXT_draw_buffers2
     commands and queries for multitexture
     TODO: Why 1.2.1 and not EXT_draw_buffers2?
@@ -495,7 +536,7 @@
 
 	@Dependent("GL_EXT_draw_buffers2")
 	@StripPostfix("params")
-	void glGetIntegerIndexedvEXT(@GLenum int pname, @GLuint int index, @OutParameter @Check("16")IntBuffer params);
+	void glGetIntegerIndexedvEXT(@GLenum int pname, @GLuint int index, @OutParameter @Check("16") IntBuffer params);
 
 	@Dependent("GL_EXT_draw_buffers2")
 	@StripPostfix("params")
@@ -514,26 +555,26 @@
 
 	@Dependent("GL_ARB_vertex_program")
 	@StripPostfix("params")
-	void glNamedProgramLocalParameter4dvEXT(@GLuint int program, @GLenum int target, @GLuint int index, @Const @Check("4")DoubleBuffer params);
+	void glNamedProgramLocalParameter4dvEXT(@GLuint int program, @GLenum int target, @GLuint int index, @Const @Check("4") DoubleBuffer params);
 
 	@Dependent("GL_ARB_vertex_program")
 	void glNamedProgramLocalParameter4fEXT(@GLuint int program, @GLenum int target, @GLuint int index, float x, float y, float z, float w);
 
 	@Dependent("GL_ARB_vertex_program")
 	@StripPostfix("params")
-	void glNamedProgramLocalParameter4fvEXT(@GLuint int program, @GLenum int target, @GLuint int index, @Const @Check("4")FloatBuffer params);
+	void glNamedProgramLocalParameter4fvEXT(@GLuint int program, @GLenum int target, @GLuint int index, @Const @Check("4") FloatBuffer params);
 
 	@Dependent("GL_ARB_vertex_program")
 	@StripPostfix("params")
-	void glGetNamedProgramLocalParameterdvEXT(@GLuint int program, @GLenum int target, @GLuint int index, @OutParameter @Check("4")DoubleBuffer params);
+	void glGetNamedProgramLocalParameterdvEXT(@GLuint int program, @GLenum int target, @GLuint int index, @OutParameter @Check("4") DoubleBuffer params);
 
 	@Dependent("GL_ARB_vertex_program")
 	@StripPostfix("params")
-	void glGetNamedProgramLocalParameterfvEXT(@GLuint int program, @GLenum int target, @GLuint int index, @OutParameter @Check("4")FloatBuffer params);
+	void glGetNamedProgramLocalParameterfvEXT(@GLuint int program, @GLenum int target, @GLuint int index, @OutParameter @Check("4") FloatBuffer params);
 
 	@Dependent("GL_ARB_vertex_program")
 	@StripPostfix("params")
-	void glGetNamedProgramivEXT(@GLuint int program, @GLenum int target, @GLenum int pname, @OutParameter @Check("4")IntBuffer params);
+	void glGetNamedProgramivEXT(@GLuint int program, @GLenum int target, @GLenum int pname, @OutParameter @Check("4") IntBuffer params);
 
 	@Dependent("GL_ARB_vertex_program")
 	void glGetNamedProgramStringEXT(@GLuint int program, @GLenum int target, @GLenum int pname, @OutParameter @Check @GLvoid ByteBuffer string);
@@ -748,7 +789,7 @@
 
 	@Dependent("OpenGL15")
 	@StripPostfix("params")
-	void glGetNamedBufferParameterivEXT(@GLuint int buffer, @GLenum int pname, @OutParameter @Check("4")IntBuffer params);
+	void glGetNamedBufferParameterivEXT(@GLuint int buffer, @GLenum int pname, @OutParameter @Check("4") IntBuffer params);
 
 	@Dependent("OpenGL15")
 	@StripPostfix("params")
@@ -1015,14 +1056,14 @@
 	void glGetNamedProgramLocalParameterIuivEXT(@GLuint int program, @GLenum int target, @GLuint int index, @Check("4") @OutParameter @GLuint IntBuffer params);
 
 	/*
-	EXT_framebuffer_object: New renderbuffer commands add "Named" prefix
-    to name and replace "enum target" with "uint renderbuffer"
+	OpenGL 3.0: New renderbuffer commands add "Named" prefix to name
+    and replace "enum target" with "uint renderbuffer"
 	 */
 
-	@Dependent("GL_EXT_framebuffer_object")
+	@Dependent("OpenGL30,GL_EXT_framebuffer_object")
 	void glNamedRenderbufferStorageEXT(@GLuint int renderbuffer, @GLenum int internalformat, @GLsizei int width, @GLsizei int height);
 
-	@Dependent("GL_EXT_framebuffer_object")
+	@Dependent("OpenGL30,GL_EXT_framebuffer_object")
 	@StripPostfix("params")
 	void glGetNamedRenderbufferParameterivEXT(@GLuint int renderbuffer, @GLenum int pname, @Check("4") @OutParameter IntBuffer params);
 
@@ -1031,7 +1072,7 @@
     prefix to name and replace "enum target" with "uint renderbuffer"
 	 */
 
-	@Dependent("GL_EXT_framebuffer_multisample")
+	@Dependent("OpenGL30,GL_EXT_framebuffer_multisample")
 	void glNamedRenderbufferStorageMultisampleEXT(@GLuint int renderbuffer, @GLsizei int samples, @GLenum int internalformat, @GLsizei int width, @GLsizei int height);
 
 	/*
@@ -1044,80 +1085,87 @@
 	void glNamedRenderbufferStorageMultisampleCoverageEXT(@GLuint int renderbuffer, @GLsizei int coverageSamples, @GLsizei int colorSamples, @GLenum int internalformat, @GLsizei int width, @GLsizei int height);
 
 	/*
-	EXT_framebuffer_object: New framebuffer commands add "Named" prefix
-    to name and replace "enum target" with "uint framebuffer"
+	OpenGL 3.0: New framebuffer commands add "Named" prefix to name
+    and replace "enum target" with "uint framebuffer"
 	 */
 
-	@Dependent("GL_EXT_framebuffer_object")
+	@Dependent("OpenGL30,GL_EXT_framebuffer_object")
 	@GLenum
 	int glCheckNamedFramebufferStatusEXT(@GLuint int framebuffer, @GLenum int target);
 
-	@Dependent("GL_EXT_framebuffer_object")
+	@Dependent("OpenGL30,GL_EXT_framebuffer_object")
 	void glNamedFramebufferTexture1DEXT(@GLuint int framebuffer, @GLenum int attachment, @GLenum int textarget, @GLuint int texture, int level);
 
-	@Dependent("GL_EXT_framebuffer_object")
+	@Dependent("OpenGL30,GL_EXT_framebuffer_object")
 	void glNamedFramebufferTexture2DEXT(@GLuint int framebuffer, @GLenum int attachment, @GLenum int textarget, @GLuint int texture, int level);
 
-	@Dependent("GL_EXT_framebuffer_object")
+	@Dependent("OpenGL30,GL_EXT_framebuffer_object")
 	void glNamedFramebufferTexture3DEXT(@GLuint int framebuffer, @GLenum int attachment, @GLenum int textarget, @GLuint int texture, int level, int zoffset);
 
-	@Dependent("GL_EXT_framebuffer_object")
+	@Dependent("OpenGL30,GL_EXT_framebuffer_object")
 	void glNamedFramebufferRenderbufferEXT(@GLuint int framebuffer, @GLenum int attachment, @GLenum int renderbuffertarget, @GLuint int renderbuffer);
 
-	@Dependent("GL_EXT_framebuffer_object")
+	@Dependent("OpenGL30,GL_EXT_framebuffer_object")
 	@StripPostfix("params")
 	void glGetNamedFramebufferAttachmentParameterivEXT(@GLuint int framebuffer, @GLenum int attachment, @GLenum int pname, @Check("4") @OutParameter IntBuffer params);
 
 	/*
-	EXT_framebuffer_object: New texture commands add "Texture" within
-    name and replace "enum target" with "uint texture"
+	OpenGL 3.0: New texture commands add "Texture" within name and
+    replace "enum target" with "uint texture"
 	 */
 
-	@Dependent("GL_EXT_framebuffer_object")
+	@Dependent("OpenGL30,GL_EXT_framebuffer_object")
 	void glGenerateTextureMipmapEXT(@GLuint int texture, @GLenum int target);
 
 	/*
-	EXT_framebuffer_object: New texture commands add "MultiTex" within
-    name and replace "enum target" with "enum texunit"
+	OpenGL 3.0: New texture commands add "MultiTex" within name and
+    replace "enum target" with "enum texunit"
 	 */
 
-	@Dependent("GL_EXT_framebuffer_object")
+	@Dependent("OpenGL30,GL_EXT_framebuffer_object")
 	void glGenerateMultiTexMipmapEXT(@GLenum int texunit, @GLenum int target);
 
 	/*
-	EXT_framebuffer_object: New framebuffer commands
+	OpenGL 3.0: New framebuffer commands
 	 */
 
-	@Dependent("GL_EXT_framebuffer_object")
+	@Dependent("OpenGL30,GL_EXT_framebuffer_object")
 	void glFramebufferDrawBufferEXT(@GLuint int framebuffer, @GLenum int mode);
 
-	@Dependent("GL_EXT_framebuffer_object")
+	@Dependent("OpenGL30,GL_EXT_framebuffer_object")
 	void glFramebufferDrawBuffersEXT(@GLuint int framebuffer, @AutoSize("bufs") @GLsizei int n, @Const @GLenum IntBuffer bufs);
 
-	@Dependent("GL_EXT_framebuffer_object")
+	@Dependent("OpenGL30,GL_EXT_framebuffer_object")
 	void glFramebufferReadBufferEXT(@GLuint int framebuffer, @GLenum int mode);
 
 	/*
-	EXT_framebuffer_object: New framebuffer query
+	OpenGL 3.0: New framebuffer query
 	 */
 
-	@Dependent("GL_EXT_framebuffer_object")
+	@Dependent("OpenGL30,GL_EXT_framebuffer_object")
 	@StripPostfix("param")
 	void glGetFramebufferParameterivEXT(@GLuint int framebuffer, @GLenum int pname, @Check("4") @OutParameter IntBuffer param);
 
 	/*
-	EXT_geometry_shader4 or NV_gpu_program4: New framebuffer commands
+	OpenGL 3.1: New buffer data copy command
+	 */
+
+	@Dependent("OpenGL31,GL_ARB_copy_buffer")
+	void glNamedCopyBufferSubDataEXT(@GLuint int readBuffer, @GLuint int writeBuffer, @GLintptr long readoffset, @GLintptr long writeoffset, @GLsizeiptr long size);
+
+	/*
+	EXT_geometry_shader4 or NV_geometry_program4: New framebuffer commands
     add "Named" prefix to name and replace "enum target" with "uint
     framebuffer"
 	 */
 
-	@Dependent("GL_EXT_geometry_shader4")
+	@Dependent("GL_EXT_geometry_shader4,NV_geometry_program4")
 	void glNamedFramebufferTextureEXT(@GLuint int framebuffer, @GLenum int attachment, @GLuint int texture, int level);
 
-	@Dependent("GL_EXT_geometry_shader4")
+	@Dependent("GL_EXT_geometry_shader4,NV_geometry_program4")
 	void glNamedFramebufferTextureLayerEXT(@GLuint int framebuffer, @GLenum int attachment, @GLuint int texture, int level, int layer);
 
-	@Dependent("GL_EXT_geometry_shader4")
+	@Dependent("GL_EXT_geometry_shader4,NV_geometry_program4")
 	void glNamedFramebufferTextureFaceEXT(@GLuint int framebuffer, @GLenum int attachment, @GLuint int texture, int level, @GLenum int face);
 
 	/*
@@ -1138,4 +1186,109 @@
 	@Dependent("GL_NV_explicit_multisample")
 	void glMultiTexRenderbufferEXT(@GLenum int texunit, @GLenum int target, @GLuint int renderbuffer);
 
+	/*
+	OpenGL 3.0: New vertex array specification commands for vertex
+	array objects prefix "VertexArray", add initial "uint vaobj" and
+	"uint buffer" parameters, change "Pointer" suffix to "Offset",
+	and change the final parameter from "const void *" to "intptr offset"
+	 */
+
+	@Dependent("OpenGL30")
+	@DeprecatedGL
+	void glVertexArrayVertexOffsetEXT(@GLuint int vaobj, @GLuint int buffer, int size, @GLenum int type, @GLsizei int stride, @GLintptr long offset);
+
+	@Dependent("OpenGL30")
+	@DeprecatedGL
+	void glVertexArrayColorOffsetEXT(@GLuint int vaobj, @GLuint int buffer, int size, @GLenum int type, @GLsizei int stride, @GLintptr long offset);
+
+	@Dependent("OpenGL30")
+	@DeprecatedGL
+	void glVertexArrayEdgeFlagOffsetEXT(@GLuint int vaobj, @GLuint int buffer, @GLsizei int stride, @GLintptr long offset);
+
+	@Dependent("OpenGL30")
+	void glVertexArrayIndexOffsetEXT(@GLuint int vaobj, @GLuint int buffer, @GLenum int type, @GLsizei int stride, @GLintptr long offset);
+
+	@Dependent("OpenGL30")
+	@DeprecatedGL
+	void glVertexArrayNormalOffsetEXT(@GLuint int vaobj, @GLuint int buffer, @GLenum int type, @GLsizei int stride, @GLintptr long offset);
+
+	@Dependent("OpenGL30")
+	@DeprecatedGL
+	void glVertexArrayTexCoordOffsetEXT(@GLuint int vaobj, @GLuint int buffer, int size, @GLenum int type, @GLsizei int stride, @GLintptr long offset);
+
+	@Dependent("OpenGL30")
+	@DeprecatedGL
+	void glVertexArrayMultiTexCoordOffsetEXT(@GLuint int vaobj, @GLuint int buffer, @GLenum int texunit, int size, @GLenum int type, @GLsizei int stride, @GLintptr long offset);
+
+	@Dependent("OpenGL30")
+	@DeprecatedGL
+	void glVertexArrayFogCoordOffsetEXT(@GLuint int vaobj, @GLuint int buffer, @GLenum int type, @GLsizei int stride, @GLintptr long offset);
+
+	@Dependent("OpenGL30")
+	@DeprecatedGL
+	void glVertexArraySecondaryColorOffsetEXT(@GLuint int vaobj, @GLuint int buffer, int size, @GLenum int type, @GLsizei int stride, @GLintptr long offset);
+
+	@Dependent("OpenGL30")
+	void glVertexArrayVertexAttribOffsetEXT(@GLuint int vaobj, @GLuint int buffer, @GLuint int index, int size, @GLenum int type, boolean normalized, @GLsizei int stride, @GLintptr long offset);
+
+	@Dependent("OpenGL30")
+	void glVertexArrayVertexAttribIOffsetEXT(@GLuint int vaobj, @GLuint int buffer, @GLuint int index, int size, @GLenum int type, @GLsizei int stride, @GLintptr long offset);
+
+	/*
+	OpenGL 3.0: New vertex array enable commands for vertex array
+	objects change "ClientState" to "VertexArray" and add an initial
+	"uint vaobj" parameter
+	 */
+
+	@Dependent("OpenGL30")
+	void glEnableVertexArrayEXT(@GLuint int vaobj, @GLenum int array);
+
+	@Dependent("OpenGL30")
+	void glDisableVertexArrayEXT(@GLuint int vaobj, @GLenum int array);
+
+	/*
+	OpenGL 3.0: New vertex attrib array enable commands for vertex
+	array objects change "VertexAttribArray" to "VertexArrayAttrib"
+	and add an initial "uint vaobj" parameter
+	 */
+
+	@Dependent("OpenGL30")
+	void glEnableVertexArrayAttribEXT(@GLuint int vaobj, @GLuint int index);
+
+	@Dependent("OpenGL30")
+	void glDisableVertexArrayAttribEXT(@GLuint int vaobj, @GLuint int index);
+
+	/*
+	OpenGL 3.0: New queries for vertex array objects
+	 */
+
+	@Dependent("OpenGL30")
+	@StripPostfix("param")
+	void glGetVertexArrayIntegervEXT(@GLuint int vaobj, @GLenum int pname, @OutParameter @Check("16") IntBuffer param);
+
+	@Dependent("OpenGL30")
+	@StripPostfix("param")
+	void glGetVertexArrayPointervEXT(@GLuint int vaobj, @GLenum int pname, @Result @GLvoid ByteBuffer param);
+
+	@Dependent("OpenGL30")
+	@StripPostfix(value = "param", hasPostfix = false)
+	void glGetVertexArrayIntegeri_vEXT(@GLuint int vaobj, @GLuint int index, @GLenum int pname, @OutParameter @Check("16") IntBuffer param);
+
+	@Dependent("OpenGL30")
+	@StripPostfix(value = "param", hasPostfix = false)
+	void glGetVertexArrayPointeri_vEXT(@GLuint int vaobj, @GLuint int index, @GLenum int pname, @Result @GLvoid ByteBuffer param);
+
+	/*
+	OpenGL 3.0: New buffer commands replace "Buffer" with "NamedBuffer"
+	in name and replace "enum target" parameter with "uint buffer"
+	 */
+
+	@Dependent("OpenGL30")
+	@CachedResult
+	@GLvoid
+	ByteBuffer glMapNamedBufferRangeEXT(@GLuint int buffer, @GLintptr long offset, @GLsizeiptr long length, @GLbitfield int access);
+
+	@Dependent("OpenGL30")
+	void glFlushMappedNamedBufferRangeEXT(@GLuint int buffer, @GLintptr long offset, @GLsizeiptr long length);
+
 }
\ No newline at end of file

Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/GL30.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/GL30.java	2009-11-26 22:44:17 UTC (rev 3255)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/GL30.java	2009-12-01 03:37:27 UTC (rev 3256)
@@ -725,7 +725,7 @@
 
 	void glColorMaski(@GLuint int buf, boolean r, boolean g, boolean b, boolean a);
 
-	@StripPostfix("data")
+	@StripPostfix(value = "data", hasPostfix = false)
 	void glGetBooleani_v(@GLenum int value, @GLuint int index, @OutParameter @Check("4") @GLboolean ByteBuffer data);
 
 	@StripPostfix("data")

Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/GL32.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/GL32.java	2009-11-26 22:44:17 UTC (rev 3255)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/GL32.java	2009-12-01 03:37:27 UTC (rev 3256)
@@ -304,9 +304,13 @@
 
 	void glWaitSync(@GLpointer("GLsync") GLSync sync, @GLbitfield int flags, @GLuint64 long timeout);
 
-	@StripPostfix("params")
-	void glGetInteger64v(@GLenum int pname, @OutParameter @Check("1") @GLint64 LongBuffer params);
+	@StripPostfix(value = "data", postfix = "64")
+	void glGetInteger64v(@GLenum int pname, @OutParameter @Check("1") @GLint64 LongBuffer data);
 
+	@StripPostfix(value = "data", postfix = "64")
+	void glGetInteger64i_v(@GLenum int value, @GLuint int index, @OutParameter @Check("4") @GLint64 LongBuffer data);
+
+	@StripPostfix("values")
 	void glGetSynciv(@GLpointer("GLsync") GLSync sync, @GLenum int pname,
 	                 @AutoSize("values") @GLsizei int bufSize,
 	                 @OutParameter @GLsizei @Check(value = "1", canBeNull = true) IntBuffer length,

Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_geometry_program4.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_geometry_program4.java	2009-11-26 22:44:17 UTC (rev 3255)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_geometry_program4.java	2009-12-01 03:37:27 UTC (rev 3256)
@@ -53,4 +53,6 @@
 
 	void glFramebufferTextureLayerEXT(@GLenum int target, @GLenum int attachment, @GLuint int texture, int level, int layer);
 
+	void glFramebufferTextureFaceEXT(@GLenum int target, @GLenum int attachment, @GLuint int texture, int level, @GLenum int face);
+
 }
\ No newline at end of file


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.