diff options
author | dhewg | 2011-03-14 23:44:43 +0100 |
---|---|---|
committer | dhewg | 2011-03-15 00:05:59 +0100 |
commit | 7b850c18c7303fa06ff357cf2295e868a16ed1cf (patch) | |
tree | 1fe926617fd2f9e9748171bb182c27d04526cb90 | |
parent | 8f40a18146a1a16a5a1d3932e08c2f45e53ea000 (diff) | |
download | scummvm-rg350-7b850c18c7303fa06ff357cf2295e868a16ed1cf.tar.gz scummvm-rg350-7b850c18c7303fa06ff357cf2295e868a16ed1cf.tar.bz2 scummvm-rg350-7b850c18c7303fa06ff357cf2295e868a16ed1cf.zip |
ANDROID: Cleanup
-rw-r--r-- | backends/platform/android/android.cpp | 3 | ||||
-rw-r--r-- | backends/platform/android/android.h | 18 | ||||
-rw-r--r-- | backends/platform/android/gfx.cpp | 8 |
3 files changed, 10 insertions, 19 deletions
diff --git a/backends/platform/android/android.cpp b/backends/platform/android/android.cpp index 72810b6fb7..dc8dc9d9c0 100644 --- a/backends/platform/android/android.cpp +++ b/backends/platform/android/android.cpp @@ -534,6 +534,7 @@ bool OSystem_Android::pollEvent(Common::Event &event) { } break; } + default: break; } @@ -554,7 +555,7 @@ uint32 OSystem_Android::getMillis() { gettimeofday(&curTime, 0); - return (uint32)(((curTime.tv_sec - _startTime.tv_sec) * 1000) + \ + return (uint32)(((curTime.tv_sec - _startTime.tv_sec) * 1000) + ((curTime.tv_usec - _startTime.tv_usec) / 1000)); } diff --git a/backends/platform/android/android.h b/backends/platform/android/android.h index db2cb95650..dc45f06cb6 100644 --- a/backends/platform/android/android.h +++ b/backends/platform/android/android.h @@ -229,23 +229,7 @@ public: int x, int y, int w, int h); virtual int16 getOverlayHeight(); virtual int16 getOverlayWidth(); - - // RGBA 4444 - virtual Graphics::PixelFormat getOverlayFormat() const { - Graphics::PixelFormat format; - - format.bytesPerPixel = 2; - format.rLoss = 8 - 4; - format.gLoss = 8 - 4; - format.bLoss = 8 - 4; - format.aLoss = 8 - 4; - format.rShift = 3 * 4; - format.gShift = 2 * 4; - format.bShift = 1 * 4; - format.aShift = 0 * 4; - - return format; - } + virtual Graphics::PixelFormat getOverlayFormat() const; virtual bool showMouse(bool visible); diff --git a/backends/platform/android/gfx.cpp b/backends/platform/android/gfx.cpp index d08cc631bf..65f98d5094 100644 --- a/backends/platform/android/gfx.cpp +++ b/backends/platform/android/gfx.cpp @@ -449,6 +449,7 @@ void OSystem_Android::updateScreen() { _game_texture->drawTextureRect(); } else { GLCALL(glPushMatrix()); + GLCALL(glScalex(xdiv(_egl_surface_width, _focus_rect.width()), xdiv(_egl_surface_height, _focus_rect.height()), 1 << 16)); @@ -459,6 +460,7 @@ void OSystem_Android::updateScreen() { 1 << 16)); _game_texture->drawTextureRect(); + GLCALL(glPopMatrix()); } @@ -476,7 +478,7 @@ void OSystem_Android::updateScreen() { if (_show_mouse) { GLCALL(glPushMatrix()); - Common::Point mouse = getEventManager()->getMousePos(); + const Common::Point &mouse = getEventManager()->getMousePos(); // Scale up ScummVM -> OpenGL (pixel) coordinates if (_show_overlay) { @@ -659,6 +661,10 @@ int16 OSystem_Android::getOverlayWidth() { return _overlay_texture->width(); } +Graphics::PixelFormat OSystem_Android::getOverlayFormat() const { + return _overlay_texture->getPixelFormat(); +} + bool OSystem_Android::showMouse(bool visible) { ENTER("%d", visible); |