From 143067127da48d9e242d3438065da5f5820b890d Mon Sep 17 00:00:00 2001 From: Elias Naur Date: Sun, 6 Jul 2003 22:43:05 +0000 Subject: [PATCH] Reverted change --- src/java/org/lwjgl/opengl/BaseGL.java | 4 +-- src/java/org/lwjgl/opengl/CoreGL.java | 4 +-- src/java/org/lwjgl/opengl/GL.java | 45 ++------------------------- 3 files changed, 6 insertions(+), 47 deletions(-) diff --git a/src/java/org/lwjgl/opengl/BaseGL.java b/src/java/org/lwjgl/opengl/BaseGL.java index 11440702..4982a016 100644 --- a/src/java/org/lwjgl/opengl/BaseGL.java +++ b/src/java/org/lwjgl/opengl/BaseGL.java @@ -99,7 +99,7 @@ public class BaseGL extends Window { * @param depth Required depth bits * @param stencil Required stencil bits */ - protected BaseGL(String title, int x, int y, int width, int height, int bpp, int alpha, int depth, int stencil) { + public BaseGL(String title, int x, int y, int width, int height, int bpp, int alpha, int depth, int stencil) { super(title, x, y, width, height); this.x = x; @@ -123,7 +123,7 @@ public class BaseGL extends Window { * @param depth Minimum bits per pixel in depth buffer * @param stencil Minimum bits per pixel in stencil buffer */ - protected BaseGL(String title, int bpp, int alpha, int depth, int stencil) { + public BaseGL(String title, int bpp, int alpha, int depth, int stencil) { super(title, 0, 0, Display.getWidth(), Display.getHeight()); this.x = 0; diff --git a/src/java/org/lwjgl/opengl/CoreGL.java b/src/java/org/lwjgl/opengl/CoreGL.java index 4ffe41d5..ceac0362 100644 --- a/src/java/org/lwjgl/opengl/CoreGL.java +++ b/src/java/org/lwjgl/opengl/CoreGL.java @@ -59,7 +59,7 @@ public class CoreGL extends BaseGL implements CoreGLConstants { * @param depth * @param stencil */ - protected CoreGL(String title, int x, int y, int width, int height, int bpp, int alpha, int depth, int stencil) { + public CoreGL(String title, int x, int y, int width, int height, int bpp, int alpha, int depth, int stencil) { super(title, x, y, width, height, bpp, alpha, depth, stencil); } @@ -70,7 +70,7 @@ public class CoreGL extends BaseGL implements CoreGLConstants { * @param depth * @param stencil */ - protected CoreGL(String title, int bpp, int alpha, int depth, int stencil) { + public CoreGL(String title, int bpp, int alpha, int depth, int stencil) { super(title, bpp, alpha, depth, stencil); } diff --git a/src/java/org/lwjgl/opengl/GL.java b/src/java/org/lwjgl/opengl/GL.java index 5652f12e..9975dc08 100644 --- a/src/java/org/lwjgl/opengl/GL.java +++ b/src/java/org/lwjgl/opengl/GL.java @@ -53,47 +53,6 @@ import java.nio.Buffer; * @version $Revision$ */ public class GL extends CoreGL implements GLConstants { - private static GL gl_instance = null; - - /** - * Construct a windowed instance of GL. If the underlying OS does not - * support windowed mode, then the width and height must match the current - * display resolution, or an Exception will be thrown. Otherwise a fullscreen - * window will be created. - * - * @param title - * @param x - * @param y - * @param width - * @param height - * @param bpp - * @param alpha - * @param depth - * @param stencil - */ - public static void createContext(String title, int x, int y, int width, int height, int bpp, int alpha, int depth, int stencil) { - new GL(title, x, y, width, height, bpp, alpha, depth, stencil); - } - - /** - * Construct a fullscreen instance of GL. If the underlying OS does not - * support fullscreen mode, then a window will be created instead. If this - * fails too then an Exception will be thrown. - * - * @param title - * @param bpp - * @param alpha - * @param depth - * @param stencil - */ - public static void createContext(String title, int bpp, int alpha, int depth, int stencil) { - new GL(title, bpp, alpha, depth, stencil); - } - - public static void destroyContext() { - getCurrentWindow().destroy(); - } - /** * @param title * @param x @@ -105,7 +64,7 @@ public class GL extends CoreGL implements GLConstants { * @param depth * @param stencil */ - protected GL(String title, int x, int y, int width, int height, int bpp, int alpha, int depth, int stencil) { + public GL(String title, int x, int y, int width, int height, int bpp, int alpha, int depth, int stencil) { super(title, x, y, width, height, bpp, alpha, depth, stencil); } @@ -116,7 +75,7 @@ public class GL extends CoreGL implements GLConstants { * @param depth * @param stencil */ - protected GL(String title, int bpp, int alpha, int depth, int stencil) { + public GL(String title, int bpp, int alpha, int depth, int stencil) { super(title, bpp, alpha, depth, stencil); }