More fixes
This commit is contained in:
1 parent
53ea80fa0a
commit
55eddba545
2 files changed
+21
-22
No files matched your search
@@ -3,44 +3,47 @@ package net.kdt.pojavlaunch.uikit;
|
||||
import org.lwjgl.glfw.*;
|
||||
|
||||
public class UIKit {
|
||||
static {
|
||||
System.loadLibrary("pojavexec");
|
||||
}
|
||||
|
||||
public static native int launchUI(String[] uiArgs);
|
||||
public static native void runOnUIThread(UIKitCallback callback);
|
||||
|
||||
public static final int ACTION_DOWN = 0;
|
||||
public static final int ACTION_UP = 1;
|
||||
public static final int ACTION_MOVE = 2;
|
||||
|
||||
public static void callback_AppDelegate_didFinishLaunching(int width, int height) {
|
||||
GLFW.mGLFWWindowWidth = CallbackBridge.width;
|
||||
GLFW.mGLFWWindowHeight = CallbackBridge.height;
|
||||
CallbackBridge.mouseX = CallbackBridge.width / 2;
|
||||
GLFW.mGLFWWindowWidth = width;
|
||||
GLFW.mGLFWWindowHeight = height;
|
||||
CallbackBridge.mouseX = width / 2;
|
||||
CallbackBridge.mouseY = height / 2;
|
||||
net.kdt.pojavlaunch.PLaunchApp.applicationDidFinishLaunching();
|
||||
}
|
||||
|
||||
public static void callback_SurfaceViewController_onTouch(int event, int x, int y) {
|
||||
switch (event) {
|
||||
case ACTION_DOWN:
|
||||
case ACTION_UP:
|
||||
case CallbackBridge.ACTION_DOWN:
|
||||
case CallbackBridge.ACTION_UP:
|
||||
CallbackBridge.mouseLastX = x;
|
||||
CallbackBridge.mouseLastY = y;
|
||||
break;
|
||||
|
||||
case ACTION_MOVE:
|
||||
case CallbackBridge.ACTION_MOVE:
|
||||
if (GLFW.mGLFWIsGrabbing) {
|
||||
CallbackBridge.mouseX += x - CallbackBridge.mouseLastX;
|
||||
CallbackBridge.mouseY += y - CallbackBridge.mouseLastY;
|
||||
|
||||
CallbackBridge.mouseLastX = CallbackBridge.x;
|
||||
CallbackBridge.mouseLastY = CallbackBridge.y;
|
||||
CallbackBridge.mouseLastX = x;
|
||||
CallbackBridge.mouseLastY = y;
|
||||
} else {
|
||||
CallbackBridge.mouseX = CallbackBridge.x;
|
||||
CallbackBridge.mouseY = CallbackBridge.y;
|
||||
CallbackBridge.mouseX = x;
|
||||
CallbackBridge.mouseY = y;
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
||||
sendCursorPos(CallbackBridge.mouseX, CallbackBridge.mouseY);
|
||||
CallbackBridge.sendCursorPos(CallbackBridge.mouseX, CallbackBridge.mouseY);
|
||||
}
|
||||
|
||||
static {
|
||||
System.loadLibrary("pojavexec");
|
||||
}
|
||||
|
||||
public static native int launchUI(String[] uiArgs);
|
||||
public static native void runOnUIThread(UIKitCallback callback);
|
||||
}
|
||||
@@ -22,10 +22,6 @@ public class CallbackBridge {
|
||||
|
||||
public static final int ANDROID_TYPE_GRAB_STATE = 0;
|
||||
|
||||
public static final int ACTION_DOWN = 0;
|
||||
public static final int ACTION_UP = 1;
|
||||
public static final int ACTION_MOVE = 2;
|
||||
|
||||
// Should pending events be limited?
|
||||
volatile public static List<Integer[]> PENDING_EVENT_LIST = new ArrayList<>();
|
||||
volatile public static boolean PENDING_EVENT_READY = false;
|
||||
|
||||
Reference in new issue
Block a user