Android: add Android Studio support, completely redone java part (#9066)

[oweals/minetest.git] / build / android / patches / irrlicht-touchcount.patch

diff --git a/build/android/patches/irrlicht-touchcount.patch b/build/android/patches/irrlicht-touchcount.patch
deleted file mode 100644 (file)
index d4e4b9c..0000000
--- a/build/android/patches/irrlicht-touchcount.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- irrlicht.orig/include/IEventReceiver.h     2014-06-03 19:43:50.433713133 +0200
-+++ irrlicht/include/IEventReceiver.h  2014-06-03 19:44:36.993711489 +0200
-@@ -375,6 +375,9 @@
-         // Y position of simple touch.\r
-               s32 Y;\r
- \r
-+              // number of current touches\r
-+              s32 touchedCount;\r
-+\r
-               //! Type of touch event.\r
-               ETOUCH_INPUT_EVENT Event;\r
-       };\r
---- irrlicht.orig/source/Irrlicht/Android/CIrrDeviceAndroid.cpp        2014-06-03 19:43:50.505713130 +0200
-+++ irrlicht/source/Irrlicht/Android/CIrrDeviceAndroid.cpp     2014-06-03 19:45:37.265709359 +0200
-@@ -315,6 +315,7 @@
-                                               event.TouchInput.ID = AMotionEvent_getPointerId(androidEvent, i);\r
-                                               event.TouchInput.X = AMotionEvent_getX(androidEvent, i);\r
-                                               event.TouchInput.Y = AMotionEvent_getY(androidEvent, i);\r
-+                                              event.TouchInput.touchedCount = AMotionEvent_getPointerCount(androidEvent);\r
- \r
-                                               device->postEventFromUser(event);\r
-                                       }\r
-@@ -326,6 +327,7 @@
-                                       event.TouchInput.ID = AMotionEvent_getPointerId(androidEvent, pointerIndex);\r
-                                       event.TouchInput.X = AMotionEvent_getX(androidEvent, pointerIndex);\r
-                                       event.TouchInput.Y = AMotionEvent_getY(androidEvent, pointerIndex);\r
-+                                      event.TouchInput.touchedCount = AMotionEvent_getPointerCount(androidEvent);\r
- \r
-                                       device->postEventFromUser(event);\r
-                               }\r