diff --git a/src/java/org/lwjgl/opengl/OpenGLException.java b/src/java/org/lwjgl/opengl/OpenGLException.java index 4b5b2027..39c53b6d 100644 --- a/src/java/org/lwjgl/opengl/OpenGLException.java +++ b/src/java/org/lwjgl/opengl/OpenGLException.java @@ -31,8 +31,6 @@ */ package org.lwjgl.opengl; -import org.lwjgl.opengl.glu.GLU; - /** *

* Thrown by the debug build library of the LWJGL if any OpenGL operation causes an error. @@ -51,7 +49,7 @@ public class OpenGLException extends RuntimeException { } private static String createErrorMessage(int gl_error_code) { - String error_string = GLU.gluErrorString(gl_error_code); + String error_string = Util.translateGLErrorString(gl_error_code); return error_string + " (" + gl_error_code + ")"; } diff --git a/src/java/org/lwjgl/test/input/HWCursorTest.java b/src/java/org/lwjgl/test/input/HWCursorTest.java index 9dfd6fe4..764dec83 100644 --- a/src/java/org/lwjgl/test/input/HWCursorTest.java +++ b/src/java/org/lwjgl/test/input/HWCursorTest.java @@ -41,7 +41,7 @@ import org.lwjgl.input.Mouse; import org.lwjgl.opengl.Display; import org.lwjgl.opengl.DisplayMode; import org.lwjgl.opengl.GL11; -import org.lwjgl.opengl.glu.GLU; +import org.lwjgl.util.glu.GLU; /** * diff --git a/src/java/org/lwjgl/test/openal/PositionTest.java b/src/java/org/lwjgl/test/openal/PositionTest.java index e685432e..24515a0a 100644 --- a/src/java/org/lwjgl/test/openal/PositionTest.java +++ b/src/java/org/lwjgl/test/openal/PositionTest.java @@ -42,7 +42,7 @@ import org.lwjgl.openal.AL; import org.lwjgl.openal.AL10; import org.lwjgl.opengl.Display; import org.lwjgl.opengl.GL11; -import org.lwjgl.opengl.glu.GLU; +import org.lwjgl.util.glu.GLU; import org.lwjgl.util.WaveData; /** diff --git a/src/java/org/lwjgl/test/opengl/FullScreenWindowedTest.java b/src/java/org/lwjgl/test/opengl/FullScreenWindowedTest.java index 8af0a4a8..d727a99d 100644 --- a/src/java/org/lwjgl/test/opengl/FullScreenWindowedTest.java +++ b/src/java/org/lwjgl/test/opengl/FullScreenWindowedTest.java @@ -36,7 +36,7 @@ import org.lwjgl.input.Keyboard; import org.lwjgl.opengl.Display; import org.lwjgl.opengl.DisplayMode; import org.lwjgl.opengl.GL11; -import org.lwjgl.opengl.glu.GLU; +import org.lwjgl.util.glu.GLU; import org.lwjgl.util.vector.Vector2f; /** diff --git a/src/java/org/lwjgl/test/opengl/PbufferTest.java b/src/java/org/lwjgl/test/opengl/PbufferTest.java index c76d164a..0ad9d3ba 100644 --- a/src/java/org/lwjgl/test/opengl/PbufferTest.java +++ b/src/java/org/lwjgl/test/opengl/PbufferTest.java @@ -42,7 +42,7 @@ import org.lwjgl.opengl.DisplayMode; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.Pbuffer; import org.lwjgl.opengl.PixelFormat; -import org.lwjgl.opengl.glu.GLU; +import org.lwjgl.util.glu.GLU; import org.lwjgl.util.vector.Vector2f; /** diff --git a/src/java/org/lwjgl/test/opengl/VBOIndexTest.java b/src/java/org/lwjgl/test/opengl/VBOIndexTest.java index a9e7c9cb..c3ae6243 100644 --- a/src/java/org/lwjgl/test/opengl/VBOIndexTest.java +++ b/src/java/org/lwjgl/test/opengl/VBOIndexTest.java @@ -55,7 +55,7 @@ import org.lwjgl.opengl.Display; import org.lwjgl.opengl.DisplayMode; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GLContext; -import org.lwjgl.opengl.glu.GLU; +import org.lwjgl.util.glu.GLU; public final class VBOIndexTest { diff --git a/src/java/org/lwjgl/test/opengl/VBOTest.java b/src/java/org/lwjgl/test/opengl/VBOTest.java index 020b73a4..47000fc8 100644 --- a/src/java/org/lwjgl/test/opengl/VBOTest.java +++ b/src/java/org/lwjgl/test/opengl/VBOTest.java @@ -55,7 +55,7 @@ import org.lwjgl.opengl.Display; import org.lwjgl.opengl.DisplayMode; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GLContext; -import org.lwjgl.opengl.glu.GLU; +import org.lwjgl.util.glu.GLU; public final class VBOTest { diff --git a/src/java/org/lwjgl/test/opengl/awt/AWTTest.java b/src/java/org/lwjgl/test/opengl/awt/AWTTest.java index f3229270..cdd6eb54 100644 --- a/src/java/org/lwjgl/test/opengl/awt/AWTTest.java +++ b/src/java/org/lwjgl/test/opengl/awt/AWTTest.java @@ -39,7 +39,7 @@ import java.awt.event.WindowEvent; import org.lwjgl.LWJGLException; import org.lwjgl.opengl.AWTGLCanvas; import org.lwjgl.opengl.GL11; -import org.lwjgl.opengl.glu.GLU; +import org.lwjgl.util.glu.GLU; /** *

diff --git a/src/java/org/lwjgl/test/opengl/pbuffers/PbufferTest.java b/src/java/org/lwjgl/test/opengl/pbuffers/PbufferTest.java index a6bc16e7..b4b8368d 100644 --- a/src/java/org/lwjgl/test/opengl/pbuffers/PbufferTest.java +++ b/src/java/org/lwjgl/test/opengl/pbuffers/PbufferTest.java @@ -41,7 +41,7 @@ import org.lwjgl.opengl.DisplayMode; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.Pbuffer; import org.lwjgl.opengl.PixelFormat; -import org.lwjgl.opengl.glu.GLU; +import org.lwjgl.util.glu.GLU; import org.lwjgl.util.vector.Vector2f; /** diff --git a/src/java/org/lwjgl/test/opengl/shaders/ShadersTest.java b/src/java/org/lwjgl/test/opengl/shaders/ShadersTest.java index d4c76241..696ae99c 100644 --- a/src/java/org/lwjgl/test/opengl/shaders/ShadersTest.java +++ b/src/java/org/lwjgl/test/opengl/shaders/ShadersTest.java @@ -50,8 +50,8 @@ import org.lwjgl.opengl.DisplayMode; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GLContext; import org.lwjgl.opengl.PixelFormat; -import org.lwjgl.opengl.glu.GLU; -import org.lwjgl.opengl.glu.Sphere; +import org.lwjgl.util.glu.GLU; +import org.lwjgl.util.glu.Sphere; public final class ShadersTest { diff --git a/src/java/org/lwjgl/opengl/glu/Cylinder.java b/src/java/org/lwjgl/util/glu/Cylinder.java similarity index 99% rename from src/java/org/lwjgl/opengl/glu/Cylinder.java rename to src/java/org/lwjgl/util/glu/Cylinder.java index 07e7212b..b878143a 100644 --- a/src/java/org/lwjgl/opengl/glu/Cylinder.java +++ b/src/java/org/lwjgl/util/glu/Cylinder.java @@ -29,7 +29,7 @@ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.lwjgl.opengl.glu; +package org.lwjgl.util.glu; import org.lwjgl.opengl.GL11; diff --git a/src/java/org/lwjgl/opengl/glu/Disk.java b/src/java/org/lwjgl/util/glu/Disk.java similarity index 99% rename from src/java/org/lwjgl/opengl/glu/Disk.java rename to src/java/org/lwjgl/util/glu/Disk.java index 671c0532..2536bc70 100644 --- a/src/java/org/lwjgl/opengl/glu/Disk.java +++ b/src/java/org/lwjgl/util/glu/Disk.java @@ -29,7 +29,7 @@ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.lwjgl.opengl.glu; +package org.lwjgl.util.glu; import org.lwjgl.opengl.GL11; diff --git a/src/java/org/lwjgl/opengl/glu/GLU.java b/src/java/org/lwjgl/util/glu/GLU.java similarity index 99% rename from src/java/org/lwjgl/opengl/glu/GLU.java rename to src/java/org/lwjgl/util/glu/GLU.java index 70a88803..40644208 100644 --- a/src/java/org/lwjgl/opengl/glu/GLU.java +++ b/src/java/org/lwjgl/util/glu/GLU.java @@ -29,7 +29,7 @@ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.lwjgl.opengl.glu; +package org.lwjgl.util.glu; import java.nio.ByteBuffer; diff --git a/src/java/org/lwjgl/opengl/glu/MipMap.java b/src/java/org/lwjgl/util/glu/MipMap.java similarity index 99% rename from src/java/org/lwjgl/opengl/glu/MipMap.java rename to src/java/org/lwjgl/util/glu/MipMap.java index 4f93abc8..40034f01 100644 --- a/src/java/org/lwjgl/opengl/glu/MipMap.java +++ b/src/java/org/lwjgl/util/glu/MipMap.java @@ -29,7 +29,7 @@ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.lwjgl.opengl.glu; +package org.lwjgl.util.glu; import java.nio.ByteBuffer; diff --git a/src/java/org/lwjgl/opengl/glu/PartialDisk.java b/src/java/org/lwjgl/util/glu/PartialDisk.java similarity index 99% rename from src/java/org/lwjgl/opengl/glu/PartialDisk.java rename to src/java/org/lwjgl/util/glu/PartialDisk.java index 8e8f1423..c135cbd4 100644 --- a/src/java/org/lwjgl/opengl/glu/PartialDisk.java +++ b/src/java/org/lwjgl/util/glu/PartialDisk.java @@ -29,7 +29,7 @@ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.lwjgl.opengl.glu; +package org.lwjgl.util.glu; import org.lwjgl.opengl.GL11; diff --git a/src/java/org/lwjgl/opengl/glu/PixelStoreState.java b/src/java/org/lwjgl/util/glu/PixelStoreState.java similarity index 99% rename from src/java/org/lwjgl/opengl/glu/PixelStoreState.java rename to src/java/org/lwjgl/util/glu/PixelStoreState.java index d444b932..38d7a80f 100644 --- a/src/java/org/lwjgl/opengl/glu/PixelStoreState.java +++ b/src/java/org/lwjgl/util/glu/PixelStoreState.java @@ -29,7 +29,7 @@ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.lwjgl.opengl.glu; +package org.lwjgl.util.glu; import org.lwjgl.opengl.GL11; diff --git a/src/java/org/lwjgl/opengl/glu/Project.java b/src/java/org/lwjgl/util/glu/Project.java similarity index 99% rename from src/java/org/lwjgl/opengl/glu/Project.java rename to src/java/org/lwjgl/util/glu/Project.java index 759a820d..536c40f1 100644 --- a/src/java/org/lwjgl/opengl/glu/Project.java +++ b/src/java/org/lwjgl/util/glu/Project.java @@ -29,7 +29,7 @@ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.lwjgl.opengl.glu; +package org.lwjgl.util.glu; import java.nio.FloatBuffer; diff --git a/src/java/org/lwjgl/opengl/glu/Quadric.java b/src/java/org/lwjgl/util/glu/Quadric.java similarity index 99% rename from src/java/org/lwjgl/opengl/glu/Quadric.java rename to src/java/org/lwjgl/util/glu/Quadric.java index 1640e834..40faccf2 100644 --- a/src/java/org/lwjgl/opengl/glu/Quadric.java +++ b/src/java/org/lwjgl/util/glu/Quadric.java @@ -29,7 +29,7 @@ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.lwjgl.opengl.glu; +package org.lwjgl.util.glu; import org.lwjgl.opengl.GL11; diff --git a/src/java/org/lwjgl/opengl/glu/Registry.java b/src/java/org/lwjgl/util/glu/Registry.java similarity index 98% rename from src/java/org/lwjgl/opengl/glu/Registry.java rename to src/java/org/lwjgl/util/glu/Registry.java index d22eb586..2ec1f962 100644 --- a/src/java/org/lwjgl/opengl/glu/Registry.java +++ b/src/java/org/lwjgl/util/glu/Registry.java @@ -29,7 +29,7 @@ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.lwjgl.opengl.glu; +package org.lwjgl.util.glu; /** * Registry.java diff --git a/src/java/org/lwjgl/opengl/glu/Sphere.java b/src/java/org/lwjgl/util/glu/Sphere.java similarity index 99% rename from src/java/org/lwjgl/opengl/glu/Sphere.java rename to src/java/org/lwjgl/util/glu/Sphere.java index 7093dbae..9b0ef397 100644 --- a/src/java/org/lwjgl/opengl/glu/Sphere.java +++ b/src/java/org/lwjgl/util/glu/Sphere.java @@ -29,7 +29,7 @@ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.lwjgl.opengl.glu; +package org.lwjgl.util.glu; import org.lwjgl.opengl.GL11; diff --git a/src/java/org/lwjgl/opengl/glu/Util.java b/src/java/org/lwjgl/util/glu/Util.java similarity index 99% rename from src/java/org/lwjgl/opengl/glu/Util.java rename to src/java/org/lwjgl/util/glu/Util.java index 3572557f..2694a9f2 100644 --- a/src/java/org/lwjgl/opengl/glu/Util.java +++ b/src/java/org/lwjgl/util/glu/Util.java @@ -29,7 +29,7 @@ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.lwjgl.opengl.glu; +package org.lwjgl.util.glu; import java.nio.IntBuffer;