From 39ddf26f0b18d67824647ef4f55342fb0bb388f8 Mon Sep 17 00:00:00 2001 From: Elias Naur Date: Fri, 25 Jul 2003 14:23:12 +0000 Subject: [PATCH] Added missing OpenGL 1.4 functions --- src/java/org/lwjgl/opengl/CoreGL14.java | 23 +++ .../org/lwjgl/opengl/CoreGL14Constants.java | 39 ++++ src/native/common/org_lwjgl_opengl_CoreGL14.h | 184 ++++++++++++++++++ 3 files changed, 246 insertions(+) diff --git a/src/java/org/lwjgl/opengl/CoreGL14.java b/src/java/org/lwjgl/opengl/CoreGL14.java index 90fb81c3..8d935f6c 100644 --- a/src/java/org/lwjgl/opengl/CoreGL14.java +++ b/src/java/org/lwjgl/opengl/CoreGL14.java @@ -48,8 +48,31 @@ import java.nio.Buffer; * @version $Revision: 1.23 $ */ public class CoreGL14 extends CoreGL13 implements CoreGL14Constants { + public static native void glFogCoordf (float coord); + public static native void glFogCoordd (double coord); + public static native void glFogCoordPointer (int type, int stride, Buffer data); public static native void glMultiDrawArrays(int mode, IntBuffer piFirst, IntBuffer piCount, int primcount); /* public static native void glMultiDrawElements(int mode, int piCount, int type, int pIndices, int primcount);*/ + public static native void glPointParameterf (int pname, float param); + public static native void glPointParameterfv (int pname, FloatBuffer params); + public static native void glSecondaryColor3b (byte red, byte green, byte blue); + public static native void glSecondaryColor3d (double red, double green, double blue); + public static native void glSecondaryColor3f (float red, float green, float blue); + public static native void glSecondaryColor3i (int red, int green, int blue); + public static native void glSecondaryColor3s (short red, short green, short blue); + public static native void glSecondaryColor3ub (byte red, byte green, byte blue); + public static native void glSecondaryColor3ui (int red, int green, int blue); + public static native void glSecondaryColor3us (short red, short green, short blue); + public static native void glSecondaryColorPointer (int size, int type, int stride, Buffer data); + public static native void glBlendFuncSeparate (int sfactorRGB, int dfactorRGB, int sfactorAlpha, int dfactorAlpha); + public static native void glWindowPos2d (double x, double y); + public static native void glWindowPos2f (float x, float y); + public static native void glWindowPos2i (int x, int y); + public static native void glWindowPos2s (short x, short y); + public static native void glWindowPos3d (double x, double y, double z); + public static native void glWindowPos3f (float x, float y, float z); + public static native void glWindowPos3i (int x, int y, int z); + public static native void glWindowPos3s (short x, short y, short z); } diff --git a/src/java/org/lwjgl/opengl/CoreGL14Constants.java b/src/java/org/lwjgl/opengl/CoreGL14Constants.java index 0d6d1d95..dd4803c7 100644 --- a/src/java/org/lwjgl/opengl/CoreGL14Constants.java +++ b/src/java/org/lwjgl/opengl/CoreGL14Constants.java @@ -41,4 +41,43 @@ package org.lwjgl.opengl; * @version $Revision$ */ public interface CoreGL14Constants extends CoreGL13Constants { + public static final int GL_GENERATE_MIPMAP = 0x8191; + public static final int GL_GENERATE_MIPMAP_HINT = 0x8192; + public static final int GL_DEPTH_COMPONENT16 = 0x81A5; + public static final int GL_DEPTH_COMPONENT24 = 0x81A6; + public static final int GL_DEPTH_COMPONENT32 = 0x81A7; + public static final int GL_TEXTURE_DEPTH_SIZE = 0x884A; + public static final int GL_DEPTH_TEXTURE_MODE = 0x884B; + public static final int GL_TEXTURE_COMPARE_MODE = 0x884C; + public static final int GL_TEXTURE_COMPARE_FUNC = 0x884D; + public static final int GL_COMPARE_R_TO_TEXTURE = 0x884E; + public static final int GL_FOG_COORDINATE_SOURCE = 0x8450; + public static final int GL_FOG_COORDINATE = 0x8451; + public static final int GL_FRAGMENT_DEPTH = 0x8452; + public static final int GL_CURRENT_FOG_COORDINATE = 0x8453; + public static final int GL_FOG_COORDINATE_ARRAY_TYPE = 0x8454; + public static final int GL_FOG_COORDINATE_ARRAY_STRIDE = 0x8455; + public static final int GL_FOG_COORDINATE_ARRAY_POINTER = 0x8456; + public static final int GL_FOG_COORDINATE_ARRAY = 0x8457; + public static final int GL_POINT_SIZE_MIN = 0x8126; + public static final int GL_POINT_SIZE_MAX = 0x8127; + public static final int GL_POINT_FADE_THRESHOLD_SIZE = 0x8128; + public static final int GL_POINT_DISTANCE_ATTENUATION = 0x8129; + public static final int GL_COLOR_SUM = 0x8458; + public static final int GL_CURRENT_SECONDARY_COLOR = 0x8459; + public static final int GL_SECONDARY_COLOR_ARRAY_SIZE = 0x845A; + public static final int GL_SECONDARY_COLOR_ARRAY_TYPE = 0x845B; + public static final int GL_SECONDARY_COLOR_ARRAY_STRIDE = 0x845C; + public static final int GL_SECONDARY_COLOR_ARRAY_POINTER = 0x845D; + public static final int GL_SECONDARY_COLOR_ARRAY = 0x845E; + public static final int GL_BLEND_DST_RGB = 0x80C8; + public static final int GL_BLEND_SRC_RGB = 0x80C9; + public static final int GL_BLEND_DST_ALPHA = 0x80CA; + public static final int GL_BLEND_SRC_ALPHA = 0x80CB; + public static final int GL_INCR_WRAP = 0x8507; + public static final int GL_DECR_WRAP = 0x8508; + public static final int GL_TEXTURE_FILTER_CONTROL = 0x8500; + public static final int GL_TEXTURE_LOD_BIAS = 0x8501; + public static final int GL_MAX_TEXTURE_LOD_BIAS = 0x84FD; + public static final int GL_GL_MIRRORED_REPEAT = 0x8370; } diff --git a/src/native/common/org_lwjgl_opengl_CoreGL14.h b/src/native/common/org_lwjgl_opengl_CoreGL14.h index 51f4972e..fb28d177 100644 --- a/src/native/common/org_lwjgl_opengl_CoreGL14.h +++ b/src/native/common/org_lwjgl_opengl_CoreGL14.h @@ -7,6 +7,30 @@ #ifdef __cplusplus extern "C" { #endif +/* + * Class: org_lwjgl_opengl_CoreGL14 + * Method: glFogCoordf + * Signature: (F)V + */ +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_CoreGL14_glFogCoordf + (JNIEnv *, jclass, jfloat); + +/* + * Class: org_lwjgl_opengl_CoreGL14 + * Method: glFogCoordd + * Signature: (D)V + */ +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_CoreGL14_glFogCoordd + (JNIEnv *, jclass, jdouble); + +/* + * Class: org_lwjgl_opengl_CoreGL14 + * Method: glFogCoordPointer + * Signature: (IILjava/nio/Buffer;)V + */ +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_CoreGL14_glFogCoordPointer + (JNIEnv *, jclass, jint, jint, jobject); + /* * Class: org_lwjgl_opengl_CoreGL14 * Method: glMultiDrawArrays @@ -15,6 +39,166 @@ extern "C" { JNIEXPORT void JNICALL Java_org_lwjgl_opengl_CoreGL14_glMultiDrawArrays (JNIEnv *, jclass, jint, jobject, jobject, jint); +/* + * Class: org_lwjgl_opengl_CoreGL14 + * Method: glPointParameterf + * Signature: (IF)V + */ +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_CoreGL14_glPointParameterf + (JNIEnv *, jclass, jint, jfloat); + +/* + * Class: org_lwjgl_opengl_CoreGL14 + * Method: glPointParameterfv + * Signature: (ILjava/nio/FloatBuffer;)V + */ +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_CoreGL14_glPointParameterfv + (JNIEnv *, jclass, jint, jobject); + +/* + * Class: org_lwjgl_opengl_CoreGL14 + * Method: glSecondaryColor3b + * Signature: (BBB)V + */ +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_CoreGL14_glSecondaryColor3b + (JNIEnv *, jclass, jbyte, jbyte, jbyte); + +/* + * Class: org_lwjgl_opengl_CoreGL14 + * Method: glSecondaryColor3d + * Signature: (DDD)V + */ +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_CoreGL14_glSecondaryColor3d + (JNIEnv *, jclass, jdouble, jdouble, jdouble); + +/* + * Class: org_lwjgl_opengl_CoreGL14 + * Method: glSecondaryColor3f + * Signature: (FFF)V + */ +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_CoreGL14_glSecondaryColor3f + (JNIEnv *, jclass, jfloat, jfloat, jfloat); + +/* + * Class: org_lwjgl_opengl_CoreGL14 + * Method: glSecondaryColor3i + * Signature: (III)V + */ +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_CoreGL14_glSecondaryColor3i + (JNIEnv *, jclass, jint, jint, jint); + +/* + * Class: org_lwjgl_opengl_CoreGL14 + * Method: glSecondaryColor3s + * Signature: (SSS)V + */ +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_CoreGL14_glSecondaryColor3s + (JNIEnv *, jclass, jshort, jshort, jshort); + +/* + * Class: org_lwjgl_opengl_CoreGL14 + * Method: glSecondaryColor3ub + * Signature: (BBB)V + */ +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_CoreGL14_glSecondaryColor3ub + (JNIEnv *, jclass, jbyte, jbyte, jbyte); + +/* + * Class: org_lwjgl_opengl_CoreGL14 + * Method: glSecondaryColor3ui + * Signature: (III)V + */ +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_CoreGL14_glSecondaryColor3ui + (JNIEnv *, jclass, jint, jint, jint); + +/* + * Class: org_lwjgl_opengl_CoreGL14 + * Method: glSecondaryColor3us + * Signature: (SSS)V + */ +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_CoreGL14_glSecondaryColor3us + (JNIEnv *, jclass, jshort, jshort, jshort); + +/* + * Class: org_lwjgl_opengl_CoreGL14 + * Method: glSecondaryColorPointer + * Signature: (IIILjava/nio/Buffer;)V + */ +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_CoreGL14_glSecondaryColorPointer + (JNIEnv *, jclass, jint, jint, jint, jobject); + +/* + * Class: org_lwjgl_opengl_CoreGL14 + * Method: glBlendFuncSeparate + * Signature: (IIII)V + */ +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_CoreGL14_glBlendFuncSeparate + (JNIEnv *, jclass, jint, jint, jint, jint); + +/* + * Class: org_lwjgl_opengl_CoreGL14 + * Method: glWindowPos2d + * Signature: (DD)V + */ +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_CoreGL14_glWindowPos2d + (JNIEnv *, jclass, jdouble, jdouble); + +/* + * Class: org_lwjgl_opengl_CoreGL14 + * Method: glWindowPos2f + * Signature: (FF)V + */ +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_CoreGL14_glWindowPos2f + (JNIEnv *, jclass, jfloat, jfloat); + +/* + * Class: org_lwjgl_opengl_CoreGL14 + * Method: glWindowPos2i + * Signature: (II)V + */ +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_CoreGL14_glWindowPos2i + (JNIEnv *, jclass, jint, jint); + +/* + * Class: org_lwjgl_opengl_CoreGL14 + * Method: glWindowPos2s + * Signature: (SS)V + */ +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_CoreGL14_glWindowPos2s + (JNIEnv *, jclass, jshort, jshort); + +/* + * Class: org_lwjgl_opengl_CoreGL14 + * Method: glWindowPos3d + * Signature: (DDD)V + */ +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_CoreGL14_glWindowPos3d + (JNIEnv *, jclass, jdouble, jdouble, jdouble); + +/* + * Class: org_lwjgl_opengl_CoreGL14 + * Method: glWindowPos3f + * Signature: (FFF)V + */ +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_CoreGL14_glWindowPos3f + (JNIEnv *, jclass, jfloat, jfloat, jfloat); + +/* + * Class: org_lwjgl_opengl_CoreGL14 + * Method: glWindowPos3i + * Signature: (III)V + */ +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_CoreGL14_glWindowPos3i + (JNIEnv *, jclass, jint, jint, jint); + +/* + * Class: org_lwjgl_opengl_CoreGL14 + * Method: glWindowPos3s + * Signature: (SSS)V + */ +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_CoreGL14_glWindowPos3s + (JNIEnv *, jclass, jshort, jshort, jshort); + #ifdef __cplusplus } #endif