From 2f8bc2529e27ffe544808046ec94083e0abf9293 Mon Sep 17 00:00:00 2001 From: James Chen Date: Thu, 10 Aug 2017 16:56:03 +0800 Subject: [PATCH] Event class should be new ed. --- native/cocos/platform/android/javaactivity-android.cpp | 6 ++++-- .../Java_org_cocos2dx_lib_Cocos2dxAccelerometer.cpp | 5 +++-- .../jni/Java_org_cocos2dx_lib_Cocos2dxRenderer.cpp | 10 ++++++---- native/cocos/platform/android/jni/TouchesJni.cpp | 5 +++-- 4 files changed, 16 insertions(+), 10 deletions(-) diff --git a/native/cocos/platform/android/javaactivity-android.cpp b/native/cocos/platform/android/javaactivity-android.cpp index 2ad537eb68..b3168ef380 100644 --- a/native/cocos/platform/android/javaactivity-android.cpp +++ b/native/cocos/platform/android/javaactivity-android.cpp @@ -102,8 +102,10 @@ JNIEXPORT void Java_org_cocos2dx_lib_Cocos2dxRenderer_nativeInit(JNIEnv* env, j cocos2d::DrawPrimitives::init(); cocos2d::VolatileTextureMgr::reloadAllTextures(); - cocos2d::EventCustom recreatedEvent(EVENT_RENDERER_RECREATED); - director->getEventDispatcher()->dispatchEvent(&recreatedEvent); + cocos2d::EventCustom* recreatedEvent = new (std::nothrow) cocos2d::EventCustom(EVENT_RENDERER_RECREATED); + director->getEventDispatcher()->dispatchEvent(recreatedEvent); + recreatedEvent->release(); + director->setGLDefaultValues(); } cocos2d::network::_preloadJavaDownloaderClass(); diff --git a/native/cocos/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxAccelerometer.cpp b/native/cocos/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxAccelerometer.cpp index 462add13e1..6b2002a3fb 100644 --- a/native/cocos/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxAccelerometer.cpp +++ b/native/cocos/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxAccelerometer.cpp @@ -16,7 +16,8 @@ extern "C" { a.z = -((double)z / TG3_GRAVITY_EARTH); a.timestamp = (double)timeStamp; - EventAcceleration event(a); - Director::getInstance()->getEventDispatcher()->dispatchEvent(&event); + EventAcceleration* event = new (std::nothrow) EventAcceleration(a); + Director::getInstance()->getEventDispatcher()->dispatchEvent(event); + event->release(); } } diff --git a/native/cocos/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxRenderer.cpp b/native/cocos/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxRenderer.cpp index 39a06ae230..00085591bd 100644 --- a/native/cocos/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxRenderer.cpp +++ b/native/cocos/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxRenderer.cpp @@ -21,8 +21,9 @@ extern "C" { JNIEXPORT void JNICALL Java_org_cocos2dx_lib_Cocos2dxRenderer_nativeOnPause() { if (Director::getInstance()->getOpenGLView()) { Application::getInstance()->applicationDidEnterBackground(); - cocos2d::EventCustom backgroundEvent(EVENT_COME_TO_BACKGROUND); - cocos2d::Director::getInstance()->getEventDispatcher()->dispatchEvent(&backgroundEvent); + cocos2d::EventCustom* backgroundEvent = new (std::nothrow) cocos2d::EventCustom(EVENT_COME_TO_BACKGROUND); + cocos2d::Director::getInstance()->getEventDispatcher()->dispatchEvent(backgroundEvent); + backgroundEvent->release(); } } @@ -34,8 +35,9 @@ extern "C" { if (!firstTime) Application::getInstance()->applicationWillEnterForeground(); - cocos2d::EventCustom foregroundEvent(EVENT_COME_TO_FOREGROUND); - cocos2d::Director::getInstance()->getEventDispatcher()->dispatchEvent(&foregroundEvent); + cocos2d::EventCustom* foregroundEvent = new (std::nothrow) cocos2d::EventCustom(EVENT_COME_TO_FOREGROUND); + cocos2d::Director::getInstance()->getEventDispatcher()->dispatchEvent(foregroundEvent); + foregroundEvent->release(); firstTime = false; } diff --git a/native/cocos/platform/android/jni/TouchesJni.cpp b/native/cocos/platform/android/jni/TouchesJni.cpp index e402f629f2..77d97d7b15 100644 --- a/native/cocos/platform/android/jni/TouchesJni.cpp +++ b/native/cocos/platform/android/jni/TouchesJni.cpp @@ -110,8 +110,9 @@ extern "C" { } cocos2d::EventKeyboard::KeyCode cocos2dKey = g_keyCodeMap.at(keyCode); - cocos2d::EventKeyboard event(cocos2dKey, isPressed); - cocos2d::Director::getInstance()->getEventDispatcher()->dispatchEvent(&event); + cocos2d::EventKeyboard* event = new (std::nothrow) cocos2d::EventKeyboard(cocos2dKey, isPressed); + cocos2d::Director::getInstance()->getEventDispatcher()->dispatchEvent(event); + event->release(); return JNI_TRUE; }}