thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ANDROID: Introduce back the touch controls for 3D

Browse source
This commit is contained in:
Le Philousophe 2021-10-09 21:23:23 +02:00 • committed by Paweł Kołodziejski
parent ebeb731ad7
commit e4390abd86
13 changed files with 541 additions and 353 deletions
Download patch file Download diff file Expand all files Collapse all files

10
backends/graphics3d/android/android-graphics3d.cpp
View file

@ -76,6 +76,7 @@ AndroidGraphics3dManager::AndroidGraphics3dManager() :
_mouse_texture = _mouse_texture_palette;
initSurface();
JNI::setTouch3DMode(true);
}
AndroidGraphics3dManager::~AndroidGraphics3dManager() {
@ -94,6 +95,7 @@ AndroidGraphics3dManager::~AndroidGraphics3dManager() {
delete _mouse_texture_palette;
delete _mouse_texture_rgb;
JNI::setTouch3DMode(false);
}
static void logExtensions() {
@ -150,7 +152,7 @@ void AndroidGraphics3dManager::initSurface() {
clearScreen(kClearUpdate, 2);
updateEventScale();
_touchControls.init(JNI::egl_surface_width, JNI::egl_surface_height);
dynamic_cast<OSystem_Android *>(g_system)->getTouchControls().init(JNI::egl_surface_width, JNI::egl_surface_height);
}
void AndroidGraphics3dManager::deinitSurface() {
@ -212,7 +214,7 @@ void AndroidGraphics3dManager::updateScreen() {
_game_texture->drawTextureRect();
if (!_show_overlay) {
glEnable(GL_BLEND);
_touchControls.draw();
dynamic_cast<OSystem_Android *>(g_system)->getTouchControls().draw();
}
int cs = _mouse_targetscale;
@ -316,6 +318,8 @@ bool AndroidGraphics3dManager::getFeatureState(OSystem::Feature f) const {
void AndroidGraphics3dManager::showOverlay() {
ENTER();
JNI::setTouch3DMode(false);
_show_overlay = true;
_force_redraw = true;
@ -331,6 +335,8 @@ void AndroidGraphics3dManager::hideOverlay() {
_show_overlay = false;
JNI::setTouch3DMode(true);
updateEventScale();
warpMouse(_game_texture->width() / 2, _game_texture->height() / 2);