diff --git a/src/gradient.cpp b/src/gradient.cpp index 8e6944f3..d077bc0c 100644 --- a/src/gradient.cpp +++ b/src/gradient.cpp @@ -60,12 +60,12 @@ void Gradient::TickDraw(float seconds) { Entity::TickDraw(seconds); - float const vertex[] = { 0.0f, 0.0f, 0.0f, - 640.0f, 0.0f, 0.0f, - 0.0f, 480.0f, 0.0f, - 640.0f, 480.0f, 0.0f, - 0.0f, 480.0f, 0.0f, - 640.0f, 0.0f, 0.0f, }; + float const vertex[] = { m_bbox[0].x, m_bbox[0].y, 0.0f, + m_bbox[1].x, m_bbox[0].y, 0.0f, + m_bbox[0].x, m_bbox[1].y, 0.0f, + m_bbox[1].x, m_bbox[1].y, 0.0f, + m_bbox[0].x, m_bbox[1].y, 0.0f, + m_bbox[1].x, m_bbox[0].y, 0.0f, }; float const color[] = { 0.73f, 0.85f, 0.85f, 1.0f, 0.73f, 0.85f, 0.85f, 1.0f, diff --git a/src/input/input.cpp b/src/input/input.cpp index a5c29b55..2f482d75 100644 --- a/src/input/input.cpp +++ b/src/input/input.cpp @@ -403,6 +403,8 @@ void Input::SetMousePos(ivec2 coord) WorldEntity *top = NULL; + /* Find the top “widget” amongst all entities that match the + * mouse coordinates */ for (int n = 0; n < data->nentities; n++) { if (coord.x < data->entities[n]->m_bbox[0].x diff --git a/src/platform/android/androidapp.cpp b/src/platform/android/androidapp.cpp index 0d701a16..8021b0c5 100644 --- a/src/platform/android/androidapp.cpp +++ b/src/platform/android/androidapp.cpp @@ -25,11 +25,8 @@ using namespace lol; /* One of these wrappers will be overridden by the user's version */ void lol_android_main(void) __attribute__((weak)); -void lol_android_main(void) {} void lol_android_main(int argc, char **argv) __attribute__((weak)); -void lol_android_main(int argc, char **argv) {} void lol_android_main(int argc, char **argv, char **envp) __attribute__((weak)); -void lol_android_main(int argc, char **argv, char **envp) {} namespace lol { @@ -87,6 +84,7 @@ AndroidApp::~AndroidApp() extern "C" jint JNI_OnLoad(JavaVM* vm, void* reserved) { + Log::Info("Java layer loading library, vm=0x%08lx", (long)(intptr_t)vm); g_vm = vm; return JNI_VERSION_1_4; } @@ -94,7 +92,7 @@ JNI_OnLoad(JavaVM* vm, void* reserved) extern "C" void Java_org_zoy_LolEngine_LolActivity_nativeInit(JNIEnv* env, jobject thiz) { - Log::Info("Java layer initialising activity"); + Log::Info("Java layer initialising activity 0x%08lx", (long)thiz); env->NewGlobalRef(thiz); /* FIXME: never released! */ g_activity = thiz; } @@ -158,5 +156,22 @@ Java_org_zoy_LolEngine_LolRenderer_nativeRender(JNIEnv* env) Ticker::TickDraw(); } +/* + * Fake main() wrappers that let us call the user’s main() from within + * a separate thread. + */ +void lol_android_main(void) {} +void lol_android_main(int argc, char **argv) +{ + (void)argc; + (void)argv; +} +void lol_android_main(int argc, char **argv, char **envp) +{ + (void)argc; + (void)argv; + (void)envp; +} + #endif /* __ANDROID__ */