Bug 682 - Relocating javax.media.opengl.* -> com.jogamp.opengl.* (Part 2)

Relocation javax.media.nativewindow.* -> com.jogamp.nativewindow.*
Relocation javax.media.opengl.* -> com.jogamp.opengl.*

4 files changed, 0 insertions, 351 deletions

diff --git a/src/jogl/classes/javax/media/opengl/fixedfunc/GLLightingFunc.java b/src/jogl/classes/javax/media/opengl/fixedfunc/GLLightingFunc.java
deleted file mode 100644
index cf7b9da46..000000000
--- a/src/jogl/classes/javax/media/opengl/fixedfunc/GLLightingFunc.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright 2009 Sun Microsystems, Inc. All Rights Reserved.
- * Copyright 2010 JogAmp Community. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification, are
- * permitted provided that the following conditions are met:
- *
- *    1. Redistributions of source code must retain the above copyright notice, this list of
- *       conditions and the following disclaimer.
- *
- *    2. Redistributions in binary form must reproduce the above copyright notice, this list
- *       of conditions and the following disclaimer in the documentation and/or other materials
- *       provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY JogAmp Community ``AS IS'' AND ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JogAmp Community OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * The views and conclusions contained in the software and documentation are those of the
- * authors and should not be interpreted as representing official policies, either expressed
- * or implied, of JogAmp Community.
- */
-
-package com.jogamp.opengl.fixedfunc;
-
-public interface GLLightingFunc {
-  public static final int GL_LIGHT0 = 0x4000;
-  public static final int GL_LIGHT1 = 0x4001;
-  public static final int GL_LIGHT2 = 0x4002;
-  public static final int GL_LIGHT3 = 0x4003;
-  public static final int GL_LIGHT4 = 0x4004;
-  public static final int GL_LIGHT5 = 0x4005;
-  public static final int GL_LIGHT6 = 0x4006;
-  public static final int GL_LIGHT7 = 0x4007;
-  public static final int GL_LIGHTING = 0xB50;
-  public static final int GL_AMBIENT = 0x1200;
-  public static final int GL_DIFFUSE = 0x1201;
-  public static final int GL_SPECULAR = 0x1202;
-  public static final int GL_POSITION = 0x1203;
-  public static final int GL_SPOT_DIRECTION = 0x1204;
-  public static final int GL_SPOT_EXPONENT = 0x1205;
-  public static final int GL_SPOT_CUTOFF = 0x1206;
-  public static final int GL_CONSTANT_ATTENUATION = 0x1207;
-  public static final int GL_LINEAR_ATTENUATION = 0x1208;
-  public static final int GL_QUADRATIC_ATTENUATION = 0x1209;
-  public static final int GL_EMISSION = 0x1600;
-  public static final int GL_SHININESS = 0x1601;
-  public static final int GL_AMBIENT_AND_DIFFUSE = 0x1602;
-  public static final int GL_COLOR_MATERIAL = 0xB57;
-  public static final int GL_NORMALIZE = 0xBA1;
-
-  public static final int GL_FLAT = 0x1D00;
-  public static final int GL_SMOOTH = 0x1D01;
-
-  public void glLightfv(int light, int pname, java.nio.FloatBuffer params);
-  public void glLightfv(int light, int pname, float[] params, int params_offset);
-  public void glMaterialf(int face, int pname, float param);
-  public void glMaterialfv(int face, int pname, java.nio.FloatBuffer params);
-  public void glMaterialfv(int face, int pname, float[] params, int params_offset);
-  public void glColor4f(float red, float green, float blue, float alpha);
-  public void glShadeModel(int mode);
-
-}
-
diff --git a/src/jogl/classes/javax/media/opengl/fixedfunc/GLMatrixFunc.java b/src/jogl/classes/javax/media/opengl/fixedfunc/GLMatrixFunc.java
deleted file mode 100644
index 90f13faf1..000000000
--- a/src/jogl/classes/javax/media/opengl/fixedfunc/GLMatrixFunc.java
+++ /dev/null
@@ -1,152 +0,0 @@
-/*
- * Copyright 2009 Sun Microsystems, Inc. All Rights Reserved.
- * Copyright 2010 JogAmp Community. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification, are
- * permitted provided that the following conditions are met:
- *
- *    1. Redistributions of source code must retain the above copyright notice, this list of
- *       conditions and the following disclaimer.
- *
- *    2. Redistributions in binary form must reproduce the above copyright notice, this list
- *       of conditions and the following disclaimer in the documentation and/or other materials
- *       provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY JogAmp Community ``AS IS'' AND ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JogAmp Community OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * The views and conclusions contained in the software and documentation are those of the
- * authors and should not be interpreted as representing official policies, either expressed
- * or implied, of JogAmp Community.
- */
-
-package com.jogamp.opengl.fixedfunc;
-
-import java.nio.*;
-
-import com.jogamp.opengl.GL;
-
-/**
- * Subset of OpenGL fixed function pipeline's matrix operations.
- */
-public interface GLMatrixFunc {
-
-    public static final int GL_MATRIX_MODE = 0x0BA0;
-    /** Matrix mode modelview */
-    public static final int GL_MODELVIEW = 0x1700;
-    /** Matrix mode projection */
-    public static final int GL_PROJECTION = 0x1701;
-    // public static final int GL_TEXTURE = 0x1702; // Use GL.GL_TEXTURE due to ambiguous GL usage
-    /** Matrix access name for modelview */
-    public static final int GL_MODELVIEW_MATRIX = 0x0BA6;
-    /** Matrix access name for projection */
-    public static final int GL_PROJECTION_MATRIX = 0x0BA7;
-    /** Matrix access name for texture */
-    public static final int GL_TEXTURE_MATRIX = 0x0BA8;
-
-    /**
-     * Copy the named matrix into the given storage.
-     * @param pname {@link #GL_MODELVIEW_MATRIX}, {@link #GL_PROJECTION_MATRIX} or {@link #GL_TEXTURE_MATRIX}
-     * @param params the FloatBuffer's position remains unchanged,
-     *        which is the same behavior than the native JOGL GL impl
-     */
-    public void glGetFloatv(int pname, java.nio.FloatBuffer params);
-
-    /**
-     * Copy the named matrix to the given storage at offset.
-     * @param pname {@link #GL_MODELVIEW_MATRIX}, {@link #GL_PROJECTION_MATRIX} or {@link #GL_TEXTURE_MATRIX}
-     * @param params storage
-     * @param params_offset storage offset
-     */
-    public void glGetFloatv(int pname, float[] params, int params_offset);
-
-    /**
-     * glGetIntegerv
-     * @param pname {@link #GL_MATRIX_MODE} to receive the current matrix mode
-     * @param params the FloatBuffer's position remains unchanged
-     *        which is the same behavior than the native JOGL GL impl
-     */
-    public void glGetIntegerv(int pname, IntBuffer params);
-    public void glGetIntegerv(int pname, int[] params, int params_offset);
-
-    /**
-     * Sets the current matrix mode.
-     * @param mode {@link #GL_MODELVIEW}, {@link #GL_PROJECTION} or {@link GL#GL_TEXTURE GL_TEXTURE}.
-     */
-    public void glMatrixMode(int mode) ;
-
-    /**
-     * Push the current matrix to it's stack, while preserving it's values.
-     * <p>
-     * There exist one stack per matrix mode, i.e. {@link #GL_MODELVIEW}, {@link #GL_PROJECTION} and {@link GL#GL_TEXTURE GL_TEXTURE}.
-     * </p>
-     */
-    public void glPushMatrix();
-
-    /**
-     * Pop the current matrix from it's stack.
-     * @see #glPushMatrix()
-     */
-    public void glPopMatrix();
-
-    /**
-     * Load the current matrix with the identity matrix
-     */
-    public void glLoadIdentity() ;
-
-    /**
-     * Load the current matrix w/ the provided one.
-     * @param params the FloatBuffer's position remains unchanged,
-     *        which is the same behavior than the native JOGL GL impl
-     */
-    public void glLoadMatrixf(java.nio.FloatBuffer m) ;
-    /**
-     * Load the current matrix w/ the provided one.
-     */
-    public void glLoadMatrixf(float[] m, int m_offset);
-
-    /**
-     * Multiply the current matrix: [c] = [c] x [m]
-     * @param m the FloatBuffer's position remains unchanged,
-     *        which is the same behavior than the native JOGL GL impl
-     */
-    public void glMultMatrixf(java.nio.FloatBuffer m) ;
-    /**
-     * Multiply the current matrix: [c] = [c] x [m]
-     */
-    public void glMultMatrixf(float[] m, int m_offset);
-
-    /**
-     * Translate the current matrix.
-     */
-    public void glTranslatef(float x, float y, float z) ;
-
-    /**
-     * Rotate the current matrix.
-     */
-    public void glRotatef(float angle, float x, float y, float z);
-
-    /**
-     * Scale the current matrix.
-     */
-    public void glScalef(float x, float y, float z) ;
-
-    /**
-     * {@link #glMultMatrixf(FloatBuffer) Multiply} the current matrix with the orthogonal matrix.
-     */
-    public void glOrthof(float left, float right, float bottom, float top, float zNear, float zFar) ;
-
-    /**
-     * {@link #glMultMatrixf(FloatBuffer) Multiply} the current matrix with the frustum matrix.
-     */
-    public void glFrustumf(float left, float right, float bottom, float top, float zNear, float zFar);
-
-}
-
diff --git a/src/jogl/classes/javax/media/opengl/fixedfunc/GLPointerFunc.java b/src/jogl/classes/javax/media/opengl/fixedfunc/GLPointerFunc.java
deleted file mode 100644
index 852d4ebba..000000000
--- a/src/jogl/classes/javax/media/opengl/fixedfunc/GLPointerFunc.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright 2009 Sun Microsystems, Inc. All Rights Reserved.
- * Copyright 2010 JogAmp Community. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification, are
- * permitted provided that the following conditions are met:
- *
- *    1. Redistributions of source code must retain the above copyright notice, this list of
- *       conditions and the following disclaimer.
- *
- *    2. Redistributions in binary form must reproduce the above copyright notice, this list
- *       of conditions and the following disclaimer in the documentation and/or other materials
- *       provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY JogAmp Community ``AS IS'' AND ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JogAmp Community OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * The views and conclusions contained in the software and documentation are those of the
- * authors and should not be interpreted as representing official policies, either expressed
- * or implied, of JogAmp Community.
- */
-
-package com.jogamp.opengl.fixedfunc;
-
-import com.jogamp.opengl.*;
-
-public interface GLPointerFunc {
-  public static final int GL_VERTEX_ARRAY = 0x8074;
-  public static final int GL_NORMAL_ARRAY = 0x8075;
-  public static final int GL_COLOR_ARRAY = 0x8076;
-  public static final int GL_TEXTURE_COORD_ARRAY = 0x8078;
-
-  public void glEnableClientState(int arrayName);
-  public void glDisableClientState(int arrayName);
-
-  public void glVertexPointer(GLArrayData array);
-  public void glVertexPointer(int size, int type, int stride, java.nio.Buffer pointer);
-  public void glVertexPointer(int size, int type, int stride, long pointer_buffer_offset);
-
-  public void glColorPointer(GLArrayData array);
-  public void glColorPointer(int size, int type, int stride, java.nio.Buffer pointer);
-  public void glColorPointer(int size, int type, int stride, long pointer_buffer_offset);
-  public void glColor4f(float red, float green, float blue, float alpha);
-
-  public void glNormalPointer(GLArrayData array);
-  public void glNormalPointer(int type, int stride, java.nio.Buffer pointer);
-  public void glNormalPointer(int type, int stride, long pointer_buffer_offset);
-
-  public void glTexCoordPointer(GLArrayData array);
-  public void glTexCoordPointer(int size, int type, int stride, java.nio.Buffer pointer);
-  public void glTexCoordPointer(int size, int type, int stride, long pointer_buffer_offset);
-
-}
-
diff --git a/src/jogl/classes/javax/media/opengl/fixedfunc/GLPointerFuncUtil.java b/src/jogl/classes/javax/media/opengl/fixedfunc/GLPointerFuncUtil.java
deleted file mode 100644
index cb1ff3827..000000000
--- a/src/jogl/classes/javax/media/opengl/fixedfunc/GLPointerFuncUtil.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright 2011 JogAmp Community. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification, are
- * permitted provided that the following conditions are met:
- *
- *    1. Redistributions of source code must retain the above copyright notice, this list of
- *       conditions and the following disclaimer.
- *
- *    2. Redistributions in binary form must reproduce the above copyright notice, this list
- *       of conditions and the following disclaimer in the documentation and/or other materials
- *       provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY JogAmp Community ``AS IS'' AND ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JogAmp Community OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * The views and conclusions contained in the software and documentation are those of the
- * authors and should not be interpreted as representing official policies, either expressed
- * or implied, of JogAmp Community.
- */
-
-package com.jogamp.opengl.fixedfunc;
-
-public class GLPointerFuncUtil {
-    public static final String mgl_Vertex = "mgl_Vertex";
-    public static final String mgl_Normal = "mgl_Normal";
-    public static final String mgl_Color = "mgl_Color";
-    public static final String mgl_MultiTexCoord = "mgl_MultiTexCoord" ;
-    public static final String mgl_InterleaveArray = "mgl_InterleaveArray" ; // magic name for interleaved arrays w/ sub-arrays
-
-    /**
-     * @param glArrayIndex the fixed function array index
-     * @return default fixed function array name
-     */
-    public static String getPredefinedArrayIndexName(final int glArrayIndex) {
-        return getPredefinedArrayIndexName(glArrayIndex, -1);
-    }
-
-    /**
-     * @param glArrayIndex the fixed function array index
-     * @param multiTexCoordIndex index for multiTexCoordIndex
-     * @return default fixed function array name
-     */
-    public static String getPredefinedArrayIndexName(final int glArrayIndex, final int multiTexCoordIndex) {
-        switch(glArrayIndex) {
-            case GLPointerFunc.GL_VERTEX_ARRAY:
-                return mgl_Vertex;
-            case GLPointerFunc.GL_NORMAL_ARRAY:
-                return mgl_Normal;
-            case GLPointerFunc.GL_COLOR_ARRAY:
-                return mgl_Color;
-            case GLPointerFunc.GL_TEXTURE_COORD_ARRAY:
-                if(0<=multiTexCoordIndex) {
-                    return mgl_MultiTexCoord+multiTexCoordIndex;
-                } else {
-                    return mgl_MultiTexCoord+multiTexCoordIndex;
-                }
-        }
-        return null;
-    }
-}