Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ccx : Call cocos rendering methods. 

* switch to .cpp for nativeactivity.
 * ccx : update log tags to say .ccp instead of .c
This commit is contained in:
folecr 2013-03-25 17:01:30 -07:00
parent 57cd5eedef
commit 6d990d0570
2 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cocos2dx/platform/android/Android.mk
View File

@ -14,7 +14,7 @@ CCApplication.cpp \
CCCommon.cpp \ CCCommon.cpp \
CCFileUtilsAndroid.cpp \ CCFileUtilsAndroid.cpp \
CCImage.cpp \ CCImage.cpp \
jni/nativeactivity.c \ jni/nativeactivity.cpp \
jni/Java_org_cocos2dx_lib_Cocos2dxBitmap.cpp \ jni/Java_org_cocos2dx_lib_Cocos2dxBitmap.cpp \
jni/Java_org_cocos2dx_lib_Cocos2dxHelper.cpp \ jni/Java_org_cocos2dx_lib_Cocos2dxHelper.cpp \
jni/Java_org_cocos2dx_lib_Cocos2dxRenderer.cpp \ jni/Java_org_cocos2dx_lib_Cocos2dxRenderer.cpp \

28
cocos2dx/platform/android/jni/nativeactivity.c → cocos2dx/platform/android/jni/nativeactivity.cpp
View File

@ -8,8 +8,13 @@
#include <android/log.h> #include <android/log.h>
#include <android_native_app_glue.h> #include <android_native_app_glue.h>
#define LOGI(...) ((void)__android_log_print(ANDROID_LOG_INFO, "cocos2dx/nativeactivity.c", __VA_ARGS__)) #include "CCDirector.h"
#define LOGW(...) ((void)__android_log_print(ANDROID_LOG_WARN, "cocos2dx/nativeactivity.c", __VA_ARGS__)) #include "../CCApplication.h"
#include "CCEventType.h"
#include "support/CCNotificationCenter.h"
#define LOGI(...) ((void)__android_log_print(ANDROID_LOG_INFO, "cocos2dx/nativeactivity.cpp", __VA_ARGS__))
#define LOGW(...) ((void)__android_log_print(ANDROID_LOG_WARN, "cocos2dx/nativeactivity.cpp", __VA_ARGS__))
/** /**
* Our saved state data. * Our saved state data.
@ -118,10 +123,12 @@ static void engine_draw_frame(struct engine* engine) {
return; return;
} }
// Just fill the screen with a color. cocos2d::CCDirector::sharedDirector()->mainLoop();
glClearColor(((float)engine->state.x)/engine->width, engine->state.angle,
((float)engine->state.y)/engine->height, 1); /* // Just fill the screen with a color. */
glClear(GL_COLOR_BUFFER_BIT); /* glClearColor(((float)engine->state.x)/engine->width, engine->state.angle, */
/* ((float)engine->state.y)/engine->height, 1); */
/* glClear(GL_COLOR_BUFFER_BIT); */
eglSwapBuffers(engine->display, engine->surface); eglSwapBuffers(engine->display, engine->surface);
} }
@ -192,6 +199,11 @@ static void engine_handle_cmd(struct android_app* app, int32_t cmd) {
ASensorEventQueue_setEventRate(engine->sensorEventQueue, ASensorEventQueue_setEventRate(engine->sensorEventQueue,
engine->accelerometerSensor, (1000L/60)*1000); engine->accelerometerSensor, (1000L/60)*1000);
} }
if (cocos2d::CCDirector::sharedDirector()->getOpenGLView()) {
cocos2d::CCApplication::sharedApplication()->applicationWillEnterForeground();
}
break; break;
case APP_CMD_LOST_FOCUS: case APP_CMD_LOST_FOCUS:
// When our app loses focus, we stop monitoring the accelerometer. // When our app loses focus, we stop monitoring the accelerometer.
@ -200,6 +212,10 @@ static void engine_handle_cmd(struct android_app* app, int32_t cmd) {
ASensorEventQueue_disableSensor(engine->sensorEventQueue, ASensorEventQueue_disableSensor(engine->sensorEventQueue,
engine->accelerometerSensor); engine->accelerometerSensor);
} }
cocos2d::CCApplication::sharedApplication()->applicationDidEnterBackground();
cocos2d::CCNotificationCenter::sharedNotificationCenter()->postNotification(EVENT_COME_TO_BACKGROUND, NULL);
// Also stop animating. // Also stop animating.
engine->animating = 0; engine->animating = 0;
engine_draw_frame(engine); engine_draw_frame(engine);