Changeset 780


Ignore:
Timestamp:
Jun 14, 2011, 1:54:44 AM (10 years ago)
Author:
sam
Message:

android: compilation fixes for recent engine changes.

Location:
trunk/src
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/androidapp.cpp

    r744 r780  
    4444    __android_log_print(ANDROID_LOG_INFO, "LOL", "init");
    4545    Ticker::Setup(30.0f);
    46     Video::Setup(320, 200);
     46    Video::Setup(vec2i(320, 200));
    4747
    4848    new Interface();
     
    5555{
    5656    __android_log_print(ANDROID_LOG_INFO, "LOL", "resize w=%d h=%d", w, h);
    57     Video::Setup(w, h);
     57    Video::Setup(vec2i(w, h));
    5858}
    5959
     
    8686                                          jint x, jint y)
    8787{
    88     vec2i pos(x * 640 / Video::GetWidth(),
    89               480 - 1 - y * 480 / Video::GetHeight());
     88    vec2i pos = vec2i(0, 479) + vec2i(x * 640, -y * 480) / Video::GetSize();
    9089    Input::SetMousePos(pos);
    9190}
  • trunk/src/video.cpp

    r777 r780  
    149149
    150150#if defined ANDROID_NDK
    151     size = vec(640.0f, 480.0f);
     151    size = vec2(640.0f, 480.0f);
    152152#endif
    153153
Note: See TracChangeset for help on using the changeset viewer.