mirror of
https://github.com/AngelAuraMC/Amethyst-Android.git
synced 2025-09-17 00:29:50 -04:00
Tab -> spaces; Set win size also set monitor size
This commit is contained in:
parent
9bc686b591
commit
871e97fe9c
@ -496,20 +496,20 @@ public class GLFW
|
||||
|
||||
private static ArrayMap<Long, GLFWWindowProperties> mGLFWWindowMap;
|
||||
|
||||
public static boolean mGLFWIsGrabbing, mGLFWIsInputReady, mGLFWIsUseStackQueue = false;
|
||||
public static boolean mGLFWIsGrabbing, mGLFWIsInputReady, mGLFWIsUseStackQueue = false;
|
||||
public static final byte[] keyDownBuffer = new byte[316];
|
||||
private static final String PROP_WINDOW_WIDTH = "glfwstub.windowWidth";
|
||||
private static final String PROP_WINDOW_HEIGHT= "glfwstub.windowHeight";
|
||||
private static final String PROP_WINDOW_WIDTH = "glfwstub.windowWidth";
|
||||
private static final String PROP_WINDOW_HEIGHT= "glfwstub.windowHeight";
|
||||
public static long mainContext = 0;
|
||||
static {
|
||||
static {
|
||||
String windowWidth = System.getProperty(PROP_WINDOW_WIDTH);
|
||||
String windowHeight = System.getProperty(PROP_WINDOW_HEIGHT);
|
||||
if (windowWidth == null || windowHeight == null) {
|
||||
System.err.println("Warning: Property " + PROP_WINDOW_WIDTH + " or " + PROP_WINDOW_HEIGHT + " not set, defaulting to 1280 and 720");
|
||||
if (windowWidth == null || windowHeight == null) {
|
||||
System.err.println("Warning: Property " + PROP_WINDOW_WIDTH + " or " + PROP_WINDOW_HEIGHT + " not set, defaulting to 1280 and 720");
|
||||
|
||||
mGLFWWindowWidth = 1280;
|
||||
mGLFWWindowWidth = 1280;
|
||||
mGLFWWindowHeight = 720;
|
||||
} else {
|
||||
} else {
|
||||
mGLFWWindowWidth = Integer.parseInt(windowWidth);
|
||||
mGLFWWindowHeight = Integer.parseInt(windowHeight);
|
||||
}
|
||||
@ -518,14 +518,14 @@ public class GLFW
|
||||
CallbackBridge.receiveCallback(CallbackBridge.EVENT_TYPE_FRAMEBUFFER_SIZE, mGLFWWindowWidth, mGLFWWindowHeight, 0, 0);
|
||||
CallbackBridge.receiveCallback(CallbackBridge.EVENT_TYPE_WINDOW_SIZE, mGLFWWindowWidth, mGLFWWindowHeight, 0, 0);
|
||||
|
||||
try {
|
||||
try {
|
||||
System.loadLibrary("pojavexec");
|
||||
} catch (UnsatisfiedLinkError e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
|
||||
mGLFWErrorCallback = GLFWErrorCallback.createPrint();
|
||||
mGLFWKeyCodes = new ArrayMap<>();
|
||||
mGLFWErrorCallback = GLFWErrorCallback.createPrint();
|
||||
mGLFWKeyCodes = new ArrayMap<>();
|
||||
|
||||
mGLFWWindowMap = new ArrayMap<>();
|
||||
|
||||
@ -637,7 +637,14 @@ public class GLFW
|
||||
public static SharedLibrary getLibrary() {
|
||||
return GLFW;
|
||||
}
|
||||
|
||||
|
||||
public static void internalChangeMonitorSize(int width, int height) {
|
||||
mGLFWWindowWidth = width;
|
||||
mGLFWWindowHeight = height;
|
||||
memPutInt(mGLFWVideoMode.address() + (long) mGLFWVideoMode.WIDTH, mGLFWWindowWidth);
|
||||
memPutInt(mGLFWVideoMode.address() + (long) mGLFWVideoMode.HEIGHT, mGLFWWindowHeight);
|
||||
}
|
||||
|
||||
public static GLFWWindowProperties internalGetWindow(long window) {
|
||||
GLFWWindowProperties win = mGLFWWindowMap.get(window);
|
||||
if (win == null) {
|
||||
@ -944,37 +951,37 @@ public class GLFW
|
||||
return mGLFWGammaRamp;
|
||||
}
|
||||
public static void glfwSetGammaRamp(@NativeType("GLFWmonitor *") long monitor, @NativeType("const GLFWgammaramp *") GLFWGammaRamp ramp) {
|
||||
mGLFWGammaRamp = ramp;
|
||||
}
|
||||
mGLFWGammaRamp = ramp;
|
||||
}
|
||||
|
||||
public static void glfwMakeContextCurrent(long window) {
|
||||
//Probably not the best idea to rely on program's internals to share the contexts...
|
||||
try{
|
||||
throw new Exception("Trace exception");
|
||||
}catch(Exception e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
nativeEglMakeCurrent(window);
|
||||
}
|
||||
public static void glfwMakeContextCurrent(long window) {
|
||||
//Probably not the best idea to rely on program's internals to share the contexts...
|
||||
try{
|
||||
throw new Exception("Trace exception");
|
||||
}catch(Exception e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
nativeEglMakeCurrent(window);
|
||||
}
|
||||
|
||||
public static void glfwSwapBuffers(long window) {
|
||||
public static void glfwSwapBuffers(long window) {
|
||||
nativeEglSwapBuffers();
|
||||
}
|
||||
}
|
||||
|
||||
public static void glfwSwapInterval(int interval) {
|
||||
public static void glfwSwapInterval(int interval) {
|
||||
nativeEglSwapInterval(interval);
|
||||
}
|
||||
|
||||
// private static double mTime = 0d;
|
||||
// private static double mTime = 0d;
|
||||
public static double glfwGetTime() {
|
||||
// Boardwalk: just use system timer
|
||||
// Boardwalk: just use system timer
|
||||
// System.out.println("glfwGetTime");
|
||||
return (System.nanoTime() - mGLFWInitialTime) / 1.e9;
|
||||
}
|
||||
}
|
||||
|
||||
public static void glfwSetTime(double time) {
|
||||
mGLFWInitialTime = System.nanoTime() - (long) time;
|
||||
}
|
||||
public static void glfwSetTime(double time) {
|
||||
mGLFWInitialTime = System.nanoTime() - (long) time;
|
||||
}
|
||||
|
||||
public static long glfwGetTimerValue() {
|
||||
return System.currentTimeMillis();
|
||||
@ -1118,8 +1125,7 @@ public class GLFW
|
||||
break;
|
||||
case CallbackBridge.EVENT_TYPE_FRAMEBUFFER_SIZE:
|
||||
case CallbackBridge.EVENT_TYPE_WINDOW_SIZE:
|
||||
mGLFWWindowWidth = dataArr[1];
|
||||
mGLFWWindowHeight = dataArr[2];
|
||||
internalChangeMonitorSize(dataArr[1], dataArr[2]);
|
||||
glfwSetWindowSize(ptr, mGLFWWindowWidth, mGLFWWindowHeight);
|
||||
if (dataArr[0] == CallbackBridge.EVENT_TYPE_FRAMEBUFFER_SIZE && mGLFWFramebufferSizeCallback != null) {
|
||||
mGLFWFramebufferSizeCallback.invoke(ptr, mGLFWWindowWidth, mGLFWWindowHeight);
|
||||
|
Loading…
x
Reference in New Issue
Block a user