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/branches/JOGL_2_SANDBOX@1886 232f8b59-042b-4e1e-8c03-345bb8c30851

1 files changed, 0 insertions, 60 deletions

diff --git a/src/jogl/classes/javax/media/opengl/GLContext.java b/src/jogl/classes/javax/media/opengl/GLContext.java
index 78252b4e8..5a4631560 100644
--- a/src/jogl/classes/javax/media/opengl/GLContext.java
+++ b/src/jogl/classes/javax/media/opengl/GLContext.java
@@ -40,7 +40,6 @@
 package javax.media.opengl;
 
 import com.sun.opengl.impl.Debug;
-import javax.media.opengl.sub.fixed.*;
 import java.util.HashMap;
 
 /** Abstraction for an OpenGL rendering context. In order to perform
@@ -229,63 +228,4 @@ public abstract class GLContext {
       GLX) extensions. Can only be called while this context is
       current. */
   public abstract String getPlatformExtensionsString();
-
-  /**
-   * Mapping fixed function (client) array indices to 
-   * GLSL array attribute names.
-   *
-   * Useful for uniq mapping of canonical array index names as listed.
-   * 
-   * @see #mgl_Vertex
-   * @see javax.media.opengl.sub.fixed.GLPointerIf#GL_VERTEX_ARRAY
-   * @see #mgl_Normal
-   * @see javax.media.opengl.sub.fixed.GLPointerIf#GL_NORMAL_ARRAY
-   * @see #mgl_Color
-   * @see javax.media.opengl.sub.fixed.GLPointerIf#GL_COLOR_ARRAY
-   * @see #mgl_MultiTexCoord
-   * @see javax.media.opengl.sub.fixed.GLPointerIf#GL_TEXTURE_COORD_ARRAY
-   * @see javax.media.opengl.sub.fixed.GLPointerIf#glEnableClientState
-   * @see javax.media.opengl.sub.fixed.GLPointerIf#glVertexPointer
-   * @see javax.media.opengl.sub.fixed.GLPointerIf#glColorPointer
-   * @see javax.media.opengl.sub.fixed.GLPointerIf#glNormalPointer
-   * @see javax.media.opengl.sub.fixed.GLPointerIf#glTexCoordPointer
-   */
-  public static String getPredefinedArrayIndexName(int glArrayIndex) {
-    switch(glArrayIndex) {
-        case GLPointerIf.GL_VERTEX_ARRAY:
-            return mgl_Vertex;
-        case GLPointerIf.GL_NORMAL_ARRAY:
-            return mgl_Normal;
-        case GLPointerIf.GL_COLOR_ARRAY:
-            return mgl_Color;
-        case GLPointerIf.GL_TEXTURE_COORD_ARRAY:
-            return mgl_MultiTexCoord;
-    }
-    return null;
-  }
-
-  /**
-   * String name for
-   * @see javax.media.opengl.GL#GL_VERTEX_ARRAY
-   */
-  public static final String mgl_Vertex = "mgl_Vertex";
-
-  /**
-   * String name for
-   * @see javax.media.opengl.GL#GL_NORMAL_ARRAY
-   */
-  public static final String mgl_Normal = "mgl_Normal";
-
-  /**
-   * String name for
-   * @see javax.media.opengl.GL#GL_COLOR_ARRAY
-   */
-  public static final String mgl_Color = "mgl_Color";
-
-  /**
-   * String name for
-   * @see javax.media.opengl.GL#GL_TEXTURE_COORD_ARRAY
-   */
-  public static final String mgl_MultiTexCoord = "mgl_MultiTexCoord" ;
-
 }