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

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

Removed Files:
	Makefile.elias_naur 
Log Message:
Removed Makefile.elias_naur

--- Makefile.elias_naur DELETED ---
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/linux/Makefile.elias_naur

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

Modified Files:
	autogen.sh configure.in 
Log Message:

ac*.m4 files are no longer in cvs


Index: autogen.sh
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/autogen.sh
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/autogen.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- autogen.sh	29 Nov 2002 08:29:53 -0000	1.2
+++ autogen.sh	30 Nov 2002 21:36:12 -0000	1.3
@@ -2,7 +2,6 @@
 #WANT_AUTOMAKE_1_5=1
 
 autoheader linux
-mv aclocal.m4 acinclude.m4
 aclocal
 automake --foreign --include-deps --add-missing --copy
 autoconf

Index: configure.in
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/configure.in
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/configure.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- configure.in	30 Nov 2002 00:19:59 -0000	1.4
+++ configure.in	30 Nov 2002 21:36:12 -0000	1.5
@@ -1,5 +1,5 @@
 dnl Process this file with autoconf to produce a configure script.
-AC_INIT(acinclude.m4)
+AC_INIT(dummy.cpp)
 
 dnl These should be changed =)
 LWJGL_MAJOR_VERSION=0

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

Removed Files:
	acinclude.m4 aclocal.m4 stamp-h.in 
Log Message:

Files are automatically generated


--- acinclude.m4 DELETED ---
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/acinclude.m4

--- aclocal.m4 DELETED ---
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/aclocal.m4

--- stamp-h.in DELETED ---
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/stamp-h.in

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

Modified Files:
	acinclude.m4 aclocal.m4 
Log Message:
Added the XWarpointer call again - this time centering the pointer

Index: acinclude.m4
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/acinclude.m4
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/acinclude.m4,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- acinclude.m4	30 Nov 2002 03:28:29 -0000	1.4
+++ acinclude.m4	30 Nov 2002 21:25:00 -0000	1.5
@@ -1,3 +1,28 @@
+# aclocal.m4 generated automatically by aclocal 1.6.3 -*- Autoconf -*-
+
+# Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002
+# Free Software Foundation, Inc.
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+dnl aclocal.m4 generated automatically by aclocal 1.4-p5
+
+dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl This program is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+dnl PARTICULAR PURPOSE.
+
 dnl aclocal.m4 generated automatically by aclocal 1.4-p5
 
 dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
@@ -3651,10 +3676,15 @@
 # This is just to silence aclocal about the macro not being used
 ifelse([AC_DISABLE_FAST_INSTALL])
 
+<<<<<<< aclocal.m4
 
+=======
 
 
 
 
 
 
+
+
+>>>>>>> 1.5

Index: aclocal.m4
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/aclocal.m4
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/aclocal.m4,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- aclocal.m4	30 Nov 2002 03:28:30 -0000	1.5
+++ aclocal.m4	30 Nov 2002 21:25:00 -0000	1.6
@@ -1,3 +1,29 @@
+# aclocal.m4 generated automatically by aclocal 1.6.3 -*- Autoconf -*-
+
+# Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002
+# Free Software Foundation, Inc.
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+# aclocal.m4 generated automatically by aclocal 1.6.3 -*- Autoconf -*-
+
+# Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002
+# Free Software Foundation, Inc.
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
 dnl aclocal.m4 generated automatically by aclocal 1.4-p5
 
 dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
@@ -3663,11 +3689,16 @@
 # This is just to silence aclocal about the macro not being used
 ifelse([AC_DISABLE_FAST_INSTALL])
 
+<<<<<<< aclocal.m4
 
+=======
 
 
 
 
 
 
+
+
+>>>>>>> 1.5
 

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

Modified Files:
	org_lwjgl_input_Mouse.cpp 
Log Message:
Added the XWarpointer call again - this time centering the pointer

Index: org_lwjgl_input_Mouse.cpp
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/linux/org_lwjgl_input_Mouse.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/linux/org_lwjgl_input_Mouse.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- org_lwjgl_input_Mouse.cpp	29 Nov 2002 11:51:10 -0000	1.8
+++ org_lwjgl_input_Mouse.cpp	30 Nov 2002 21:25:00 -0000	1.9
@@ -133,6 +133,7 @@
 	int mask = EnterWindowMask | LeaveWindowMask | PointerMotionMask | ButtonPressMask | ButtonReleaseMask;
 	if (current_fullscreen) {
 		result = XGrabPointer(disp, win, False, mask, GrabModeAsync, GrabModeAsync, win, blank_cursor, CurrentTime);
+		XWarpPointer(disp, None, win, 0, 0, 0, 0, current_x, current_y);
 		XF86VidModeSetViewPort(disp, screen, 0, 0); // make sure we have a centered window
 	} else
 		result = XGrabPointer(disp, win, False, mask, GrabModeAsync, GrabModeAsync, None, blank_cursor, CurrentTime);

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

Modified Files:
	README.txt 
Log Message:

added GLUQuadricCallbacks::clear(); to quadricDelete


Index: README.txt
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/common/callbacks/README.txt
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/callbacks/README.txt,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- README.txt	30 Nov 2002 03:32:50 -0000	1.9
+++ README.txt	30 Nov 2002 03:40:47 -0000	1.10
@@ -49,6 +49,19 @@
 }
 
 
+/*
+ * Class:     org_lwjgl_opengl_GLU
+ * Method:    deleteQuadric
+ */
+JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GLU_deleteQuadric(JNIEnv * env, jobject obj, jint quad) 
+{
+    gluDeleteQuadric((GLUquadricObj *) quad);
+    GLUQuadricCallbacks::clear();
+    CHECK_GL_ERROR
+}
+
+
+
 and call it from java:
 
 /* myquadric is a reference to a GLUquadricObj returned by glu.newQuadric()

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

Modified Files:
	org_lwjgl_opengl_GLU.cpp 
Log Message:

added GLUQuadricCallbacks::clear(); to quadricDelete


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.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- org_lwjgl_opengl_GLU.cpp	30 Nov 2002 03:28:30 -0000	1.3
+++ org_lwjgl_opengl_GLU.cpp	30 Nov 2002 03:40:47 -0000	1.4
@@ -195,6 +195,7 @@
 JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GLU_deleteQuadric(JNIEnv * env, jobject obj, jint quad) 
 {
     gluDeleteQuadric((GLUquadricObj *) quad);
+    GLUQuadricCallbacks::clear();
     CHECK_GL_ERROR
 }
 

Update of /cvsroot/java-game-lib/LWJGL/examples
In directory sc8-pr-cvs1:/tmp/cvs-serv15966

Modified Files:
	Quadrics.java 
Log Message:

Added a quadric callback for GLU.ERROR


Index: Quadrics.java
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/examples/Quadrics.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/examples/Quadrics.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Quadrics.java	27 Nov 2002 22:28:11 -0000	1.2
+++ Quadrics.java	30 Nov 2002 03:35:40 -0000	1.3
@@ -153,6 +153,10 @@
         }
     }
     
+    public void quadricError(int type) {
+        System.out.println("Recieved a quadric error! :"+ type);
+    }
+    
     protected void initGL() throws Exception{    
         /* Jump To Texture Loading Routine */
         try {
@@ -162,6 +166,8 @@
             quadric = glu.newQuadric();
             glu.quadricNormals(quadric, GLU.SMOOTH);
             glu.quadricTexture(quadric, true);
+            
+            glu.quadricCallback(quadric, GLU.ERROR, "quadricError");
         }
         catch (Exception e) {
             throw new Exception("Problem initialising GL", e);

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

Removed Files:
	JavaMethod.cpp 
Log Message:

moved everything to header


--- JavaMethod.cpp DELETED ---
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/common/callbacks/JavaMethod.cpp

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

Modified Files:
	README.txt 
Log Message:


Index: README.txt
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/common/callbacks/README.txt
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/callbacks/README.txt,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- README.txt	30 Nov 2002 03:28:30 -0000	1.8
+++ README.txt	30 Nov 2002 03:32:50 -0000	1.9
@@ -1,6 +1,6 @@
 This is just the start of my callback implementation.
 
-Unfortunatly, you cant pass a non static method as an object pointer...
+Unfortunatly, you cant pass a non static method as a function pointer...
 So we can only have callbacks for a single GLU object. However, 
 according to the OpenGL redbook... this should not be an issue. For example
 the redbook states that, a single tess object should be used for an 
@@ -16,7 +16,7 @@
 Of course callbacks for other object types should be easy to do using this framework.
 
 
-Note quite as elegent as I wanted, but it works.
+Note as elegent as I wanted, but it works.
 
 You would write a callback like this:
 

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

Modified Files:
	GLUQuadricCallbacks.cpp GLUQuadricCallbacks.h JavaMethod.h 
	Makefile.am README.txt 
Removed Files:
	CallbackContainer.cpp CallbackContainer.h CallbackManager.cpp 
	CallbackManager.h 
Log Message:

GLU: added quadricCallback(...) methods

GLUQuadricCallbacks: Should now be fully implemented

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


Index: GLUQuadricCallbacks.cpp
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/common/callbacks/GLUQuadricCallbacks.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/callbacks/GLUQuadricCallbacks.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- GLUQuadricCallbacks.cpp	30 Nov 2002 00:19:59 -0000	1.2
+++ GLUQuadricCallbacks.cpp	30 Nov 2002 03:28:30 -0000	1.3
@@ -7,13 +7,13 @@
 
 #include "GLUQuadricCallbacks.h"
 
+JavaMethod* GLUQuadricCallbacks::errorCallback;
+
 //
 // Constructor
 ///
-GLUQuadricCallbacks::GLUQuadricCallbacks(GLUquadricObj *quad):
-    CallbackContainer()
+GLUQuadricCallbacks::GLUQuadricCallbacks()
 {
-        quadric = quad;
         errorCallback = NULL;
 }
 
@@ -22,38 +22,58 @@
 //
 GLUQuadricCallbacks::~GLUQuadricCallbacks()
 {
+    clear();
+}
+
+void GLUQuadricCallbacks::clear() {
     if (errorCallback != NULL) {
         delete errorCallback;
-    }
+    }   
 }
 
 typedef void (GLAPIENTRY *callback_t)();
 
-
-/* having a couple issues. I cant use a pointer to a method as a function pointer? */
-
-void GLUQuadricCallbacks::add(JavaMethod *cb, GLenum type)
-{
-    /* If we are already refering to a callback, get rid of it */
-    if (errorCallback != NULL) {
-        delete errorCallback;
-    }
-    
+void GLUQuadricCallbacks::set(jint globj, JavaMethod* cb, jint type)
+{   
     switch (type) {
         case GLU_ERROR:
-            errorCallback = cb;
-//            gluQuadricCallback(quadric, type, (callback_t) this->gluError);
+            /* If we are already refering to a callback, get rid of it */
+            if (errorCallback != NULL) {
+                delete errorCallback;
+            }
+            if (cb == NULL) {
+                gluQuadricCallback((GLUquadricObj *) globj, 
+                                   (GLenum) type, 
+                                   NULL);                
+            }
+            else {
+                errorCallback = cb;
+                gluQuadricCallback((GLUquadricObj *) globj, 
+                                   (GLenum) type, 
+                                   (callback_t) GLUQuadricCallbacks::gluError);
+            }
             break;
     }
 }
 
 void CALLBACK GLUQuadricCallbacks::gluError(GLenum type) {
 
-//    jclass cls = (*errorCallback->env)->GetObjectClass(errorCallback->env, errorCallback->obj);
-//    jmethodID mid = (*errorCallback->env)->getMethodID(errorCallback->env, cls, errorCallback->method.c_str());
-//    if (mid == 0) {
-//        return;
-//    }
-//    /* Hopefully this will end up calling the java method for handling GLU_ERROR for this quad */
-//    (*errorCallback->env)->CallVoidMethod(errorCallback->env, errorCallback->obj, mid, (jint) type);
+    if (errorCallback == NULL) {
+        return;
+    }
+    
+    JNIEnv * env = errorCallback->env;
+    jobject obj = errorCallback->obj;
+    
+    jclass cls = (jclass) env->GetObjectClass(obj);
+    
+    jmethodID mid = env->GetMethodID(cls, 
+                                     errorCallback->method.c_str(),
+                                     "(I)V");
+    
+    if (mid == 0) {
+        return;
+    }
+    /* Hopefully this will end up calling the java method for handling GLU_ERROR for this quad */
+    env->CallVoidMethod(obj, mid, (jint) type);
 }

Index: GLUQuadricCallbacks.h
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/common/callbacks/GLUQuadricCallbacks.h
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/callbacks/GLUQuadricCallbacks.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- GLUQuadricCallbacks.h	30 Nov 2002 00:19:59 -0000	1.2
+++ GLUQuadricCallbacks.h	30 Nov 2002 03:28:30 -0000	1.3
@@ -14,26 +14,24 @@
 #include <stdio.h>
 
 #include "JavaMethod.h"
-#include "CallbackContainer.h"
 
 #ifndef CALLBACK
 #define CALLBACK
 #endif
 
 
-class GLUQuadricCallbacks : public CallbackContainer {
+class GLUQuadricCallbacks {
 public:
-	GLUQuadricCallbacks(GLUquadricObj *quad);
+	GLUQuadricCallbacks();
 	~GLUQuadricCallbacks();
-        void add(JavaMethod*, GLenum);
         
-        void CALLBACK gluError(GLenum);
+        static void CALLBACK gluError(GLenum);
+        static void set(jint, JavaMethod*, jint);
+        static void clear();
 protected:
 
 private:
-        JavaMethod* errorCallback;
-        GLUquadricObj* quadric;
+        static JavaMethod* errorCallback;
 };
-
 #endif	/* _GLUQuadricCallbacks_H */
 

Index: JavaMethod.h
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/common/callbacks/JavaMethod.h
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/callbacks/JavaMethod.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- JavaMethod.h	30 Nov 2002 00:19:59 -0000	1.2
+++ JavaMethod.h	30 Nov 2002 03:28:30 -0000	1.3
@@ -12,12 +12,20 @@
 
 class JavaMethod {
 public:
-	JavaMethod(JNIEnv *, jobject, std::string);
-	~JavaMethod();
+    JavaMethod(JNIEnv *newEnv, jobject newObj, std::string newMethod)
+    {
+        env = newEnv;
+        obj = newObj;
+        method = newMethod;
+    }
+    ~JavaMethod()
+    {
         
-        JNIEnv* env;
-        jobject obj;
-        std::string method;
+    }
+        
+    JNIEnv* env;
+    jobject obj;
+    std::string method;
 protected:
 
 private:

Index: Makefile.am
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/common/callbacks/Makefile.am
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/callbacks/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Makefile.am	30 Nov 2002 00:19:59 -0000	1.1
+++ Makefile.am	30 Nov 2002 03:28:30 -0000	1.2
@@ -6,11 +6,6 @@
 INCLUDES = -I../
 
 COMMON = \
-  CallbackContainer.cpp \
-  CallbackContainer.h \
-  CallbackManager.cpp \
-  CallbackManager.h \
-  JavaMethod.cpp \
   JavaMethod.h
   
 CALLBACKS = \

Index: README.txt
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/common/callbacks/README.txt
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/callbacks/README.txt,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- README.txt	30 Nov 2002 00:19:59 -0000	1.7
+++ README.txt	30 Nov 2002 03:28:30 -0000	1.8
@@ -1,45 +1,62 @@
 This is just the start of my callback implementation.
 
-Basically... we have 3 main classes...
+Unfortunatly, you cant pass a non static method as an object pointer...
+So we can only have callbacks for a single GLU object. However, 
+according to the OpenGL redbook... this should not be an issue. For example
+the redbook states that, a single tess object should be used for an 
+entire program... and reused for each tessleation.
 
-CallbackManager, which maintains a mapping of objects to callback containers
-CallbackContainer, the base class which we extend to implement callbacks for specific objects
-JavaMethod, which is a data object that contains information on the method to call.
+The implementation:
 
-GLUQuadricCallbacks is a CallbackContainer for working with quadric callbacks
-eventually you can expect containers to callbacks for glu nurbs and glu tesselators.
+JavaMethod: a data object that contains information on the method to call.
+
+GLUQuadricCallbacks: a class for working with quadric callbacks
+
+eventually you can expect callbacks for glu nurbs and glu tesselators.
 Of course callbacks for other object types should be easy to do using this framework.
 
 
-Eventually... to add a callback you would do things like:
+Note quite as elegent as I wanted, but it works.
 
-/* quad is the reference to our GLUquadricObj
- * type is one of the error types specified by gluQuadricCallback
- * method is the name of the java method to call */
-JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GLU_quadricCallback
-  (JNIEnv * env, jobject obj, jint quad, jint type, jint method) {
-    /* if this quad has no callback container, make one */
-    if (CallbackManager.get(quad) == null) {
-        CallbackManager.put(quad, new GLUQuadricCallbacks((GLUquadricObj *) quad);
-    }
+You would write a callback like this:
 
-    /* get the callback container for this quad */
-    ((GLUQuadricCallbacks *) CallbackManager.get(quad))->add(new JavaMethod(env, obj, (char*) method), (GLenum) type);
+/*
+ * 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  
 }
 
-JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GLU_deleteQuadric
-  (JNIEnv * env, jobject obj, jint quad) {
-    /* Delete the quadric from memory */
-    gluDeleteQuadric((GLUquadricObj *) quad);
-
-    /* delete any callbacks we assigned to the quadric */
-    CallbackManager.del(quad);
+/*
+ * 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
 }
 
 
-then from java:
+and call it from java:
 
 /* myquadric is a reference to a GLUquadricObj returned by glu.newQuadric()
  * GLU.ERROR is the callback type
  * errorCallback is the method you wish to be called */
 glu.quadricCallback(myquadric, GLU.ERROR, "errorCallback");
+
+or
+
+glu.quadricCallback(myquadric, GLU.ERROR, someObject, "errorCallback");
+

--- CallbackContainer.cpp DELETED ---
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/common/callbacks/CallbackContainer.cpp

--- CallbackContainer.h DELETED ---
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/common/callbacks/CallbackContainer.h

--- CallbackManager.cpp DELETED ---
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/common/callbacks/CallbackManager.cpp

--- CallbackManager.h DELETED ---
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/common/callbacks/CallbackManager.h

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

Modified Files:
	acinclude.m4 aclocal.m4 
Log Message:

GLU: added quadricCallback(...) methods

GLUQuadricCallbacks: Should now be fully implemented

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


Index: acinclude.m4
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/acinclude.m4
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/acinclude.m4,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- acinclude.m4	30 Nov 2002 00:19:58 -0000	1.3
+++ acinclude.m4	30 Nov 2002 03:28:29 -0000	1.4
@@ -46,6 +46,54 @@
 dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 dnl PARTICULAR PURPOSE.
 
+dnl aclocal.m4 generated automatically by aclocal 1.4-p5
+
+dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl This program is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+dnl PARTICULAR PURPOSE.
+
+dnl aclocal.m4 generated automatically by aclocal 1.4-p5
+
+dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl This program is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+dnl PARTICULAR PURPOSE.
+
+dnl aclocal.m4 generated automatically by aclocal 1.4-p5
+
+dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl This program is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+dnl PARTICULAR PURPOSE.
+
+dnl aclocal.m4 generated automatically by aclocal 1.4-p5
+
+dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl This program is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+dnl PARTICULAR PURPOSE.
+
 # Do all the work for Automake.  This macro actually does too much --
 # some checks are only needed if your package does certain things.
 # But this isn't really a big deal.
@@ -3602,6 +3650,10 @@
 
 # This is just to silence aclocal about the macro not being used
 ifelse([AC_DISABLE_FAST_INSTALL])
+
+
+
+
 
 
 

Index: aclocal.m4
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/aclocal.m4
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/aclocal.m4,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- aclocal.m4	30 Nov 2002 00:19:59 -0000	1.4
+++ aclocal.m4	30 Nov 2002 03:28:30 -0000	1.5
@@ -58,6 +58,54 @@
 dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 dnl PARTICULAR PURPOSE.
 
+dnl aclocal.m4 generated automatically by aclocal 1.4-p5
+
+dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl This program is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+dnl PARTICULAR PURPOSE.
+
+dnl aclocal.m4 generated automatically by aclocal 1.4-p5
+
+dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl This program is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+dnl PARTICULAR PURPOSE.
+
+dnl aclocal.m4 generated automatically by aclocal 1.4-p5
+
+dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl This program is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+dnl PARTICULAR PURPOSE.
+
+dnl aclocal.m4 generated automatically by aclocal 1.4-p5
+
+dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl This program is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+dnl PARTICULAR PURPOSE.
+
 # Do all the work for Automake.  This macro actually does too much --
 # some checks are only needed if your package does certain things.
 # But this isn't really a big deal.
@@ -3614,6 +3662,10 @@
 
 # This is just to silence aclocal about the macro not being used
 ifelse([AC_DISABLE_FAST_INSTALL])
+
+
+
+
 
 
 

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

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

Modified Files:
	GLU.java 
Log Message:

GLU: added quadricCallback(...) methods

GLUQuadricCallbacks: Should now be fully implemented

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


Index: GLU.java
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/GLU.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/GLU.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- GLU.java	27 Nov 2002 05:54:27 -0000	1.6
+++ GLU.java	30 Nov 2002 03:28:29 -0000	1.7
@@ -353,4 +353,18 @@
                 int slices,
                 int stacks
         );
+        
+        
+        public native void quadricCallback(
+                int target,
+                int type,
+                String method
+        );
+        public native void quadricCallback(
+                int target,
+                int type,
+                Object obj,
+                String method
+        );
+        
 }

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

Modified Files:
	acinclude.m4 aclocal.m4 configure.in 
Log Message:

the callback classes now compile and link with the library. However it still
is not usable =/


Index: acinclude.m4
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/acinclude.m4
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/acinclude.m4,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- acinclude.m4	29 Nov 2002 08:29:53 -0000	1.2
+++ acinclude.m4	30 Nov 2002 00:19:58 -0000	1.3
@@ -46,498 +46,6 @@
 dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 dnl PARTICULAR PURPOSE.
 
-dnl aclocal.m4 generated automatically by aclocal 1.4-p5
-
-dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl This program is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-dnl PARTICULAR PURPOSE.
-
-dnl aclocal.m4 generated automatically by aclocal 1.4-p5
-
-dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl This program is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-dnl PARTICULAR PURPOSE.
-
-dnl aclocal.m4 generated automatically by aclocal 1.4-p5
-
-dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl This program is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-dnl PARTICULAR PURPOSE.
-
-dnl aclocal.m4 generated automatically by aclocal 1.4-p5
-
-dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl This program is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-dnl PARTICULAR PURPOSE.
-
-dnl aclocal.m4 generated automatically by aclocal 1.4-p5
-
-dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl This program is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-dnl PARTICULAR PURPOSE.
-
-dnl aclocal.m4 generated automatically by aclocal 1.4-p5
-
-dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl This program is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-dnl PARTICULAR PURPOSE.
-
-dnl aclocal.m4 generated automatically by aclocal 1.4-p5
-
-dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl This program is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-dnl PARTICULAR PURPOSE.
-
-dnl aclocal.m4 generated automatically by aclocal 1.4-p5
-
-dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl This program is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-dnl PARTICULAR PURPOSE.
-
-dnl aclocal.m4 generated automatically by aclocal 1.4-p5
-
-dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl This program is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-dnl PARTICULAR PURPOSE.
-
-dnl aclocal.m4 generated automatically by aclocal 1.4-p5
-
-dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl This program is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-dnl PARTICULAR PURPOSE.
-
-dnl aclocal.m4 generated automatically by aclocal 1.4-p5
-
-dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl This program is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-dnl PARTICULAR PURPOSE.
-
-dnl aclocal.m4 generated automatically by aclocal 1.4-p5
-
-dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl This program is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-dnl PARTICULAR PURPOSE.
-
-dnl aclocal.m4 generated automatically by aclocal 1.4-p5
-
-dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl This program is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-dnl PARTICULAR PURPOSE.
-
-dnl aclocal.m4 generated automatically by aclocal 1.4-p5
-
-dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl This program is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-dnl PARTICULAR PURPOSE.
-
-dnl aclocal.m4 generated automatically by aclocal 1.4-p5
-
-dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl This program is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-dnl PARTICULAR PURPOSE.
-
-dnl aclocal.m4 generated automatically by aclocal 1.4-p5
-
-dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl This program is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-dnl PARTICULAR PURPOSE.
-
-dnl aclocal.m4 generated automatically by aclocal 1.4-p5
-
-dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl This program is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-dnl PARTICULAR PURPOSE.
-
-dnl aclocal.m4 generated automatically by aclocal 1.4-p5
-
-dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl This program is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-dnl PARTICULAR PURPOSE.
-
-dnl aclocal.m4 generated automatically by aclocal 1.4-p5
-
-dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl This program is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-dnl PARTICULAR PURPOSE.
-
-dnl aclocal.m4 generated automatically by aclocal 1.4-p5
-
-dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl This program is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-dnl PARTICULAR PURPOSE.
-
-dnl aclocal.m4 generated automatically by aclocal 1.4-p5
-
-dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl This program is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-dnl PARTICULAR PURPOSE.
-
-dnl aclocal.m4 generated automatically by aclocal 1.4-p5
-
-dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl This program is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-dnl PARTICULAR PURPOSE.
-
-dnl aclocal.m4 generated automatically by aclocal 1.4-p5
-
-dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl This program is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-dnl PARTICULAR PURPOSE.
-
-dnl aclocal.m4 generated automatically by aclocal 1.4-p5
-
-dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl This program is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-dnl PARTICULAR PURPOSE.
-
-dnl aclocal.m4 generated automatically by aclocal 1.4-p5
-
-dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl This program is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-dnl PARTICULAR PURPOSE.
-
-dnl aclocal.m4 generated automatically by aclocal 1.4-p5
-
-dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl This program is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-dnl PARTICULAR PURPOSE.
-
-dnl aclocal.m4 generated automatically by aclocal 1.4-p5
-
-dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl This program is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-dnl PARTICULAR PURPOSE.
-
-dnl aclocal.m4 generated automatically by aclocal 1.4-p5
-
-dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl This program is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-dnl PARTICULAR PURPOSE.
-
-dnl aclocal.m4 generated automatically by aclocal 1.4-p5
-
-dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl This program is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-dnl PARTICULAR PURPOSE.
-
-dnl aclocal.m4 generated automatically by aclocal 1.4-p5
-
-dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl This program is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-dnl PARTICULAR PURPOSE.
-
-dnl aclocal.m4 generated automatically by aclocal 1.4-p5
-
-dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl This program is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-dnl PARTICULAR PURPOSE.
-
-dnl aclocal.m4 generated automatically by aclocal 1.4-p5
-
-dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl This program is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-dnl PARTICULAR PURPOSE.
-
-dnl aclocal.m4 generated automatically by aclocal 1.4-p5
-
-dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl This program is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-dnl PARTICULAR PURPOSE.
-
-dnl aclocal.m4 generated automatically by aclocal 1.4-p5
-
-dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl This program is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-dnl PARTICULAR PURPOSE.
-
-dnl aclocal.m4 generated automatically by aclocal 1.4-p5
-
-dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl This program is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-dnl PARTICULAR PURPOSE.
-
-dnl aclocal.m4 generated automatically by aclocal 1.4-p5
-
-dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl This program is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-dnl PARTICULAR PURPOSE.
-
-dnl aclocal.m4 generated automatically by aclocal 1.4-p5
-
-dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl This program is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-dnl PARTICULAR PURPOSE.
-
-dnl aclocal.m4 generated automatically by aclocal 1.4-p5
-
-dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl This program is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-dnl PARTICULAR PURPOSE.
-
-dnl aclocal.m4 generated automatically by aclocal 1.4-p5
-
-dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl This program is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-dnl PARTICULAR PURPOSE.
-
-dnl aclocal.m4 generated automatically by aclocal 1.4-p5
-
-dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl This program is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-dnl PARTICULAR PURPOSE.
-
-dnl aclocal.m4 generated automatically by aclocal 1.4-p5
-
-dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl This program is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-dnl PARTICULAR PURPOSE.
-
 # Do all the work for Automake.  This macro actually does too much --
 # some checks are only needed if your package does certain things.
 # But this isn't really a big deal.
@@ -653,8 +161,6 @@
 done<<>>dnl>>)
 changequote([,]))])
 
-
-
 # libtool.m4 - Configure libtool for the host system. -*-Shell-script-*-
 
 # serial 46 AC_PROG_LIBTOOL
@@ -4096,45 +3602,6 @@
 
 # This is just to silence aclocal about the macro not being used
 ifelse([AC_DISABLE_FAST_INSTALL])
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 
 
 

Index: aclocal.m4
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/aclocal.m4
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/aclocal.m4,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- aclocal.m4	29 Nov 2002 08:33:36 -0000	1.3
+++ aclocal.m4	30 Nov 2002 00:19:59 -0000	1.4
@@ -10,6 +10,54 @@
 dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 dnl PARTICULAR PURPOSE.
 
+dnl aclocal.m4 generated automatically by aclocal 1.4-p5
+
+dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl This program is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+dnl PARTICULAR PURPOSE.
+
+dnl aclocal.m4 generated automatically by aclocal 1.4-p5
+
+dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl This program is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+dnl PARTICULAR PURPOSE.
+
+dnl aclocal.m4 generated automatically by aclocal 1.4-p5
+
+dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl This program is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+dnl PARTICULAR PURPOSE.
+
+dnl aclocal.m4 generated automatically by aclocal 1.4-p5
+
+dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl This program is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+dnl PARTICULAR PURPOSE.
+
 # Do all the work for Automake.  This macro actually does too much --
 # some checks are only needed if your package does certain things.
 # But this isn't really a big deal.
@@ -3566,4 +3614,8 @@
 
 # This is just to silence aclocal about the macro not being used
 ifelse([AC_DISABLE_FAST_INSTALL])
+
+
+
+
 

Index: configure.in
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/configure.in
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/configure.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- configure.in	29 Nov 2002 08:29:53 -0000	1.3
+++ configure.in	30 Nov 2002 00:19:59 -0000	1.4
@@ -77,4 +77,4 @@
 
 dnl Checks for library functions.
 
-AC_OUTPUT([Makefile common/Makefile linux/Makefile])
+AC_OUTPUT([Makefile common/Makefile common/callbacks/Makefile linux/Makefile])

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

Modified Files:
	CallbackManager.cpp CallbackManager.h GLUQuadricCallbacks.cpp 
	GLUQuadricCallbacks.h JavaMethod.cpp JavaMethod.h README.txt 
Added Files:
	Makefile.am 
Log Message:

the callback classes now compile and link with the library. However it still
is not usable =/


--- NEW FILE: Makefile.am ---
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/common/callbacks/Makefile.am
noinst_LTLIBRARIES = libcallbacks.la

libcallbacks_la_SOURCES = $(COMMON) $(CALLBACKS)
libcallbacks_la_CPPFLAGS = -D_DEBUG

INCLUDES = -I../

COMMON = \
  CallbackContainer.cpp \
  CallbackContainer.h \
  CallbackManager.cpp \
  CallbackManager.h \
  JavaMethod.cpp \
  JavaMethod.h
  
CALLBACKS = \
  GLUQuadricCallbacks.cpp \
  GLUQuadricCallbacks.h

Index: CallbackManager.cpp
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/common/callbacks/CallbackManager.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/callbacks/CallbackManager.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- CallbackManager.cpp	29 Nov 2002 06:06:16 -0000	1.1
+++ CallbackManager.cpp	30 Nov 2002 00:19:59 -0000	1.2
@@ -19,5 +19,28 @@
 //
 CallbackManager::~CallbackManager()
 {
+        data.clear();
+}
+
+bool CallbackManager::add(jint key, CallbackContainer *value)
+{
+        data[key] = value;
 }
 
+bool CallbackManager::del(jint key)
+{
+        if (data.find(key) != data.end()) {
+                delete data[key];
+                data.erase(key);
+        }
+}
+
+CallbackContainer * CallbackManager::get(jint key)
+{
+        if (data.find(key) == data.end()) {
+                return NULL;
+        }
+        else {
+                return data[key];
+        }
+}

Index: CallbackManager.h
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/common/callbacks/CallbackManager.h
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/callbacks/CallbackManager.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- CallbackManager.h	29 Nov 2002 06:06:16 -0000	1.1
+++ CallbackManager.h	30 Nov 2002 00:19:59 -0000	1.2
@@ -10,18 +10,20 @@
 #include <map>
 #include <jni.h>
 
+#include "CallbackContainer.h"
+
 class CallbackManager {
 public:
 	CallbackManager();
 	~CallbackManager();
 
-        static bool add(jint, CallbackContainer);
-        static bool del(jint);
-        static CallbackContainer get(jint);
+        bool add(jint, CallbackContainer*);
+        bool del(jint);
+        CallbackContainer* get(jint);
         
 protected:
 private:
-        static map<jint, CallbackContainer> data;
+        std::map<jint, CallbackContainer*> data;
 };
 
 #endif	/* _CallbackManager_H */

Index: GLUQuadricCallbacks.cpp
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/common/callbacks/GLUQuadricCallbacks.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/callbacks/GLUQuadricCallbacks.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- GLUQuadricCallbacks.cpp	29 Nov 2002 06:06:16 -0000	1.1
+++ GLUQuadricCallbacks.cpp	30 Nov 2002 00:19:59 -0000	1.2
@@ -5,7 +5,7 @@
 // Created on November 28, 2002, 8:21 PM
 //
 
-#include "GLUQuadricCallback.h"
+#include "GLUQuadricCallbacks.h"
 
 //
 // Constructor
@@ -25,29 +25,35 @@
     if (errorCallback != NULL) {
         delete errorCallback;
     }
-    delete quad;
 }
 
+typedef void (GLAPIENTRY *callback_t)();
+
+
+/* having a couple issues. I cant use a pointer to a method as a function pointer? */
+
 void GLUQuadricCallbacks::add(JavaMethod *cb, GLenum type)
 {
     /* If we are already refering to a callback, get rid of it */
-    if (gluError != NULL) {
+    if (errorCallback != NULL) {
         delete errorCallback;
     }
+    
     switch (type) {
-        case GLU_ERROR;
+        case GLU_ERROR:
             errorCallback = cb;
-            gluQuadricCallback(quad, type, *gluError)
+//            gluQuadricCallback(quadric, type, (callback_t) this->gluError);
             break;
-    };
+    }
 }
 
-void GLUQuadricCallbacks::gluError(GLenum type) {
-    jclass cls = (*errorCallback->env)->GetObjectClass(errorCallback->env, errorCallback.obj);
-    jmethodID mid = (*errorCallback->env)->getMethodID(errorCallback->env, cls, errorCallback.method.c_str());
-    if (mid == 0) {
-        return;
-    }
-    /* Hopefully this will end up calling the java method for handling GLU_ERROR for this quad */
-    (*errorCallback->env)->CallVoidMethod(errorCallback->env, errorCallback.obj, mid, (jint) type);
-}
\ No newline at end of file
+void CALLBACK GLUQuadricCallbacks::gluError(GLenum type) {
+
+//    jclass cls = (*errorCallback->env)->GetObjectClass(errorCallback->env, errorCallback->obj);
+//    jmethodID mid = (*errorCallback->env)->getMethodID(errorCallback->env, cls, errorCallback->method.c_str());
+//    if (mid == 0) {
+//        return;
+//    }
+//    /* Hopefully this will end up calling the java method for handling GLU_ERROR for this quad */
+//    (*errorCallback->env)->CallVoidMethod(errorCallback->env, errorCallback->obj, mid, (jint) type);
+}

Index: GLUQuadricCallbacks.h
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/common/callbacks/GLUQuadricCallbacks.h
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/callbacks/GLUQuadricCallbacks.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- GLUQuadricCallbacks.h	29 Nov 2002 06:06:16 -0000	1.1
+++ GLUQuadricCallbacks.h	30 Nov 2002 00:19:59 -0000	1.2
@@ -1,28 +1,39 @@
 // 
-// File:   GLUQuadricCallback.h
+// File:   GLUQuadricCallbacks.h
 // Author: alterself
 //
 // Created on November 28, 2002, 8:21 PM
 //
 
-#ifndef _GLUQuadricCallback_H
-#define	_GLUQuadricCallback_H
+#ifndef _GLUQuadricCallbacks_H
+#define	_GLUQuadricCallbacks_H
 
 #include "extgl.h"
+#include <GL/glu.h>
+#include <stdlib.h>
+#include <stdio.h>
 
-class GLUQuadricCallbacks : public Callback {
+#include "JavaMethod.h"
+#include "CallbackContainer.h"
+
+#ifndef CALLBACK
+#define CALLBACK
+#endif
+
+
+class GLUQuadricCallbacks : public CallbackContainer {
 public:
-	GLUQuadricCallback(jint quad);
-	~GLUQuadricCallback();
+	GLUQuadricCallbacks(GLUquadricObj *quad);
+	~GLUQuadricCallbacks();
         void add(JavaMethod*, GLenum);
         
-        void gluError(GLenum);
+        void CALLBACK gluError(GLenum);
 protected:
 
 private:
-        GLUquadricObj *quadric;
-        JavaMethod *errorCallback;
+        JavaMethod* errorCallback;
+        GLUquadricObj* quadric;
 };
 
-#endif	/* _GLUQuadricCallback_H */
+#endif	/* _GLUQuadricCallbacks_H */
 

Index: JavaMethod.cpp
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/common/callbacks/JavaMethod.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/callbacks/JavaMethod.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- JavaMethod.cpp	29 Nov 2002 06:06:16 -0000	1.1
+++ JavaMethod.cpp	30 Nov 2002 00:19:59 -0000	1.2
@@ -5,12 +5,12 @@
 // Created on November 28, 2002, 3:37 PM
 //
 
-#include "Callback.h"
+#include "JavaMethod.h"
 
 //
 // Constructor
 ///
-JavaMethod::JavaMethod(JNIEnv *newEnv, jobject newObj, string newMethod)
+JavaMethod::JavaMethod(JNIEnv *newEnv, jobject newObj, std::string newMethod)
 {
     env = newEnv;
     obj = newObj;
@@ -22,6 +22,5 @@
 //
 JavaMethod::~JavaMethod()
 {
-    delete(method);
 }
 

Index: JavaMethod.h
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/common/callbacks/JavaMethod.h
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/callbacks/JavaMethod.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- JavaMethod.h	29 Nov 2002 06:06:16 -0000	1.1
+++ JavaMethod.h	30 Nov 2002 00:19:59 -0000	1.2
@@ -8,20 +8,19 @@
 #ifndef _JavaMethod_H
 #define	_JavaMethod_H
 #include <string>
-
+#include <jni.h>
 
 class JavaMethod {
 public:
-	JavaMethod(JNIEnv *, jobject, string);
+	JavaMethod(JNIEnv *, jobject, std::string);
 	~JavaMethod();
-
+        
+        JNIEnv* env;
+        jobject obj;
+        std::string method;
 protected:
 
 private:
-    JNIEnv* env;
-    jobject obj;
-    string method;
-
 };
 
 #endif	/* _JavaMethod_H */

Index: README.txt
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/common/callbacks/README.txt
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/callbacks/README.txt,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- README.txt	29 Nov 2002 09:19:39 -0000	1.6
+++ README.txt	30 Nov 2002 00:19:59 -0000	1.7
@@ -1,7 +1,5 @@
 This is just the start of my callback implementation.
 
-As it is, it wont compile =)
-
 Basically... we have 3 main classes...
 
 CallbackManager, which maintains a mapping of objects to callback containers

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

Modified Files:
	Makefile.am 
Log Message:

the callback classes now compile and link with the library. However it still
is not usable =/


Index: Makefile.am
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/common/Makefile.am
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Makefile.am	29 Nov 2002 06:06:16 -0000	1.2
+++ Makefile.am	30 Nov 2002 00:19:59 -0000	1.3
@@ -1,7 +1,14 @@
+SUBDIRS = callbacks
+
 noinst_LTLIBRARIES = libcommon.la
 
 libcommon_la_SOURCES = $(COMMON)
 libcommon_la_CPPFLAGS = -D_DEBUG
+
+libcommon_la_LIBADD = \
+  callbacks/libcallbacks.la
+libcommon_la_DEPENDENCIES = \
+  callbacks/libcallbacks.la
 
 COMMON = \
   extal.c \