investigating touch problems

CleverRaven · Nov 13, 2024 · 8da85dc · 8da85dc
1 parent 80e133e
commit 8da85dc
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 43 deletions.
diff --git a/build-scripts/xcodegen-cataclysm.yml b/build-scripts/xcodegen-cataclysm.yml
@@ -34,8 +34,6 @@ targets:
         UISupportedInterfaceOrientations: 
           - UIInterfaceOrientationLandscapeLeft 
           - UIInterfaceOrientationLandscapeRight
-          - UIInterfaceOrientationPortraitUpsideDown
-          - UIInterfaceOrientationPortrait
         UILaunchStoryboardName: LaunchScreen
         CFBundleIconFile: AppIcon.icns
         UIApplicationSupportsIndirectInputEvents: true
@@ -47,7 +45,6 @@ targets:
         buildPhase: sources
         includes:
           - "**/swift/*.swift"
-          - "**/swift/*.h"
           - "**/third-party/imgui/*.cpp"
           - "**/third-party/imgui/*.h"
           - "*.cpp"
@@ -99,7 +96,6 @@ targets:
         LIBRARY_SEARCH_PATHS:
           - ../build/libs/
           - $(inherited)
-        SWIFT_OBJC_BRIDGING_HEADER: "../src/swift/CataclysmExperimental-Bridging-Header.h"
         GCC_PREPROCESSOR_DEFINITIONS: 
           - GIT_VERSION 
           - TILES 

diff --git a/src/sdltiles.cpp b/src/sdltiles.cpp
@@ -504,17 +504,6 @@ extern "C" {
 #endif
 } // "C"
 
-/*#if defined(__IPHONEOS__)
-void iossetvisibledisplayframe(int left, int top, int right, int bottom){
-    has_visible_display_frame = true;
-    visible_display_frame_dirty = true;
-    visible_display_frame.x = left;
-    visible_display_frame.y = top;
-    visible_display_frame.w = right - left;
-    visible_display_frame.h = bottom - top;
-}
-#endif*/
-
 SDL_Rect get_android_render_rect( float DisplayBufferWidth, float DisplayBufferHeight )
 {
     // If the display buffer aspect ratio is wider than the display,
@@ -3345,6 +3334,7 @@ static void CheckMessages()
 
 #if defined(__ANDROID__) || defined(__IPHONEOS__)
             case SDL_FINGERMOTION:
+                dbg( D_INFO ) << "Fingermotion triggered.";
                 if( ev.tfinger.fingerId == 0 ) {
                     if( !is_quick_shortcut_touch ) {
                         update_finger_repeat_delay();
@@ -3378,6 +3368,7 @@ static void CheckMessages()
                 }
                 break;
             case SDL_FINGERDOWN:
+                dbg( D_INFO ) << "Fingerdown triggered.";
                 if( ev.tfinger.fingerId == 0 ) {
                     finger_down_x = finger_curr_x = ev.tfinger.x * WindowWidth;
                     finger_down_y = finger_curr_y = ev.tfinger.y * WindowHeight;
@@ -3405,6 +3396,7 @@ static void CheckMessages()
                 }
                 break;
             case SDL_FINGERUP:
+                dbg( D_INFO ) << "Fingerup triggered.";
                 if( ev.tfinger.fingerId == 0 ) {
                     finger_curr_x = ev.tfinger.x * WindowWidth;
                     finger_curr_y = ev.tfinger.y * WindowHeight;

diff --git a/src/sdltiles.h b/src/sdltiles.h
@@ -46,10 +46,6 @@ void rescale_tileset( int size );
 bool save_screenshot( const std::string &file_path );
 void toggle_fullscreen_window();
 
-#if defined(__IPHONEOS__)
-void iossetvisibledisplayframe( int left, int top, int right, int bottom );
-#endif
-
 struct window_dimensions {
     point scaled_font_size;
     point window_pos_cell;

diff --git a/src/swift/CataclysmExperimental-Bridging-Header.h b/src/swift/CataclysmExperimental-Bridging-Header.h
diff --git a/src/swift/ios_stuff.swift b/src/swift/ios_stuff.swift
@@ -2,7 +2,6 @@ import Foundation
 import GameController
 import UIKit
 import AVFoundation
-import OSLog
 
 //https://stackoverflow.com/a/76728094
 extension UIWindow {
@@ -23,12 +22,6 @@ extension UIScreen {
     }
 }
 
-extension SDLUIKitDelegate {
-    class func getAppDelegateClassName() -> String? {
-        return NSStringFromClass(AppDelegate.self.self)
-    }
-}
-
 public func iosGetDisplayDensity() -> Float {
     let scale = UIScreen.current?.nativeScale ?? 1.0
     return Float(scale)
@@ -41,18 +34,3 @@ public func isIOSKeyBoardAvailable() -> Bool {
 public func vibrateDevice() {
     AudioServicesPlaySystemSound(kSystemSoundID_Vibrate)
 }
-
-class AppDelegate : SDLUIKitDelegate
-{
-    override func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool
-    {
-        os_log("Calling from SWIFT")
-        let scenes = UIApplication.shared.connectedScenes
-        let windowScene = scenes.first as? UIWindowScene
-        let window = windowScene?.windows.first
-        let safeareainsets = window?.safeAreaInsets
-        // Yeah i know it's extremely dirty
-        //iossetvisibledisplayframe(Int32(safeareainsets?.left ?? 9999), Int32(safeareainsets?.top ?? 9999), Int32(safeareainsets?.right ?? 9999), Int32(safeareainsets?.bottom ?? 9999))
-        return super.application(application, didFinishLaunchingWithOptions: launchOptions)
-    }
-}