mirror of
https://github.com/cocos/cocos4.git
synced 2026-11-21 08:02:39 +08:00
V3.5.0 Distribute touch events independently (#10712)
* Distribute touch events independently * remove touch event cast * Fix the error of clang-tidy Co-authored-by: qiuguohua <862332094@qq.com>
This commit is contained in:
@@ -37,17 +37,19 @@ JNIEXPORT void JNICALL Java_com_cocos_lib_CocosTouchHandler_handleActionDown(JNI
|
||||
jfloat x, jfloat y) {
|
||||
touchEvent.type = cc::TouchEvent::Type::BEGAN;
|
||||
touchEvent.touches.emplace_back(x, y, id);
|
||||
JNI_NATIVE_GLUE()->dispatchEvent(touchEvent);
|
||||
JNI_NATIVE_GLUE()->dispatchTouchEvent(touchEvent);
|
||||
touchEvent.touches.clear();
|
||||
}
|
||||
|
||||
//NOLINTNEXTLINE
|
||||
JNIEXPORT void JNICALL Java_com_cocos_lib_CocosTouchHandler_handleActionUp(JNIEnv *env, jobject obj, jint id, jfloat x,
|
||||
jfloat y) {
|
||||
touchEvent.type = cc::TouchEvent::Type::ENDED;
|
||||
touchEvent.touches.emplace_back(x, y, id);
|
||||
JNI_NATIVE_GLUE()->dispatchEvent(touchEvent);
|
||||
JNI_NATIVE_GLUE()->dispatchTouchEvent(touchEvent);
|
||||
touchEvent.touches.clear();
|
||||
}
|
||||
|
||||
//NOLINTNEXTLINE
|
||||
JNIEXPORT void JNICALL Java_com_cocos_lib_CocosTouchHandler_handleActionMove(JNIEnv *env, jobject obj,
|
||||
jintArray ids,
|
||||
@@ -66,7 +68,7 @@ JNIEXPORT void JNICALL Java_com_cocos_lib_CocosTouchHandler_handleActionMove(JNI
|
||||
touchEvent.touches.emplace_back(x[i], y[i], id[i]);
|
||||
}
|
||||
|
||||
JNI_NATIVE_GLUE()->dispatchEvent(touchEvent);
|
||||
JNI_NATIVE_GLUE()->dispatchTouchEvent(touchEvent);
|
||||
touchEvent.touches.clear();
|
||||
}
|
||||
|
||||
@@ -87,7 +89,7 @@ JNIEXPORT void JNICALL Java_com_cocos_lib_CocosTouchHandler_handleActionCancel(J
|
||||
for (int i = 0; i < size; i++) {
|
||||
touchEvent.touches.emplace_back(x[i], y[i], id[i]);
|
||||
}
|
||||
JNI_NATIVE_GLUE()->dispatchEvent(touchEvent);
|
||||
JNI_NATIVE_GLUE()->dispatchTouchEvent(touchEvent);
|
||||
touchEvent.touches.clear();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -160,7 +160,7 @@ void JniNativeGlue::dispatchEvent(const OSEvent& ev) {
|
||||
}
|
||||
}
|
||||
|
||||
void JniNativeGlue::dispatchTouchEvent(const OSEvent& ev) {
|
||||
void JniNativeGlue::dispatchTouchEvent(const TouchEvent& ev) {
|
||||
if (_eventDispatcher) {
|
||||
_eventDispatcher->dispatchTouchEvent(ev);
|
||||
}
|
||||
|
||||
@@ -53,6 +53,7 @@ namespace cc {
|
||||
|
||||
class IEventDispatch;
|
||||
class OSEvent;
|
||||
class TouchEvent;
|
||||
|
||||
class CC_DLL JniNativeGlue {
|
||||
public:
|
||||
@@ -105,7 +106,7 @@ public:
|
||||
|
||||
void setEventDispatch(IEventDispatch* eventDispatcher);
|
||||
void dispatchEvent(const OSEvent& ev);
|
||||
void dispatchTouchEvent(const OSEvent& ev);
|
||||
void dispatchTouchEvent(const TouchEvent& ev);
|
||||
|
||||
void onPause();
|
||||
void onResume();
|
||||
|
||||
Reference in New Issue
Block a user