mirror of
https://github.com/shadowfacts/lwjgl2-arm64.git
synced 2026-04-05 22:45:50 +00:00
New Window class, and major changes to Display
This commit is contained in:
Caspian Rychlik-Prince
parent
cab8f6f62f
commit
419da83107
13 changed files with 475 additions and 882 deletions
|
|
@ -167,7 +167,7 @@ public abstract class Window {
|
|||
/**
|
||||
* Destroy the window.
|
||||
*/
|
||||
public final void destroy() {
|
||||
public void destroy() {
|
||||
currentWindow = null;
|
||||
nDestroy();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -32,7 +32,8 @@
|
|||
|
||||
package org.lwjgl.opengl;
|
||||
|
||||
import org.lwjgl.Sys;
|
||||
import org.lwjgl.*;
|
||||
import org.lwjgl.Window;
|
||||
|
||||
/**
|
||||
* $Id$
|
||||
|
|
@ -50,306 +51,74 @@ import org.lwjgl.Sys;
|
|||
* @author cix_foo <cix_foo@users.sourceforge.net>
|
||||
* @version $Revision$
|
||||
*/
|
||||
abstract class BaseGL {
|
||||
|
||||
static {
|
||||
System.loadLibrary(Sys.getLibraryName());
|
||||
}
|
||||
|
||||
public abstract class BaseGL extends Window {
|
||||
|
||||
/** The current rendering context */
|
||||
private static BaseGL currentContext;
|
||||
|
||||
/** Has the GL been created yet? */
|
||||
private boolean created;
|
||||
|
||||
/** Handle to the native context */
|
||||
/** Handle to the native GL rendering context */
|
||||
protected int handle;
|
||||
|
||||
/** This GL will be valid for use in only one thread */
|
||||
protected Thread renderThread;
|
||||
|
||||
/**
|
||||
* Constructor for BaseGL. The context is not created at this point;
|
||||
* to create the GL you must call create().
|
||||
*
|
||||
* @see #create()
|
||||
* 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 The title of the window
|
||||
* @param x, y The position of the window. May be ignored.
|
||||
* @param width, height The size of the window's client area
|
||||
* @param bpp Require colour bits
|
||||
* @param alpha Required alpha bits
|
||||
* @param depth Required depth bits
|
||||
* @param stencil Required stencil bits
|
||||
*/
|
||||
public BaseGL() {
|
||||
public BaseGL(String title, int x, int y, int width, int height, int bpp, int alpha, int depth, int stencil) throws Exception {
|
||||
super(title, x, y, width, height);
|
||||
|
||||
nCreate(title, x, y, width, height, false, 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 The title of the window
|
||||
* @param x, y The position of the window. May be ignored.
|
||||
* @param width, height The size of the window's client area
|
||||
*/
|
||||
public BaseGL(String title, int bpp, int alpha, int depth, int stencil) throws Exception {
|
||||
super(title, 0, 0, Display.getWidth(), Display.getHeight());
|
||||
|
||||
nCreate(title, 0, 0, Display.getWidth(), Display.getHeight(), true, bpp, alpha, depth, stencil);
|
||||
}
|
||||
|
||||
/**
|
||||
* Creates the GL, with the best match it can get for the specified
|
||||
* parameters. The display must first have been created.
|
||||
*
|
||||
* @throws Exception if the GL could not be created for some reason
|
||||
* Native method to create a windowed GL
|
||||
*/
|
||||
public final void create() throws Exception{
|
||||
if (created)
|
||||
return;
|
||||
if (!nCreate())
|
||||
throw new Exception("GL could not be created.");
|
||||
created = true;
|
||||
makeCurrent();
|
||||
init();
|
||||
}
|
||||
|
||||
private native void nCreate(String title, int x, int y, int width, int height, boolean fullscreen, int bpp, int alpha, int depth, int stencil) throws Exception;
|
||||
|
||||
/**
|
||||
* Override to provide any initialization code after creation.
|
||||
*/
|
||||
protected void init() {
|
||||
}
|
||||
|
||||
/**
|
||||
* Native method to create the GL. If successful then the native handle will
|
||||
* be set. The GL is created on the current display, which must have been
|
||||
* created by calling its setDisplayMode() method.
|
||||
*
|
||||
* @return true if the GL was created successfully
|
||||
* @see org.lwjgl.Display#create(org.lwjgl.DisplayMode, boolean)
|
||||
*/
|
||||
private native boolean nCreate();
|
||||
|
||||
/**
|
||||
* Destroy the GL context. Does nothing if the GL has not yet been created.
|
||||
*/
|
||||
public final void destroy() {
|
||||
if (!created)
|
||||
return;
|
||||
cleanup();
|
||||
created = false;
|
||||
renderThread = null;
|
||||
nDestroy();
|
||||
}
|
||||
|
||||
/**
|
||||
* Native method to destroy the GL context
|
||||
*/
|
||||
private native void nDestroy();
|
||||
|
||||
/**
|
||||
* Provide any cleanup in derived classes here. This method is called
|
||||
* just before the native context is destroyed.
|
||||
*/
|
||||
public void cleanup() {
|
||||
}
|
||||
|
||||
/**
|
||||
* Finalizer, marked final. To perform specialized cleanup override the
|
||||
* cleanup() method.
|
||||
*
|
||||
* @see #cleanup()
|
||||
* Finalizer, marked final. Ensures the window is destroyed.
|
||||
*/
|
||||
public final void finalize() throws Throwable {
|
||||
super.finalize();
|
||||
|
||||
destroy();
|
||||
}
|
||||
|
||||
/**
|
||||
* Free the context from the current thread.
|
||||
/* (non-Javadoc)
|
||||
* @see org.lwjgl.Window#destroy()
|
||||
*/
|
||||
public final void releaseContext() {
|
||||
assert created : "GL has not been created yet.";
|
||||
renderThread = null;
|
||||
currentContext = null;
|
||||
nReleaseContext();
|
||||
public void destroy() {
|
||||
// Do native destroy first
|
||||
super.destroy();
|
||||
}
|
||||
|
||||
/**
|
||||
* Make this the current context for the current thread.
|
||||
* Natively destroy any GL-related stuff
|
||||
*/
|
||||
public final void makeCurrent() {
|
||||
assert created : "GL has not been created yet.";
|
||||
renderThread = Thread.currentThread();
|
||||
currentContext = this;
|
||||
nMakeCurrent();
|
||||
}
|
||||
|
||||
/**
|
||||
* Swap the buffers
|
||||
*/
|
||||
public native void swapBuffers();
|
||||
|
||||
/**
|
||||
* Native method to free the context
|
||||
*/
|
||||
private native void nReleaseContext();
|
||||
|
||||
/**
|
||||
* Native method to make this the current thread
|
||||
*/
|
||||
private native void nMakeCurrent();
|
||||
|
||||
/**
|
||||
* @return true if this is the current rendering context and the correct
|
||||
* thread
|
||||
*/
|
||||
public final boolean isValid() {
|
||||
return created
|
||||
&& currentContext == this
|
||||
&& Thread.currentThread() == renderThread;
|
||||
}
|
||||
|
||||
/**
|
||||
* Create a fullscreen display. If the display has already been created then this
|
||||
* method is a no-op.
|
||||
*
|
||||
* Alpha, depth, and stencil will be 0 bits.
|
||||
*
|
||||
* @param title The title for the application
|
||||
* @throws Exception if the window could not be created for any reason
|
||||
* @see #destroy()
|
||||
*/
|
||||
public static void create(String title) throws Exception {
|
||||
create(title, 0, 0, 0);
|
||||
}
|
||||
|
||||
/**
|
||||
* Create a fullscreen display. If the display has already been created then this
|
||||
* method is a no-op.
|
||||
*
|
||||
* @param title The title for the application
|
||||
* @param alpha Minimun number of alpha bits on the display
|
||||
* @param depth Minimun number of depth bits on the display
|
||||
* @param stencil Minimun number of stencil bits on the display
|
||||
* @throws Exception if the window could not be created for any reason
|
||||
* @see #destroy()
|
||||
*/
|
||||
public static void create(String title, int alpha, int depth, int stencil)
|
||||
throws Exception {
|
||||
|
||||
if (Display.created) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (!nCreateFullscreen(title, alpha, depth, stencil)) {
|
||||
throw new Exception("Failed to create fullscreen display.");
|
||||
}
|
||||
|
||||
Display.created = true;
|
||||
}
|
||||
|
||||
/**
|
||||
* Create a windowed display. If the display has already been created then this
|
||||
* method is a no-op.
|
||||
*
|
||||
* The window is not guaranteed to be positioned at (x, y). Nor is it guaranteed
|
||||
* to have a drag bar, title bar, close button, or minimized button. It cannot be
|
||||
* resized once created.
|
||||
*
|
||||
* The window will have 0 bits alpha, depth, and stencil.
|
||||
*
|
||||
* @param title The title for the application
|
||||
* @param x, y The position of the window
|
||||
* @param width, height The dimensions of the drawable area of the window
|
||||
* @throws Exception if the window could not be created for any reason
|
||||
* @see #destroy()
|
||||
*/
|
||||
public static void create(String title, int x, int y, int width, int height)
|
||||
throws Exception {
|
||||
|
||||
create(title, x, y, width, height, 0, 0, 0);
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* Create a windowed display. If the display has already been created then this
|
||||
* method is a no-op.
|
||||
*
|
||||
* The window is not guaranteed to be positioned at (x, y). Nor is it guaranteed
|
||||
* to have a drag bar, title bar, close button, or minimized button. It cannot be
|
||||
* resized once created.
|
||||
*
|
||||
* @param title The title for the application
|
||||
* @param x, y The position of the window
|
||||
* @param width, height The dimensions of the drawable area of the window
|
||||
* @param alpha Minimun number of alpha bits on the display
|
||||
* @param depth Minimun number of depth bits on the display
|
||||
* @param stencil Minimun number of stencil bits on the display
|
||||
* @throws Exception if the window could not be created for any reason
|
||||
* @see #destroy()
|
||||
*/
|
||||
public static void create(String title, int x, int y, int width, int height, int alpha, int depth, int stencil)
|
||||
throws Exception {
|
||||
|
||||
if (Display.created) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (!nCreateWindowed(title, x, y, width, height, alpha, depth, stencil)) {
|
||||
throw new Exception("Failed to create windowed display.");
|
||||
}
|
||||
|
||||
Display.created = true;
|
||||
}
|
||||
|
||||
/**
|
||||
* Native method to create the display. This will set the handle if it is
|
||||
* successful.
|
||||
* @return true if the display was successfully created
|
||||
* @see #create(org.lwjgl.DisplayMode, boolean)
|
||||
*/
|
||||
private static native boolean nCreateWindowed(
|
||||
String title,
|
||||
int x,
|
||||
int y,
|
||||
int width,
|
||||
int height,
|
||||
int alpha_bits,
|
||||
int depth_bits,
|
||||
int stencil_bits);
|
||||
|
||||
/**
|
||||
* Native method to create the display. This will set the handle if it is
|
||||
* successful.
|
||||
* @return true if the display was successfully created
|
||||
* @see #create(org.lwjgl.DisplayMode, boolean)
|
||||
*/
|
||||
private static native boolean nCreateFullscreen(
|
||||
String title,
|
||||
int alpha_bits,
|
||||
int depth_bits,
|
||||
int stencil_bits);
|
||||
|
||||
/**
|
||||
* Destroy the display and return it to normal. If the display has not yet
|
||||
* been created no action is taken.
|
||||
*/
|
||||
public static void destroy() {
|
||||
if (!Display.created) {
|
||||
return;
|
||||
}
|
||||
|
||||
nDestroy();
|
||||
Display.created = false;
|
||||
Display.mode = null;
|
||||
}
|
||||
|
||||
/**
|
||||
* Native method to destroy the display. This will reset the handle.
|
||||
*/
|
||||
private static native void nDestroy();
|
||||
|
||||
/**
|
||||
* Determines if the display is minimized. When the display is minimized it is
|
||||
* effectively invisible, and you need perform no rendering in your game loop.
|
||||
* On the native side, when the application is switched to some other application,
|
||||
* the display window will minimize; when focus is regained, it will maximize and
|
||||
* automatically gain focus and become the foreground window again.
|
||||
* @return true if the display is minimized
|
||||
*/
|
||||
public static native boolean isMinimized();
|
||||
|
||||
/**
|
||||
* Determines if the user has requested that the application should close.
|
||||
* When a user has requested that the application should shutdown, it is up to
|
||||
* the application to perform the actual shutdown and cleanup of any allocated
|
||||
* resources.
|
||||
*
|
||||
* @return true if the user has requested that the application should close
|
||||
*/
|
||||
public static boolean isCloseRequested() {
|
||||
return Display.closeRequested;
|
||||
}
|
||||
private native void nDestroy();
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -42,11 +42,33 @@ package org.lwjgl.opengl;
|
|||
*/
|
||||
public class CoreGL extends BaseGL implements CoreGLConstants {
|
||||
|
||||
|
||||
/**
|
||||
* Constructor for CoreGL.
|
||||
* @param title
|
||||
* @param x
|
||||
* @param y
|
||||
* @param width
|
||||
* @param height
|
||||
* @param bpp
|
||||
* @param alpha
|
||||
* @param depth
|
||||
* @param stencil
|
||||
* @throws Exception
|
||||
*/
|
||||
public CoreGL() {
|
||||
super();
|
||||
public CoreGL(String title, int x, int y, int width, int height, int bpp, int alpha, int depth, int stencil) throws Exception {
|
||||
super(title, x, y, width, height, bpp, alpha, depth, stencil);
|
||||
}
|
||||
|
||||
/**
|
||||
* @param title
|
||||
* @param bpp
|
||||
* @param alpha
|
||||
* @param depth
|
||||
* @param stencil
|
||||
* @throws Exception
|
||||
*/
|
||||
public CoreGL(String title, int bpp, int alpha, int depth, int stencil) throws Exception {
|
||||
super(title, bpp, alpha, depth, stencil);
|
||||
}
|
||||
|
||||
public native void accum(int op, float value);
|
||||
|
|
|
|||
|
|
@ -48,6 +48,36 @@ import org.lwjgl.Display;
|
|||
* @version $Revision$
|
||||
*/
|
||||
public class GL extends CoreGL implements GLConstants {
|
||||
/**
|
||||
* @param title
|
||||
* @param x
|
||||
* @param y
|
||||
* @param width
|
||||
* @param height
|
||||
* @param bpp
|
||||
* @param alpha
|
||||
* @param depth
|
||||
* @param stencil
|
||||
* @throws Exception
|
||||
*/
|
||||
public GL(String title, int x, int y, int width, int height, int bpp, int alpha, int depth, int stencil) throws Exception {
|
||||
super(title, x, y, width, height, bpp, alpha, depth, stencil);
|
||||
determineAvailableExtensions();
|
||||
}
|
||||
|
||||
/**
|
||||
* @param title
|
||||
* @param bpp
|
||||
* @param alpha
|
||||
* @param depth
|
||||
* @param stencil
|
||||
* @throws Exception
|
||||
*/
|
||||
public GL(String title, int bpp, int alpha, int depth, int stencil) throws Exception {
|
||||
super(title, bpp, alpha, depth, stencil);
|
||||
determineAvailableExtensions();
|
||||
}
|
||||
|
||||
public native void activeStencilFaceEXT(int face);
|
||||
|
||||
public native void activeTextureARB(int texture);
|
||||
|
|
@ -1540,13 +1570,6 @@ public class GL extends CoreGL implements GLConstants {
|
|||
public boolean OpenGL13;
|
||||
public boolean OpenGL14;
|
||||
|
||||
/**
|
||||
* Constructor for GL.
|
||||
*/
|
||||
public GL() {
|
||||
super();
|
||||
}
|
||||
|
||||
/**
|
||||
* Determine which extensions are available
|
||||
*/
|
||||
|
|
@ -1671,17 +1694,5 @@ public class GL extends CoreGL implements GLConstants {
|
|||
}
|
||||
}
|
||||
|
||||
/* (non-Javadoc)
|
||||
* @see org.lwjgl.opengl.BaseGL#init()
|
||||
*/
|
||||
protected void init() {
|
||||
super.init();
|
||||
|
||||
// Right after creation we can go and find out what extensions are
|
||||
// available. We can't actually determine this beforehand of course
|
||||
// because the available extensions can only be determined when there's
|
||||
// an actual rendering context.
|
||||
determineAvailableExtensions();
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue