modifications due to refactorings in gluegen and jogl.

4 files changed, 2 insertions, 14 deletions

diff --git a/src/demos/readbuffer/ReadBuffer2Screen.java b/src/demos/readbuffer/ReadBuffer2Screen.java
index 39a4a27..13e6508 100755
--- a/src/demos/readbuffer/ReadBuffer2Screen.java
+++ b/src/demos/readbuffer/ReadBuffer2Screen.java
@@ -38,15 +38,11 @@ import javax.media.opengl.*;
 import javax.media.opengl.fixedfunc.*;
 
 import com.jogamp.opengl.util.*;
-import com.jogamp.opengl.util.glsl.fixedfunc.*;
 
 import javax.media.opengl.fixedfunc.GLPointerFunc;
-import com.jogamp.opengl.util.texture.Texture;
-import com.jogamp.opengl.util.texture.TextureData;
 import com.jogamp.opengl.util.texture.TextureCoords;
 import com.jogamp.opengl.util.GLArrayDataClient;
 import com.jogamp.opengl.util.GLArrayDataServer;
-import com.jogamp.opengl.util.BufferUtil;
 
 public class ReadBuffer2Screen extends ReadBufferBase {
     PMVMatrix pmvMatrix;
diff --git a/src/demos/readbuffer/ReadBufferBase.java b/src/demos/readbuffer/ReadBufferBase.java
index 53f2ba9..bb2d228 100755
--- a/src/demos/readbuffer/ReadBufferBase.java
+++ b/src/demos/readbuffer/ReadBufferBase.java
@@ -33,13 +33,8 @@
 
 package demos.readbuffer;
 
-import java.nio.*;
 import javax.media.opengl.*;
 
-import com.jogamp.opengl.util.texture.Texture;
-import com.jogamp.opengl.util.texture.TextureData;
-import com.jogamp.opengl.util.BufferUtil;
-
 
 public class ReadBufferBase implements GLEventListener {
     public boolean glDebug = false ;
diff --git a/src/demos/readbuffer/ReadBufferUtil.java b/src/demos/readbuffer/ReadBufferUtil.java
index 5cba034..85680c7 100755
--- a/src/demos/readbuffer/ReadBufferUtil.java
+++ b/src/demos/readbuffer/ReadBufferUtil.java
@@ -33,12 +33,12 @@
 
 package demos.readbuffer;
 
+import com.jogamp.opengl.util.GLBuffers;
 import java.nio.*;
 import javax.media.opengl.*;
 
 import com.jogamp.opengl.util.texture.Texture;
 import com.jogamp.opengl.util.texture.TextureData;
-import com.jogamp.opengl.util.BufferUtil;
 
 public class ReadBufferUtil {
     protected int readPixelSizeLast = 0;
@@ -60,7 +60,7 @@ public class ReadBufferUtil {
         int readPixelSize = drawable.getWidth() * drawable.getHeight() * 3 ; // RGB
         boolean newData = false;
         if(readPixelSize>readPixelSizeLast) {
-            readPixelBuffer = BufferUtil.newGLBuffer(gl.GL_UNSIGNED_BYTE, readPixelSize);
+            readPixelBuffer = GLBuffers.newDirectGLBuffer(GL.GL_UNSIGNED_BYTE, readPixelSize);
             readPixelSizeLast = readPixelSize ;
             try {
                 readTextureData = new TextureData(
diff --git a/src/demos/readbuffer/Surface2File.java b/src/demos/readbuffer/Surface2File.java
index ec41039..74fa637 100755
--- a/src/demos/readbuffer/Surface2File.java
+++ b/src/demos/readbuffer/Surface2File.java
@@ -33,12 +33,9 @@
 
 package demos.readbuffer;
 
-import java.nio.*;
 import javax.media.opengl.*;
 
-import com.jogamp.opengl.util.texture.TextureData;
 import com.jogamp.opengl.util.texture.TextureIO;
-import com.jogamp.opengl.util.BufferUtil;
 
 import java.io.File;
 import java.io.IOException;