diff options
4 files changed, 12 insertions, 12 deletions
diff --git a/src/demos/context/DualContext.java b/src/demos/context/DualContext.java index 898d08f..8c801a6 100755 --- a/src/demos/context/DualContext.java +++ b/src/demos/context/DualContext.java @@ -39,7 +39,7 @@ package demos.context; -import com.sun.opengl.util.glut.gl2.GLUTgl2; +import com.sun.opengl.util.gl2.GLUT; import java.awt.BorderLayout; import java.awt.Canvas; import java.awt.Graphics; @@ -66,7 +66,7 @@ public class DualContext extends Canvas { private GLContext context1; private GLContext context2; private GLU glu; - private GLUTgl2 glut; + private GLUT glut; private int repaintNum; public DualContext(GLCapabilities capabilities) { @@ -77,7 +77,7 @@ public class DualContext extends Canvas { context1 = drawable.createContext(null); context2 = drawable.createContext(null); glu = new GLU(); - glut = new GLUTgl2(); + glut = new GLUT(); } public void addNotify() { @@ -129,12 +129,12 @@ public class DualContext extends Canvas { gl.glEnable(GL.GL_SCISSOR_TEST); gl.glClearColor(br, bg, bb, 1); gl.glClear(GL.GL_COLOR_BUFFER_BIT | GL.GL_DEPTH_BUFFER_BIT); - float length = glut.glutStrokeLengthf(GLUTgl2.STROKE_ROMAN, str); + float length = glut.glutStrokeLengthf(GLUT.STROKE_ROMAN, str); gl.glMatrixMode(GL.GL_PROJECTION); gl.glLoadIdentity(); glu.gluOrtho2D(x, x + width, y, y + height); gl.glTranslatef(x + (width - length) / 2, y + height / 2, 0); - glut.glutStrokeString(GLUTgl2.STROKE_ROMAN, str); + glut.glutStrokeString(GLUT.STROKE_ROMAN, str); } public static void main(String[] args) { diff --git a/src/demos/hwShadowmapsSimple/HWShadowmapsSimple.java b/src/demos/hwShadowmapsSimple/HWShadowmapsSimple.java index 0d647f3..5f34c15 100644 --- a/src/demos/hwShadowmapsSimple/HWShadowmapsSimple.java +++ b/src/demos/hwShadowmapsSimple/HWShadowmapsSimple.java @@ -33,7 +33,7 @@ package demos.hwShadowmapsSimple; -import com.sun.opengl.util.glut.gl2.GLUTgl2; +import com.sun.opengl.util.gl2.GLUT; import com.sun.opengl.util.texture.Texture; import com.sun.opengl.util.texture.TextureIO; import demos.common.Demo; @@ -129,7 +129,7 @@ public class HWShadowmapsSimple extends Demo { private GLPbuffer pbuffer; private GLU glu; - private GLUTgl2 glut; + private GLUT glut; private float[] light_ambient = { 0, 0, 0, 0 }; private float[] light_intensity = { 1, 1, 1, 1 }; @@ -206,7 +206,7 @@ public class HWShadowmapsSimple extends Demo { GL2 gl = drawable.getGL().getGL2(); glu = new GLU(); - glut = new GLUTgl2(); + glut = new GLUT(); try { checkExtension(gl, "GL_VERSION_1_3"); // For multitexture diff --git a/src/demos/infiniteShadowVolumes/InfiniteShadowVolumes.java b/src/demos/infiniteShadowVolumes/InfiniteShadowVolumes.java index 699f9de..39fb6cb 100644 --- a/src/demos/infiniteShadowVolumes/InfiniteShadowVolumes.java +++ b/src/demos/infiniteShadowVolumes/InfiniteShadowVolumes.java @@ -33,7 +33,7 @@ package demos.infiniteShadowVolumes; -import com.sun.opengl.util.glut.gl2.GLUTgl2; +import com.sun.opengl.util.gl2.GLUT; import demos.common.Demo; import demos.common.DemoListener; import demos.util.MD2; @@ -164,7 +164,7 @@ public class InfiniteShadowVolumes extends Demo { private int curr_view = CAMERA_VIEW; private GLU glu = new GLU(); - private GLUTgl2 glut = new GLUTgl2(); + private GLUT glut = new GLUT(); private GLAutoDrawable drawable; private ExaminerViewer viewer; diff --git a/src/demos/vertexProgRefract/VertexProgRefract.java b/src/demos/vertexProgRefract/VertexProgRefract.java index 37f5d74..75078c6 100644 --- a/src/demos/vertexProgRefract/VertexProgRefract.java +++ b/src/demos/vertexProgRefract/VertexProgRefract.java @@ -33,7 +33,7 @@ package demos.vertexProgRefract; -import com.sun.opengl.util.glut.gl2.GLUTgl2; +import com.sun.opengl.util.gl2.GLUT; import com.sun.opengl.util.texture.Texture; import demos.common.Demo; import demos.common.DemoListener; @@ -124,7 +124,7 @@ public class VertexProgRefract extends Demo { private int obj; private GLU glu = new GLU(); - private GLUTgl2 glut = new GLUTgl2(); + private GLUT glut = new GLUT(); private GLAutoDrawable drawable; private ExaminerViewer viewer; |