From a7eb1864bcbb6203dcb50621fcd25c7452fb98cb Mon Sep 17 00:00:00 2001 From: Kenneth Russel Date: Thu, 19 Mar 2009 06:39:55 +0000 Subject: 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 --- src/demos/es2/openmax/Cube.java | 9 +++++---- src/demos/es2/openmax/MovieCube.java | 4 ++-- 2 files changed, 7 insertions(+), 6 deletions(-) (limited to 'src/demos/es2/openmax') diff --git a/src/demos/es2/openmax/Cube.java b/src/demos/es2/openmax/Cube.java index d993522..58d9626 100644 --- a/src/demos/es2/openmax/Cube.java +++ b/src/demos/es2/openmax/Cube.java @@ -31,11 +31,12 @@ */ package demos.es2.openmax; +import java.nio.*; import javax.media.opengl.*; -import javax.media.opengl.sub.fixed.*; -import javax.media.opengl.util.*; import javax.media.opengl.glu.*; -import java.nio.*; + +import com.sun.opengl.util.*; +import com.sun.opengl.util.glsl.fixedfunc.*; import com.sun.javafx.newt.*; import com.sun.javafx.newt.opengl.*; @@ -91,7 +92,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(); diff --git a/src/demos/es2/openmax/MovieCube.java b/src/demos/es2/openmax/MovieCube.java index 94e4044..4655074 100755 --- a/src/demos/es2/openmax/MovieCube.java +++ b/src/demos/es2/openmax/MovieCube.java @@ -37,7 +37,7 @@ package demos.es2.openmax; import javax.media.opengl.*; import javax.media.opengl.util.*; -import javax.media.opengl.sub.fixed.*; +import com.sun.opengl.util.glsl.fixedfunc.*; import com.sun.openmax.*; @@ -123,7 +123,7 @@ public class MovieCube implements MouseListener, GLEventListener, OMXEventListen } public void init(GLAutoDrawable drawable) { - GL2ES1 gl = GLFixedFuncUtil.getFixedFuncImpl(drawable.getGL()); + GL2ES1 gl = FixedFuncUtil.getFixedFuncImpl(drawable.getGL()); System.out.println(gl); gl.glGetError(); // flush error .. -- cgit v1.2.3