NEWT window closing:

    - New WindowEvent.EVENT_WINDOW_DESTROY_NOTIFY and 
      WindowListener.windowDestroyNotify() method.

    - Removed windowClosed() method for JNI hook

    - Added windowDestroyNotify() windowDestroyed(),
      where windowDestroyNotify() shall be called by the native implementation
      _before_ the window gets shutdown.
      The Window.java then sends a WindowEvent.EVENT_WINDOW_DESTROY_NOTIFY event,
      and either Window.java or it's owner GLWindow.java issues the destroy() 
      procedure.

    - Added GLEventListener.dispose(GLAutoDrawable),
      to allow user application to release GL ressources.
      Issued by GLWindow (-> see windowDestroyNotify())

    - X11 impl intercepts WM_DELETE_WINDOW, using Atom, 
      MacosX impl already uses the _before_ method (VERIFY),
      and Windows impl uses the WM_CLOSE event (VERIFY).

JOGL2 dispose/destroy ..
    - Added GLEventListener.dispose() to GLCanvas and GLJpanel

    - GL* toString() rearrangement, assumes it is issued by GLContext(),
      which indeed is the core information node.

    - Added proper destroy() methods and calls,
      to achieve a proper resource release at destruction.
      Instrumentizing almost all classes with a destroy() method,
      so no release function lookup is necessary.

    - misc changes ..

JOGL2 Demos
    - Fixed in regards to the above changes


git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/../svn-server-sync/jogl-demos/branches/JOGL_2_SANDBOX@321 3298f667-5e0e-4b4a-8ed4-a3559d26a5f4

1 files changed, 10 insertions, 3 deletions

diff --git a/src/demos/es1/cube/Cube.java b/src/demos/es1/cube/Cube.java
index 1ef6aab..cc2f8e8 100644
--- a/src/demos/es1/cube/Cube.java
+++ b/src/demos/es1/cube/Cube.java
@@ -43,6 +43,8 @@ import com.sun.opengl.impl.fixed.GLFixedFuncImpl;
 import com.sun.javafx.newt.*;
 
 public class Cube implements GLEventListener {
+    boolean quit = false;
+
     public Cube () {
         this(false, false);
     }
@@ -170,9 +172,10 @@ public class Cube implements GLEventListener {
             gl.glBindBuffer(GL.GL_ARRAY_BUFFER, vboNames[3]);
             gl.glBufferData(GL.GL_ARRAY_BUFFER, cubeTexCoords.limit() * BufferUtil.SIZEOF_SHORT, cubeTexCoords, GL.GL_STATIC_DRAW);
             gl.glTexCoordPointer(2, gl.GL_SHORT, 0, 0);
+            /* issues an GL_INVALID_ENUM
             if(null!=gl2es1) {
                 gl2es1.glTexEnvi(gl2es1.GL_TEXTURE_ENV, gl2es1.GL_TEXTURE_ENV_MODE, gl2es1.GL_INCR);
-            }
+            } */
         } else {
             gl.glDisableClientState(gl.GL_TEXTURE_COORD_ARRAY);
         }
@@ -193,6 +196,10 @@ public class Cube implements GLEventListener {
         // weird effect ..: gl.glCullFace(gl.GL_FRONT);
     }
 
+    public void dispose(GLAutoDrawable drawable) {
+        quit=true;
+    }
+
     public void display(GLAutoDrawable drawable) {
         GLFixedFuncIf gl = GLFixedFuncUtil.getGLFixedFuncIf(drawable.getGL());
 
@@ -333,12 +340,12 @@ public class Cube implements GLEventListener {
             window.setFullscreen(true);
             window.setVisible(true);
 
-            while (window.getDuration() < 31000) {
+            while (!quit && window.getDuration() < 31000) {
                 window.display();
             }
 
             // Shut things down cooperatively
-            window.close();
+            window.destroy();
             window.getFactory().shutdown();
             System.out.println("Cube shut down cleanly.");
         } catch (Throwable t) {