Changeset 1949


Ignore:
Timestamp:
Sep 26, 2012, 9:07:17 AM (5 years ago)
Author:
sam
Message:

misc: very minor tweaks here and there.

Location:
trunk/src
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/gradient.cpp

    r1848 r1949  
    6161    Entity::TickDraw(seconds);
    6262
    63     float const vertex[] = {   0.0f,   0.0f, 0.0f,
    64                              640.0f,   0.0f, 0.0f,
    65                                0.0f, 480.0f, 0.0f,
    66                              640.0f, 480.0f, 0.0f,
    67                                0.0f, 480.0f, 0.0f,
    68                              640.0f,   0.0f, 0.0f, };
     63    float const vertex[] = { m_bbox[0].x, m_bbox[0].y, 0.0f,
     64                             m_bbox[1].x, m_bbox[0].y, 0.0f,
     65                             m_bbox[0].x, m_bbox[1].y, 0.0f,
     66                             m_bbox[1].x, m_bbox[1].y, 0.0f,
     67                             m_bbox[0].x, m_bbox[1].y, 0.0f,
     68                             m_bbox[1].x, m_bbox[0].y, 0.0f, };
    6969
    7070    float const color[] = { 0.73f, 0.85f, 0.85f, 1.0f,
  • trunk/src/input/input.cpp

    r1897 r1949  
    404404    WorldEntity *top = NULL;
    405405
     406    /* Find the top “widget” amongst all entities that match the
     407     * mouse coordinates */
    406408    for (int n = 0; n < data->nentities; n++)
    407409    {
  • trunk/src/platform/android/androidapp.cpp

    r1944 r1949  
    2626/* One of these wrappers will be overridden by the user's version */
    2727void lol_android_main(void) __attribute__((weak));
    28 void lol_android_main(void) {}
    2928void lol_android_main(int argc, char **argv) __attribute__((weak));
    30 void lol_android_main(int argc, char **argv) {}
    3129void lol_android_main(int argc, char **argv, char **envp) __attribute__((weak));
    32 void lol_android_main(int argc, char **argv, char **envp) {}
    3330
    3431namespace lol
     
    8885JNI_OnLoad(JavaVM* vm, void* reserved)
    8986{
     87    Log::Info("Java layer loading library, vm=0x%08lx", (long)(intptr_t)vm);
    9088    g_vm = vm;
    9189    return JNI_VERSION_1_4;
     
    9593Java_org_zoy_LolEngine_LolActivity_nativeInit(JNIEnv* env, jobject thiz)
    9694{
    97     Log::Info("Java layer initialising activity");
     95    Log::Info("Java layer initialising activity 0x%08lx", (long)thiz);
    9896    env->NewGlobalRef(thiz); /* FIXME: never released! */
    9997    g_activity = thiz;
     
    159157}
    160158
     159/*
     160 * Fake main() wrappers that let us call the user’s main() from within
     161 * a separate thread.
     162 */
     163void lol_android_main(void) {}
     164void lol_android_main(int argc, char **argv)
     165{
     166    (void)argc;
     167    (void)argv;
     168}
     169void lol_android_main(int argc, char **argv, char **envp)
     170{
     171    (void)argc;
     172    (void)argv;
     173    (void)envp;
     174}
     175
    161176#endif /* __ANDROID__ */
    162177
Note: See TracChangeset for help on using the changeset viewer.