|
From: Elias N. <eli...@us...> - 2004-03-27 15:16:33
|
Update of /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3234/src/java/org/lwjgl/opengl Modified Files: Pbuffer.java Window.java Log Message: Renamed LWJGLErrorException to LWJGLException Index: Pbuffer.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/Pbuffer.java,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- Pbuffer.java 27 Mar 2004 14:42:46 -0000 1.14 +++ Pbuffer.java 27 Mar 2004 15:05:23 -0000 1.15 @@ -33,7 +33,7 @@ package org.lwjgl.opengl; import org.lwjgl.Sys; -import org.lwjgl.LWJGLErrorException; +import org.lwjgl.LWJGLException; import java.nio.IntBuffer; @@ -160,7 +160,7 @@ } /** - * Construct an instance of a Pbuffer. If this fails then an LWJGLErrorException will be thrown. The buffer is single-buffered. + * Construct an instance of a Pbuffer. If this fails then an LWJGLException will be thrown. The buffer is single-buffered. * <p/> * NOTE: An OpenGL window must be created before a Pbuffer can be created. The Pbuffer will have its own context that shares * display lists and textures with the OpenGL window context, but it will have its own OpenGL state. Therefore, state changes @@ -183,7 +183,7 @@ * 0 to disable multisampling. This parameter is ignored if GL_ARB_multisample is not supported. * @param renderTexture */ - public Pbuffer(int width, int height, int bpp, int alpha, int depth, int stencil, int samples, RenderTexture renderTexture) throws LWJGLErrorException { + public Pbuffer(int width, int height, int bpp, int alpha, int depth, int stencil, int samples, RenderTexture renderTexture) throws LWJGLException { this.width = width; this.height = height; @@ -241,7 +241,7 @@ int bpp, int alpha, int depth, int stencil, int samples, IntBuffer pixelFormatCaps, int pixelFormatCapsSize, - IntBuffer pBufferAttribs, int pBufferAttribsSize) throws LWJGLErrorException; + IntBuffer pBufferAttribs, int pBufferAttribsSize) throws LWJGLException; /** * Destroys the Pbuffer. After this call, there will be no valid GL rendering context - regardless of whether this Pbuffer was Index: Window.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/Window.java,v retrieving revision 1.34 retrieving revision 1.35 diff -u -d -r1.34 -r1.35 --- Window.java 27 Mar 2004 14:42:46 -0000 1.34 +++ Window.java 27 Mar 2004 15:05:23 -0000 1.35 @@ -52,7 +52,7 @@ import org.lwjgl.input.Controller; import org.lwjgl.input.Keyboard; import org.lwjgl.input.Mouse; -import org.lwjgl.LWJGLErrorException; +import org.lwjgl.LWJGLException; public final class Window { @@ -287,33 +287,33 @@ * buffer, probably no alpha buffer, and probably no multisampling. * <p>The window created will be set up in orthographic 2D projection, with 1:1 pixel ratio with GL coordinates. * @param title - * @throws LWJGLErrorException + * @throws LWJGLException */ - public static void create(String title) throws LWJGLErrorException { + public static void create(String title) throws LWJGLException { create(title, Display.getDepth(), 0, 16, 8, 0); } /** * Create a fullscreen window. If the underlying OS does not * support fullscreen mode, then a window will be created instead. If this - * fails too then an LWJGLErrorException will be thrown. + * fails too then an LWJGLException will be thrown. * <p>The window created will be set up in orthographic 2D projection, with 1:1 pixel ratio with GL coordinates. * @param title The title of the window * @param bpp Minimum bits per pixel * @param alpha Minimum bits per pixel in alpha buffer * @param depth Minimum bits per pixel in depth buffer * @param stencil Minimum bits per pixel in stencil buffer - * @throws LWJGLErrorException if the window could not be created for any reason; typically because + * @throws LWJGLException if the window could not be created for any reason; typically because * the minimum requirements could not be met satisfactorily */ - public static void create(String title, int bpp, int alpha, int depth, int stencil) throws LWJGLErrorException { + public static void create(String title, int bpp, int alpha, int depth, int stencil) throws LWJGLException { create(title, bpp, alpha, depth, stencil, 0); } /** * Create a fullscreen window. If the underlying OS does not * support fullscreen mode, then a window will be created instead. If this - * fails too then an LWJGLErrorException will be thrown. + * fails too then an LWJGLException will be thrown. * <p>The window created will be set up in orthographic 2D projection, with 1:1 pixel ratio with GL coordinates. * @param title The title of the window * @param bpp Minimum bits per pixel @@ -322,10 +322,10 @@ * @param stencil Minimum bits per pixel in stencil buffer * @param samples Minimum samples in multisample buffer (corresponds to GL_SAMPLES_ARB in GL_ARB_multisample spec). Pass 0 to disable multisampling. This parameter is ignored if GL_ARB_multisample is not supported. - * @throws LWJGLErrorException if the window could not be created for any reason; typically because + * @throws LWJGLException if the window could not be created for any reason; typically because * the minimum requirements could not be met satisfactorily */ - public static void create(String title, int bpp, int alpha, int depth, int stencil, int samples) throws LWJGLErrorException { + public static void create(String title, int bpp, int alpha, int depth, int stencil, int samples) throws LWJGLException { if (isCreated()) throw new IllegalStateException("Only one LWJGL window may be instantiated at any one time."); Window.fullscreen = true; @@ -339,7 +339,7 @@ /** * Create a window. If the underlying OS does not have "floating" windows, then a fullscreen - * display will be created instead. If this fails too then an LWJGLErrorException will be thrown. + * display will be created instead. If this fails too then an LWJGLException will be thrown. * If the window is created fullscreen, then its size may not match the specified size * here. * <p>The window created will be set up in orthographic 2D projection, with 1:1 pixel ratio with GL coordinates. @@ -353,16 +353,16 @@ * @param depth Minimum bits per pixel in depth buffer * @param samples Minimum samples in multisample buffer (corresponds to GL_SAMPLES_ARB in GL_ARB_multisample spec). Pass 0 to disable multisampling. This parameter is ignored if GL_ARB_multisample is not supported. - * @throws LWJGLErrorException if the window could not be created for any reason; typically because + * @throws LWJGLException if the window could not be created for any reason; typically because * the minimum requirements could not be met satisfactorily */ - public static void create(String title, int x, int y, int width, int height, int bpp, int alpha, int depth, int stencil) throws LWJGLErrorException { + public static void create(String title, int x, int y, int width, int height, int bpp, int alpha, int depth, int stencil) throws LWJGLException { create(title, x, y, width, height, bpp, alpha, depth, stencil, 0); } /** * Create a window. If the underlying OS does not have "floating" windows, then a fullscreen - * display will be created instead. If this fails too then an LWJGLErrorException will be thrown. + * display will be created instead. If this fails too then an LWJGLException will be thrown. * If the window is created fullscreen, then its size may not match the specified size * here. * <p>The window created will be set up in orthographic 2D projection, with 1:1 pixel ratio with GL coordinates. @@ -377,11 +377,11 @@ * @param stencil Minimum bits per pixel in stencil buffer * @param samples Minimum samples in multisample buffer (corresponds to GL_SAMPLES_ARB in GL_ARB_multisample spec). Pass 0 to disable multisampling. This parameter is ignored if GL_ARB_multisample is not supported. - * @throws LWJGLErrorException if the window could not be created for any reason; typically because + * @throws LWJGLException if the window could not be created for any reason; typically because * the minimum requirements could not be met satisfactorily */ public static void create(String title, int x, int y, int width, int height, int bpp, int alpha, int depth, int stencil, int samples) - throws LWJGLErrorException { + throws LWJGLException { if (isCreated()) throw new IllegalStateException("Only one LWJGL window may be instantiated at any one time."); Window.fullscreen = false; @@ -395,7 +395,7 @@ /** * Create the native window peer. - * @throws LWJGLErrorException + * @throws LWJGLException */ private static native void nCreate( String title, @@ -409,9 +409,9 @@ int depth, int stencil, int samples) - throws LWJGLErrorException; + throws LWJGLException; - private static void createWindow(int bpp, int alpha, int depth, int stencil, int samples) throws LWJGLErrorException { + private static void createWindow(int bpp, int alpha, int depth, int stencil, int samples) throws LWJGLException { nCreate(title, x, y, width, height, fullscreen, bpp, alpha, depth, stencil, samples); context = new Window(); makeCurrent(); @@ -431,7 +431,7 @@ Mouse.create(); createdMouse = true; Mouse.enableBuffer(); - } catch (LWJGLErrorException e) { + } catch (LWJGLException e) { if (Sys.DEBUG) { e.printStackTrace(System.err); } else { @@ -445,7 +445,7 @@ createdKeyboard = true; Keyboard.enableBuffer(); Keyboard.enableTranslation(); - } catch (LWJGLErrorException e) { + } catch (LWJGLException e) { if (Sys.DEBUG) { e.printStackTrace(System.err); } else { @@ -457,7 +457,7 @@ try { Controller.create(); createdController = true; - } catch (LWJGLErrorException e) { + } catch (LWJGLException e) { if (Sys.DEBUG) { e.printStackTrace(System.err); } else { |