Merge branch 'master' of github.com:mbien/jogl-demos

18 files changed, 33 insertions, 17 deletions

diff --git a/jogl-demos.iml b/jogl-demos.iml
new file mode 100644
index 0000000..d0cea35
--- /dev/null
+++ b/jogl-demos.iml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src/redbook" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/jbullet/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="jogl" />
+    <orderEntry type="library" name="junit" level="application" />
+  </component>
+</module>
+
diff --git a/src/demos/cubefbo/CubeObject.java b/src/demos/cubefbo/CubeObject.java
index dd3da91..7abb8cd 100755
--- a/src/demos/cubefbo/CubeObject.java
+++ b/src/demos/cubefbo/CubeObject.java
@@ -33,7 +33,7 @@
 
 package demos.cubefbo;
 
-import com.jogamp.gluegen.runtime.Buffers;
+import com.jogamp.common.nio.Buffers;
 import java.nio.ByteBuffer;
 import java.nio.ShortBuffer;
 import javax.media.opengl.GL;
diff --git a/src/demos/es1/RedSquare.java b/src/demos/es1/RedSquare.java
index 4741258..de4f54a 100755
--- a/src/demos/es1/RedSquare.java
+++ b/src/demos/es1/RedSquare.java
@@ -1,6 +1,6 @@
 package demos.es1;
 
-import com.jogamp.gluegen.runtime.Buffers;
+import com.jogamp.common.nio.Buffers;
 import java.nio.*;
 import java.util.*;
 import javax.media.opengl.*;
diff --git a/src/demos/es1/angeles/AngelesES1.java b/src/demos/es1/angeles/AngelesES1.java
index 6c868c4..b286403 100755
--- a/src/demos/es1/angeles/AngelesES1.java
+++ b/src/demos/es1/angeles/AngelesES1.java
@@ -24,7 +24,7 @@
 
 package demos.es1.angeles;
 
-import com.jogamp.gluegen.runtime.Buffers;
+import com.jogamp.common.nio.Buffers;
 import javax.media.opengl.*;
 import javax.media.opengl.glu.*;
 import com.jogamp.opengl.util.*;
diff --git a/src/demos/es1/cube/Cube.java b/src/demos/es1/cube/Cube.java
index d2a3277..f1af890 100644
--- a/src/demos/es1/cube/Cube.java
+++ b/src/demos/es1/cube/Cube.java
@@ -31,7 +31,7 @@
  */
 package demos.es1.cube;
 
-import com.jogamp.gluegen.runtime.Buffers;
+import com.jogamp.common.nio.Buffers;
 import java.nio.*;
 import javax.media.opengl.*;
 import javax.media.opengl.glu.*;
diff --git a/src/demos/es1/cube/CubeImmModeSink.java b/src/demos/es1/cube/CubeImmModeSink.java
index e91a595..34ae022 100644
--- a/src/demos/es1/cube/CubeImmModeSink.java
+++ b/src/demos/es1/cube/CubeImmModeSink.java
@@ -31,7 +31,7 @@
  */
 package demos.es1.cube;
 
-import com.jogamp.gluegen.runtime.Buffers;
+import com.jogamp.common.nio.Buffers;
 import javax.media.opengl.*;
 import javax.media.opengl.glu.*;
 import javax.media.nativewindow.*;
diff --git a/src/demos/es2/openmax/Cube.java b/src/demos/es2/openmax/Cube.java
index aa4b8dd..edcfba0 100644
--- a/src/demos/es2/openmax/Cube.java
+++ b/src/demos/es2/openmax/Cube.java
@@ -31,7 +31,7 @@
  */
 package demos.es2.openmax;
 
-import com.jogamp.gluegen.runtime.Buffers;
+import com.jogamp.common.nio.Buffers;
 import java.nio.*;
 import javax.media.opengl.*;
 import javax.media.opengl.glu.*;
diff --git a/src/demos/es2/perftst/PerfUniLoad.java b/src/demos/es2/perftst/PerfUniLoad.java
index 170bf1a..1c71253 100755
--- a/src/demos/es2/perftst/PerfUniLoad.java
+++ b/src/demos/es2/perftst/PerfUniLoad.java
@@ -1,6 +1,6 @@
 package demos.es2.perftst;
 
-import com.jogamp.gluegen.runtime.Buffers;
+import com.jogamp.common.nio.Buffers;
 import java.nio.*;
 import javax.media.opengl.*;
 import com.jogamp.opengl.util.*;
diff --git a/src/demos/misc/Picking.java b/src/demos/misc/Picking.java
index 0e1596a..1ba5f3e 100755
--- a/src/demos/misc/Picking.java
+++ b/src/demos/misc/Picking.java
@@ -10,7 +10,7 @@ package demos.misc;
 // Notes: * Based on example 13-3 (p 542) in the "OpenGL Programming Guide"
 //        * This version should handle overlapping objects correctly.
 //---------------------------------------------------------------------------------
-import com.jogamp.gluegen.runtime.Buffers;
+import com.jogamp.common.nio.Buffers;
 import java.awt.*;
 import java.awt.event.*;
 import java.awt.Canvas.*;
diff --git a/src/demos/util/ObjReader.java b/src/demos/util/ObjReader.java
index 718e96e..bb330ea 100644
--- a/src/demos/util/ObjReader.java
+++ b/src/demos/util/ObjReader.java
@@ -39,7 +39,7 @@
 
 package demos.util;
 
-import com.jogamp.gluegen.runtime.Buffers;
+import com.jogamp.common.nio.Buffers;
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileReader;
diff --git a/src/demos/vertexBufferObject/VertexBufferObject.java b/src/demos/vertexBufferObject/VertexBufferObject.java
index 5252867..f06f266 100644
--- a/src/demos/vertexBufferObject/VertexBufferObject.java
+++ b/src/demos/vertexBufferObject/VertexBufferObject.java
@@ -33,7 +33,7 @@
 
 package demos.vertexBufferObject;
 
-import com.jogamp.gluegen.runtime.Buffers;
+import com.jogamp.common.nio.Buffers;
 import demos.common.Demo;
 import demos.common.DemoListener;
 import java.awt.BorderLayout;
diff --git a/src/redbook/src/glredbook10/bezmesh.java b/src/redbook/src/glredbook10/bezmesh.java
index 1dda4e0..dea45c6 100644
--- a/src/redbook/src/glredbook10/bezmesh.java
+++ b/src/redbook/src/glredbook10/bezmesh.java
@@ -6,7 +6,7 @@ import javax.swing.*;
 import java.nio.*;

 

 import javax.media.opengl.*;

-import com.jogamp.gluegen.runtime.Buffers;

+import com.jogamp.common.nio.Buffers;

 import javax.media.opengl.awt.GLJPanel;

 

 /**

diff --git a/src/redbook/src/glredbook10/bezsurf.java b/src/redbook/src/glredbook10/bezsurf.java
index 96faa8e..57fc12b 100644
--- a/src/redbook/src/glredbook10/bezsurf.java
+++ b/src/redbook/src/glredbook10/bezsurf.java
@@ -6,7 +6,7 @@ import javax.swing.*;
 import java.nio.*;

 

 import javax.media.opengl.*;

-import com.jogamp.gluegen.runtime.Buffers;

+import com.jogamp.common.nio.Buffers;

 import javax.media.opengl.awt.GLJPanel;

 

 /**

diff --git a/src/redbook/src/glredbook10/mipmap.java b/src/redbook/src/glredbook10/mipmap.java
index 3533acd..e7e9d85 100644
--- a/src/redbook/src/glredbook10/mipmap.java
+++ b/src/redbook/src/glredbook10/mipmap.java
@@ -5,7 +5,7 @@ import javax.swing.*;
 

 import java.nio.*;

 

-import com.jogamp.gluegen.runtime.Buffers;

+import com.jogamp.common.nio.Buffers;

 import javax.media.opengl.*;

 import com.jogamp.opengl.util.*;

 import javax.media.opengl.awt.GLJPanel;

diff --git a/src/redbook/src/glredbook10/texgen.java b/src/redbook/src/glredbook10/texgen.java
index 821dae7..4255a63 100644
--- a/src/redbook/src/glredbook10/texgen.java
+++ b/src/redbook/src/glredbook10/texgen.java
@@ -5,7 +5,7 @@ import javax.swing.*;
 

 import java.nio.*;

 

-import com.jogamp.gluegen.runtime.Buffers;

+import com.jogamp.common.nio.Buffers;

 import com.jogamp.opengl.util.gl2.GLUT;

 import javax.media.opengl.*; import javax.media.opengl.awt.GLJPanel;

 

diff --git a/src/redbook/src/glredbook10/texturesurf.java b/src/redbook/src/glredbook10/texturesurf.java
index 3c4d947..ec376f2 100644
--- a/src/redbook/src/glredbook10/texturesurf.java
+++ b/src/redbook/src/glredbook10/texturesurf.java
@@ -6,7 +6,7 @@ import java.awt.event.*;
 

 import java.nio.*;

 

-import com.jogamp.gluegen.runtime.Buffers;

+import com.jogamp.common.nio.Buffers;

 import javax.media.opengl.*;

 import javax.media.opengl.awt.GLJPanel;

 

diff --git a/src/redbook/src/glredbook11/texgen.java b/src/redbook/src/glredbook11/texgen.java
index 353c843..c944454 100644
--- a/src/redbook/src/glredbook11/texgen.java
+++ b/src/redbook/src/glredbook11/texgen.java
@@ -9,7 +9,7 @@ import java.nio.ByteBuffer;
 import javax.media.opengl.*;

 import javax.swing.JFrame;

 

-import com.jogamp.gluegen.runtime.Buffers;

+import com.jogamp.common.nio.Buffers;

 

 import com.jogamp.opengl.util.gl2.GLUT;

 import javax.media.opengl.awt.GLJPanel;

diff --git a/src/redbook/src/glredbook1314/mvarray.java b/src/redbook/src/glredbook1314/mvarray.java
index b59ff13..ffa1d58 100644
--- a/src/redbook/src/glredbook1314/mvarray.java
+++ b/src/redbook/src/glredbook1314/mvarray.java
@@ -10,7 +10,7 @@ import java.nio.IntBuffer;
 

 import javax.media.opengl.*;

 import javax.swing.JFrame;

-import com.jogamp.gluegen.runtime.PointerBuffer;

+import com.jogamp.common.nio.PointerBuffer;

 import com.jogamp.opengl.util.GLBuffers;

 import javax.media.opengl.awt.GLJPanel;

 import javax.media.opengl.glu.GLU;