[Java-game-lib-cvs] CVS: LWJGL/src/native/common org_lwjgl_opengl_GLU.cpp,1.2,1.3 org_lwjgl_opengl_GLU.h,1.4,1.5

[Luke H. <lh...@us...>]

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

Modified Files:
	org_lwjgl_opengl_GLU.cpp org_lwjgl_opengl_GLU.h 
Log Message:

GLU: added quadricCallback(...) methods

GLUQuadricCallbacks: Should now be fully implemented

removed files:
See the README.txt file for more information.


Index: org_lwjgl_opengl_GLU.cpp
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/common/org_lwjgl_opengl_GLU.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/org_lwjgl_opengl_GLU.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- org_lwjgl_opengl_GLU.cpp	27 Nov 2002 05:54:27 -0000	1.2
+++ org_lwjgl_opengl_GLU.cpp	30 Nov 2002 03:28:30 -0000	1.3
@@ -48,6 +48,8 @@
 #include "checkGLerror.h"
 #include "GL/glu.h"
 
+#include "callbacks/GLUQuadricCallbacks.h"
+
 /*
  * Class:     org_lwjgl_opengl_GLU
  * Method:    getString
@@ -272,6 +274,34 @@
   (JNIEnv * env, jobject obj, jint quad, jdouble radius, jint slices, jint stacks)
 {
     gluSphere((GLUquadricObj *) quad, (GLdouble) radius, (GLint) slices, (GLint) stacks);
+    CHECK_GL_ERROR
+}
+
+/*
+ * Class:     org_lwjgl_opengl_GLU
+ * Method:    quadricCallback
+ * Signature: (IILjava/lang/String;)V
+ */
+JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GLU_quadricCallback__IILjava_lang_String_2
+  (JNIEnv * env, jobject obj, jint quad, jint type, jstring method)
+{
+    GLUQuadricCallbacks::set(quad, 
+                             new JavaMethod(env, obj, env->GetStringUTFChars(method, 0)),
+                             type);
+    CHECK_GL_ERROR  
+}
+
+/*
+ * Class:     org_lwjgl_opengl_GLU
+ * Method:    quadricCallback
+ * Signature: (IILjava/lang/Object;Ljava/lang/String;)V
+ */
+JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GLU_quadricCallback__IILjava_lang_Object_2Ljava_lang_String_2
+  (JNIEnv * env, jobject obj, jint quad, jint type, jobject target, jstring method)
+{
+    GLUQuadricCallbacks::set(quad, 
+                             new JavaMethod(env, target, env->GetStringUTFChars(method, 0)),
+                             type);
     CHECK_GL_ERROR
 }
 

Index: org_lwjgl_opengl_GLU.h
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/common/org_lwjgl_opengl_GLU.h
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/org_lwjgl_opengl_GLU.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- org_lwjgl_opengl_GLU.h	27 Nov 2002 06:28:02 -0000	1.4
+++ org_lwjgl_opengl_GLU.h	30 Nov 2002 03:28:30 -0000	1.5
@@ -175,6 +175,22 @@
 JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GLU_sphere
   (JNIEnv *, jobject, jint, jdouble, jint, jint);
 
+/*
+ * Class:     org_lwjgl_opengl_GLU
+ * Method:    quadricCallback
+ * Signature: (IILjava/lang/String;)V
+ */
+JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GLU_quadricCallback__IILjava_lang_String_2
+  (JNIEnv *, jobject, jint, jint, jstring);
+
+/*
+ * Class:     org_lwjgl_opengl_GLU
+ * Method:    quadricCallback
+ * Signature: (IILjava/lang/Object;Ljava/lang/String;)V
+ */
+JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GLU_quadricCallback__IILjava_lang_Object_2Ljava_lang_String_2
+  (JNIEnv *, jobject, jint, jint, jobject, jstring);
+
 #ifdef __cplusplus
 }
 #endif