diff options
| author | Sven Gothel <[email protected]> | 2010-03-28 01:52:29 +0100 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2010-03-28 01:52:29 +0100 |
| commit | d3e818ea8b7c3f45ed4cfac7b0e7d3bd24f956e5 (patch) | |
| tree | 6ce99febee12fb7c32967d46310e43faaa0d820c /src/demos/es2/openmax | |
| parent | f9e14975725cd3df3f792260bad9197a08d4a67f (diff) | |
| parent | 0d46fa3091e40271ba2247f6c4236cb2358f5151 (diff) | |
Merge branch 'master' of github.com:mbien/jogl-demos
Diffstat (limited to 'src/demos/es2/openmax')
| -rw-r--r-- | src/demos/es2/openmax/Cube.java | 4 | ||||
| -rwxr-xr-x | src/demos/es2/openmax/MovieCube.java | 4 | ||||
| -rwxr-xr-x | src/demos/es2/openmax/MovieSimple.java | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/demos/es2/openmax/Cube.java b/src/demos/es2/openmax/Cube.java index 46d25c1..620ce88 100644 --- a/src/demos/es2/openmax/Cube.java +++ b/src/demos/es2/openmax/Cube.java @@ -36,8 +36,8 @@ import javax.media.opengl.*; import javax.media.opengl.glu.*; import javax.media.nativewindow.*; -import com.sun.opengl.util.*; -import com.sun.opengl.util.glsl.fixedfunc.*; +import com.jogamp.opengl.util.*; +import com.jogamp.opengl.util.glsl.fixedfunc.*; import com.sun.javafx.newt.*; import com.sun.javafx.newt.opengl.*; diff --git a/src/demos/es2/openmax/MovieCube.java b/src/demos/es2/openmax/MovieCube.java index 40ba583..197b2c9 100755 --- a/src/demos/es2/openmax/MovieCube.java +++ b/src/demos/es2/openmax/MovieCube.java @@ -36,7 +36,7 @@ package demos.es2.openmax; // import demos.es1.cube.Cube; import javax.media.opengl.*; -import com.sun.opengl.util.glsl.fixedfunc.*; +import com.jogamp.opengl.util.glsl.fixedfunc.*; import com.sun.openmax.*; @@ -181,7 +181,7 @@ public class MovieCube implements MouseListener, GLEventListener, OMXEventListen public void display(GLAutoDrawable drawable) { GL2ES1 gl = drawable.getGL().getGL2ES1(); - com.sun.opengl.util.texture.Texture tex = null; + com.jogamp.opengl.util.texture.Texture tex = null; if(null!=movie) { tex=movie.getNextTextureID(); if(null!=tex) { diff --git a/src/demos/es2/openmax/MovieSimple.java b/src/demos/es2/openmax/MovieSimple.java index 9088977..3bd4156 100755 --- a/src/demos/es2/openmax/MovieSimple.java +++ b/src/demos/es2/openmax/MovieSimple.java @@ -36,8 +36,8 @@ package demos.es2.openmax; import javax.media.opengl.*; -import com.sun.opengl.util.glsl.*; -import com.sun.opengl.util.*; +import com.jogamp.opengl.util.glsl.*; +import com.jogamp.opengl.util.*; import com.sun.openmax.*; @@ -321,7 +321,7 @@ public class MovieSimple implements MouseListener, GLEventListener, OMXEventList } - com.sun.opengl.util.texture.Texture tex = null; + com.jogamp.opengl.util.texture.Texture tex = null; if(null!=movie) { tex=movie.getNextTextureID(); if(null!=tex) { |