diff options
author | Kenneth Russel <[email protected]> | 2009-03-19 06:39:55 +0000 |
---|---|---|
committer | Kenneth Russel <[email protected]> | 2009-03-19 06:39:55 +0000 |
commit | a7eb1864bcbb6203dcb50621fcd25c7452fb98cb (patch) | |
tree | 39bd035cd1c628d2e77ec7cae4bb90ca22a6161c /src/demos/es1/cube/Cube.java | |
parent | 4433fd7343f1161a4def7152cff68d3fb8fcbb5d (diff) |
Moved remaining portions of fixed function emulation out of core JOGL
public and implementation packages and into
com.sun.opengl.util.glsl.fixed.* and other subpackages of
com.sun.opengl.util. Renamed javax.media.opengl.sub.GLObject to
javax.media.opengl.GLBase. Moved interfaces in
javax.media.opengl.sub.fixed to javax.media.opengl.fixedfunc and
changed naming convention. Moved all classes in
javax.media.opengl.util to com.sun.opengl.util. Moved
com.sun.opengl.impl.packrect to com.sun.opengl.util.packrect. Renamed
InternalBufferUtils to InternalBufferUtil to match naming convention
and copied in needed routines for GLU and other classes. Fixed build
breakage when specifying rootrel.build property; reintroduced
build-temp directory. Updated demos.
git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/../svn-server-sync/jogl-demos/branches/JOGL_2_SANDBOX@324 3298f667-5e0e-4b4a-8ed4-a3559d26a5f4
Diffstat (limited to 'src/demos/es1/cube/Cube.java')
-rw-r--r-- | src/demos/es1/cube/Cube.java | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/demos/es1/cube/Cube.java b/src/demos/es1/cube/Cube.java index 59b4514..1d31527 100644 --- a/src/demos/es1/cube/Cube.java +++ b/src/demos/es1/cube/Cube.java @@ -33,10 +33,11 @@ package demos.es1.cube; import java.nio.*; import javax.media.opengl.*; -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 com.sun.javafx.newt.*; import com.sun.javafx.newt.opengl.*; @@ -75,7 +76,7 @@ public class Cube implements GLEventListener { } public void init(GLAutoDrawable drawable) { - GL2ES1 gl = GLFixedFuncUtil.getFixedFuncImpl(drawable.getGL()); + GL2ES1 gl = FixedFuncUtil.getFixedFuncImpl(drawable.getGL()); glu = GLU.createGLU(); |