diff options
Diffstat (limited to 'src/demos/es1/angeles')
-rwxr-xr-x | src/demos/es1/angeles/AngelesES1.java | 2 | ||||
-rwxr-xr-x | src/demos/es1/angeles/AngelesGL.java | 6 | ||||
-rwxr-xr-x | src/demos/es1/angeles/AngelesGLil.java | 6 |
3 files changed, 5 insertions, 9 deletions
diff --git a/src/demos/es1/angeles/AngelesES1.java b/src/demos/es1/angeles/AngelesES1.java index a58a198..c5de891 100755 --- a/src/demos/es1/angeles/AngelesES1.java +++ b/src/demos/es1/angeles/AngelesES1.java @@ -25,8 +25,8 @@ package demos.es1.angeles; import javax.media.opengl.*; -import javax.media.opengl.util.*; import javax.media.opengl.glu.*; +import com.sun.opengl.util.*; import java.nio.*; public class AngelesES1 implements GLEventListener { diff --git a/src/demos/es1/angeles/AngelesGL.java b/src/demos/es1/angeles/AngelesGL.java index b6317cc..fbb1322 100755 --- a/src/demos/es1/angeles/AngelesGL.java +++ b/src/demos/es1/angeles/AngelesGL.java @@ -25,11 +25,9 @@ package demos.es1.angeles; import javax.media.opengl.*; -import javax.media.opengl.sub.*; -import javax.media.opengl.sub.fixed.*; -import javax.media.opengl.util.*; import javax.media.opengl.glu.*; import com.sun.opengl.util.*; +import com.sun.opengl.util.glsl.fixedfunc.*; import java.nio.*; public class AngelesGL implements GLEventListener { @@ -84,7 +82,7 @@ public class AngelesGL implements GLEventListener { cComps = drawable.getGL().isGLES1() ? 4: 3; - this.gl = GLFixedFuncUtil.getFixedFuncImpl(drawable.getGL()); + this.gl = FixedFuncUtil.getFixedFuncImpl(drawable.getGL()); System.err.println("AngelesGL: "+this.gl); this.glu = GLU.createGLU(); diff --git a/src/demos/es1/angeles/AngelesGLil.java b/src/demos/es1/angeles/AngelesGLil.java index 55694a3..2aeb795 100755 --- a/src/demos/es1/angeles/AngelesGLil.java +++ b/src/demos/es1/angeles/AngelesGLil.java @@ -25,11 +25,9 @@ package demos.es1.angeles; import javax.media.opengl.*; -import javax.media.opengl.sub.*; -import javax.media.opengl.sub.fixed.*; -import javax.media.opengl.util.*; import javax.media.opengl.glu.*; import com.sun.opengl.util.*; +import com.sun.opengl.util.glsl.fixedfunc.*; import java.nio.*; public class AngelesGLil implements GLEventListener { @@ -84,7 +82,7 @@ public class AngelesGLil implements GLEventListener { cComps = drawable.getGL().isGLES1() ? 4: 3; - this.gl = GLFixedFuncUtil.getFixedFuncImpl(drawable.getGL()); + this.gl = FixedFuncUtil.getFixedFuncImpl(drawable.getGL()); System.err.println("AngelesGL: "+this.gl); this.glu = GLU.createGLU(); |