From 73387364416f3823b4ad1bce2c1541b437cb3ea4 Mon Sep 17 00:00:00 2001 From: Duy Tran Khanh Date: Fri, 29 Jan 2021 11:25:10 +0700 Subject: [PATCH] Rename ViewController to SurfaceViewController Prepare to add some UI to login, select version, download, etc... --- .../java/org/lwjgl/glfw/CallbackBridge.java | 2 +- Natives/CMakeLists.txt | 2 +- ...ViewController.h => SurfaceViewController.h} | 2 +- ...ViewController.m => SurfaceViewController.m} | 11 +++++++---- Natives/aminimake.sh | 2 +- Natives/en.lproj/Main.storyboard | 2 +- Natives/input_bridge_v3.c | 4 ++-- Natives/libpojavexec.dylib | Bin 0 -> 81024 bytes Natives/utils.h | 2 +- 9 files changed, 15 insertions(+), 12 deletions(-) rename Natives/{ViewController.h => SurfaceViewController.h} (67%) rename Natives/{ViewController.m => SurfaceViewController.m} (87%) create mode 100755 Natives/libpojavexec.dylib diff --git a/JavaApp/src/main/java/org/lwjgl/glfw/CallbackBridge.java b/JavaApp/src/main/java/org/lwjgl/glfw/CallbackBridge.java index aecb87cb..3ab48ccd 100644 --- a/JavaApp/src/main/java/org/lwjgl/glfw/CallbackBridge.java +++ b/JavaApp/src/main/java/org/lwjgl/glfw/CallbackBridge.java @@ -57,7 +57,7 @@ public class CallbackBridge { net.kdt.pojavlaunch.PLaunchApp.applicationDidFinishLaunching(); } - public static void callback_ViewController_onTouch(int event, int x, int y) { + public static void callback_SurfaceViewController_onTouch(int event, int x, int y) { switch (event) { case ACTION_DOWN: case ACTION_UP: diff --git a/Natives/CMakeLists.txt b/Natives/CMakeLists.txt index eeceb367..014bce54 100644 --- a/Natives/CMakeLists.txt +++ b/Natives/CMakeLists.txt @@ -13,7 +13,7 @@ set_target_properties(PojavLauncher PROPERTIES MACOSX_FRAMEWORK_IDENTIFIER org.cmake.ExecutableTarget MACOSX_BUNDLE_INFO_PLIST "../Info.plist") -add_library(pojavexec SHARED log.m AppDelegate.m UILauncher.m ViewController.m egl_bridge_ios.m egl_bridge.c input_bridge_v3.c utils.c) +add_library(pojavexec SHARED log.m AppDelegate.m UILauncher.m SurfaceViewController.m egl_bridge_ios.m egl_bridge.c input_bridge_v3.c utils.c) target_link_libraries(pojavexec "-Fresources/Frameworks" "-framework UIKit" diff --git a/Natives/ViewController.h b/Natives/SurfaceViewController.h similarity index 67% rename from Natives/ViewController.h rename to Natives/SurfaceViewController.h index 7108bf22..4b70b7c4 100644 --- a/Natives/ViewController.h +++ b/Natives/SurfaceViewController.h @@ -3,7 +3,7 @@ MGLKView *glView; -@interface ViewController : MGLKViewController +@interface SurfaceViewController : MGLKViewController // MGLKViewController // UIViewController diff --git a/Natives/ViewController.m b/Natives/SurfaceViewController.m similarity index 87% rename from Natives/ViewController.m rename to Natives/SurfaceViewController.m index 9ebb1ae9..b770e883 100644 --- a/Natives/ViewController.m +++ b/Natives/SurfaceViewController.m @@ -1,4 +1,4 @@ -#import "ViewController.h" +#import "SurfaceViewController.h" #import "egl_bridge_ios.h" #include "utils.h" @@ -7,7 +7,7 @@ #include "GLES2/gl2.h" #include "GLES2/gl2ext.h" -@interface ViewController () { +@interface SurfaceViewController () { } @property (strong, nonatomic) MGLContext *context; @@ -16,7 +16,7 @@ @end -@implementation ViewController +@implementation SurfaceViewController - (void)viewDidLoad { @@ -86,10 +86,13 @@ - (void)sendTouchEvent:(NSSet *)touches withEvent:(int)event { + CGRect screenBounds = [[UIScreen mainScreen] bounds]; + CGFloat screenScale = [[UIScreen mainScreen] scale]; + UITouch* touchEvent = [touches anyObject]; CGPoint locationInView = [touchEvent locationInView:self.view]; // CGPoint normalizedPoint = getNormalizedPoint(self.view, locationInView); - callback_ViewController_onTouch(event, locationInView.x, locationInView.y /* normalizedPoint.x, normalizedPoint.y */); + callback_SurfaceViewController_onTouch(event, locationInView.x * screenScale, locationInView.y * screenScale /* normalizedPoint.x, normalizedPoint.y */); } // Equals to Android ACTION_DOWN diff --git a/Natives/aminimake.sh b/Natives/aminimake.sh index 5c2d0951..e35597af 100644 --- a/Natives/aminimake.sh +++ b/Natives/aminimake.sh @@ -5,7 +5,7 @@ set -e CFLAGS="-fmessage-length=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit=0 -Wno-trigraphs -fpascal-strings -O3 -Wno-missing-field-initializers -Wno-missing-prototypes -Wno-return-type -Wno-missing-braces -Wparentheses -Wswitch -Wno-unused-function -Wno-unused-label -Wno-unused-parameter -Wno-unused-variable -Wunused-value -Wno-empty-body -Wno-uninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wno-constant-conversion -Wno-int-conversion -Wno-bool-conversion -Wno-enum-conversion -Wno-float-conversion -Wno-non-literal-null-conversion -Wno-objc-literal-conversion -Wshorten-64-to-32 -Wpointer-sign -Wno-newline-eof" -clang -Wl,-rpath,/Applications/PojavLauncher.app/Frameworks -fobjc-arc -x objective-c -Fresources/Frameworks -framework UIKit -framework MetalANGLE -Iresources/Frameworks/MetalANGLE.framework/Headers -dynamiclib -isysroot /var/mobile/theos/sdks/iPhoneOS11.2.sdk $CFLAGS -o libpojavexec.dylib log.m AppDelegate.m UILauncher.m ViewController.m egl_bridge_ios.m egl_bridge.c input_bridge_v3.c utils.c -DGLES_TESTZ -DUSE_EGLZ +clang -Wl,-rpath,/Applications/PojavLauncher.app/Frameworks -fobjc-arc -x objective-c -Fresources/Frameworks -framework UIKit -framework MetalANGLE -Iresources/Frameworks/MetalANGLE.framework/Headers -dynamiclib -isysroot /var/mobile/theos/sdks/iPhoneOS11.2.sdk $CFLAGS -o libpojavexec.dylib log.m AppDelegate.m UILauncher.m SurfaceViewController.m egl_bridge_ios.m egl_bridge.c input_bridge_v3.c utils.c -DGLES_TESTZ -DUSE_EGLZ ldid -S../entitlements.xml libpojavexec.dylib diff --git a/Natives/en.lproj/Main.storyboard b/Natives/en.lproj/Main.storyboard index 2ff12f8a..def09684 100644 --- a/Natives/en.lproj/Main.storyboard +++ b/Natives/en.lproj/Main.storyboard @@ -7,7 +7,7 @@ - + diff --git a/Natives/input_bridge_v3.c b/Natives/input_bridge_v3.c index 64d4088b..361d3869 100644 --- a/Natives/input_bridge_v3.c +++ b/Natives/input_bridge_v3.c @@ -174,7 +174,7 @@ void callback_AppDelegate_didFinishLaunching(int width, int height) { ); } -void callback_ViewController_onTouch(int event, int x, int y) { +void callback_SurfaceViewController_onTouch(int event, int x, int y) { // Because UI init after JVM init, this should not be null assert (runtimeJNIEnvPtr_JRE != NULL); @@ -184,7 +184,7 @@ void callback_ViewController_onTouch(int event, int x, int y) { } if (!touchBridgeMethod) { - touchBridgeMethod = (*runtimeJNIEnvPtr_JRE)->GetStaticMethodID(runtimeJNIEnvPtr_JRE, inputBridgeClass_ANDROID, "callback_ViewController_onTouch", "(III)V"); + touchBridgeMethod = (*runtimeJNIEnvPtr_JRE)->GetStaticMethodID(runtimeJNIEnvPtr_JRE, inputBridgeClass_ANDROID, "callback_SurfaceViewController_onTouch", "(III)V"); assert(touchBridgeMethod != NULL); } diff --git a/Natives/libpojavexec.dylib b/Natives/libpojavexec.dylib new file mode 100755 index 0000000000000000000000000000000000000000..c1ced690d4f52d89dbcb6737a4d058e3e85681ee GIT binary patch literal 81024 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 literal 0 HcmV?d00001 diff --git a/Natives/utils.h b/Natives/utils.h index 521923d0..d4e0aef7 100644 --- a/Natives/utils.h +++ b/Natives/utils.h @@ -31,7 +31,7 @@ void free_char_array(JNIEnv *env, jobjectArray jstringArray, const char **charAr void closeGLFWWindow(); void callback_AppDelegate_didFinishLaunching(int width, int height); -void callback_ViewController_onTouch(int event, int x, int y); +void callback_SurfaceViewController_onTouch(int event, int x, int y); #endif // _BINARY_UTILS_H_