Further context-related changes for the JSR-231 API. The GLContext

implementations on all platforms have been split into orthogonal
GLDrawable and GLContext concepts. It is now possible to create more
than one GLContet per GLDrawable (though this has not been tested
yet). GLCanvas has been reimplemented in terms of
GLDrawableFactory.getGLDrawable(). More functionality has been moved
from GLDrawable to GLAutoDrawable. Reimplemented lazy sending of
reshape GLEventListener events in GLCanvas and GLJPanel and deleted
notion of deferred reshapes from GLDrawableHelper and elsewhere.
Sharing of textures and display lists is now expressed in terms of
GLContexts instead of GLDrawables. Still need to move pbuffer creation
into GLDrawableFactory from the onscreen GLContext implementations.
Added option to gleem ExaminerViewer to disable automatic redraws upon
mouse events and respecified more of gleem to work on GLAutoDrawables
rather than GLDrawables. Updated all JOGL demos to work with new APIs
and slightly different initialization sequences (in particular, for
pbuffers -- this will change with the addition of
GLDrawableFactory.createGLPbuffer()).


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

1 files changed, 10 insertions, 3 deletions

diff --git a/src/demos/hdr/HDR.java b/src/demos/hdr/HDR.java
index db79bd6..3bf1b49 100755
--- a/src/demos/hdr/HDR.java
+++ b/src/demos/hdr/HDR.java
@@ -282,6 +282,7 @@ public class HDR {
       manager.registerWindow(drawable);
 
       viewer = new ExaminerViewer(MouseButtonHelper.numMouseButtons());
+      viewer.setAutoRedrawMode(false);
       viewer.setNoAltKeyMode(true);
       viewer.attach(drawable, new BSphereProvider() {
 	  public BSphere getBoundingSphere() {
@@ -324,6 +325,12 @@ public class HDR {
 
       pbuffer.display();
 
+      // FIXME: because of changes in lazy pbuffer instantiation
+      // behavior the pbuffer might not have been run just now
+      if (pipeline == null) {
+        return;
+      }
+
       // blur pass
       if (b['g']) {
         // shrink image
@@ -502,7 +509,7 @@ public class HDR {
 
   class PbufferListener implements GLEventListener {
     public void init(GLAutoDrawable drawable) {
-      //      printThreadName("init for PbufferListener");
+      printThreadName("init for PbufferListener");
 
       //      drawable.setGL(new DebugGL(drawable.getGL()));
 
@@ -693,7 +700,7 @@ public class HDR {
 
   class BlurPbufferListener implements GLEventListener {
     public void init(GLAutoDrawable drawable) {
-      //      printThreadName("init for BlurPbufferListener");
+      printThreadName("init for BlurPbufferListener");
 
       //      drawable.setGL(new DebugGL(drawable.getGL()));
 
@@ -726,7 +733,7 @@ public class HDR {
 
   class Blur2PbufferListener implements GLEventListener {
     public void init(GLAutoDrawable drawable) {
-      //      printThreadName("init for Blur2PbufferListener");
+      printThreadName("init for Blur2PbufferListener");
 
       //      drawable.setGL(new DebugGL(drawable.getGL()));