diff options
| author | Sven Gothel <[email protected]> | 2010-03-30 02:06:00 +0200 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2010-03-30 02:06:00 +0200 |
| commit | 2e4835c543d32791cf3c79907aecad7c4692f457 (patch) | |
| tree | 613d0f21c1cb79a400b4b188534ec033343bfc87 /src/jbullet | |
| parent | d3e818ea8b7c3f45ed4cfac7b0e7d3bd24f956e5 (diff) | |
| parent | 0b708395a18eb6a2ae5372ff414bc75830ce19b6 (diff) | |
Merge branch 'master' of github.com:mbien/jogl-demos
Diffstat (limited to 'src/jbullet')
| -rw-r--r-- | src/jbullet/src/javabullet/demos/opengl/DemoApplication.java | 2 | ||||
| -rw-r--r-- | src/jbullet/src/javabullet/demos/opengl/GLSRT.java | 2 | ||||
| -rw-r--r-- | src/jbullet/src/javabullet/demos/opengl/JOGL.java | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/jbullet/src/javabullet/demos/opengl/DemoApplication.java b/src/jbullet/src/javabullet/demos/opengl/DemoApplication.java index 18c0bae..ec58929 100644 --- a/src/jbullet/src/javabullet/demos/opengl/DemoApplication.java +++ b/src/jbullet/src/javabullet/demos/opengl/DemoApplication.java @@ -48,7 +48,7 @@ import javax.media.opengl.*; import javax.media.opengl.glu.*; import java.nio.*; -import com.sun.javafx.newt.*; +import com.jogamp.newt.*; /** * diff --git a/src/jbullet/src/javabullet/demos/opengl/GLSRT.java b/src/jbullet/src/javabullet/demos/opengl/GLSRT.java index cdd4aef..a147202 100644 --- a/src/jbullet/src/javabullet/demos/opengl/GLSRT.java +++ b/src/jbullet/src/javabullet/demos/opengl/GLSRT.java @@ -141,7 +141,7 @@ public class GLSRT { 16, 19, 17, 18, 16, 17, /* right */ 23, 20, 21, 20, 22, 21 /* left */ }; - private ByteBuffer cubeIndices=BufferUtil.newByteBuffer(s_cubeIndices); + private ByteBuffer cubeIndices=GLBuffers.newDirectByteBuffer(s_cubeIndices); //////////////////////////////////////////////////////////////////////////// diff --git a/src/jbullet/src/javabullet/demos/opengl/JOGL.java b/src/jbullet/src/javabullet/demos/opengl/JOGL.java index 078e9c5..aeececb 100644 --- a/src/jbullet/src/javabullet/demos/opengl/JOGL.java +++ b/src/jbullet/src/javabullet/demos/opengl/JOGL.java @@ -23,7 +23,7 @@ package javabullet.demos.opengl; -import com.sun.javafx.newt.*; +import com.jogamp.newt.*; import javax.media.nativewindow.*; import javax.media.opengl.*; import javax.media.opengl.glu.*; |