diff options
| author | Kenneth Russel <[email protected]> | 2008-12-30 19:14:53 +0000 |
|---|---|---|
| committer | Kenneth Russel <[email protected]> | 2008-12-30 19:14:53 +0000 |
| commit | 573668cfbd73f5f12990d0919795bd5286535d49 (patch) | |
| tree | d57d8f8197317a8e49d073c7bce33949153fd36c /src/demos/context | |
| parent | 1d405f769aa58c2987c01f5fbbdddca695e8a7e2 (diff) | |
Moved GLUT into com.sun.opengl.util.gl2 package and renamed to JOGL
1.0 naming convention. Moved associated font classes into same package
and made them package-private again to reduce the number of classes in
the public API. Updated demos.
git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/../svn-server-sync/jogl-demos/branches/JOGL_2_SANDBOX@310 3298f667-5e0e-4b4a-8ed4-a3559d26a5f4
Diffstat (limited to 'src/demos/context')
| -rwxr-xr-x | src/demos/context/DualContext.java | 10 |
1 files changed, 5 insertions, 5 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) { |