Add crosshair support for Android

If enabled, a crosshair will be shown to select object.
This will give Android player a way to play like they play on desktop.
On third-person front camera mode, player is unable to select anything.
On third-person back camera mode, player is forced to use crosshair.

builtin/settingtypes.txt

@@ -131,6 +131,10 @@ continuous_forward (Continuous forward) bool false
 # The length in pixels it takes for touch screen interaction to start.
 touchscreen_threshold (Touch screen threshold) int 20 0 100
 
+# (Android) Use crosshair to select object instead of whole screen.
+# If enabled, a crosshair will be shown and will be used for selecting object.
+use_crosshair (Use crosshair) bool false
+
 # (Android) Fixes the position of virtual joystick.
 # If disabled, virtual joystick will center to first-touch's position.
 fixed_virtual_joystick (Fixed virtual joystick) bool false

src/client/game.cpp

@@ -2849,6 +2849,11 @@ void Game::updateCamera(u32 busy_time, f32 dtime)
 
  camera->toggleCameraMode();
 
+#ifdef HAVE_TOUCHSCREENGUI
+ if (g_touchscreengui)
+ g_touchscreengui->setCameraMode(camera->getCameraMode());
+#endif
+
  playercao->setVisible(camera->getCameraMode() > CAMERA_MODE_FIRST);
  playercao->setChildrenVisible(camera->getCameraMode() > CAMERA_MODE_FIRST);
  }
@@ -2950,24 +2955,21 @@ void Game::processPlayerInteraction(f32 dtime, bool show_hud, bool show_debug)
  if (camera->getCameraMode() != CAMERA_MODE_THIRD_FRONT) {
  shootline = core::line3d<f32>(player_eye_position,
  player_eye_position + camera_direction * BS * d);
+#ifdef HAVE_TOUCHSCREENGUI
+ if ((g_settings->getBool("touchtarget")) && (g_touchscreengui)) {
+ shootline = g_touchscreengui->getShootline();
+ // Scale shootline to the acual distance the player can reach
+ shootline.end = shootline.start
+ + shootline.getVector().normalize() * BS * d;
+ shootline.start += intToFloat(camera_offset, BS);
+ shootline.end += intToFloat(camera_offset, BS);
+ }
+#endif
  } else {
  // prevent player pointing anything in front-view
  shootline = core::line3d<f32>(camera_position, camera_position);
  }
 
-#ifdef HAVE_TOUCHSCREENGUI
-
- if ((g_settings->getBool("touchtarget")) && (g_touchscreengui)) {
- shootline = g_touchscreengui->getShootline();
- // Scale shootline to the acual distance the player can reach
- shootline.end = shootline.start
- + shootline.getVector().normalize() * BS * d;
- shootline.start += intToFloat(camera_offset, BS);
- shootline.end += intToFloat(camera_offset, BS);
- }
-
-#endif
-
  PointedThing pointed = updatePointedThing(shootline,
  selected_def.liquids_pointable,
  !runData.ldown_for_dig,
@@ -3802,7 +3804,10 @@ void Game::updateFrame(ProfilerGraph *graph, RunStats *stats, f32 dtime,
  (camera->getCameraMode() != CAMERA_MODE_THIRD_FRONT));
 #ifdef HAVE_TOUCHSCREENGUI
  try {
- draw_crosshair = !g_settings->getBool("touchtarget");
+ draw_crosshair = !g_settings->getBool("touchtarget") ||
+ (g_settings->getBool("use_crosshair") &&
+ camera->getCameraMode() != CAMERA_MODE_THIRD_FRONT) ||
+ camera->getCameraMode() == CAMERA_MODE_THIRD;
  } catch (SettingNotFoundException) {
  }
 #endif

src/defaultsettings.cpp

@@ -447,6 +447,7 @@ void set_default_settings(Settings *settings)
  settings->setDefault("touchtarget", "true");
  settings->setDefault("TMPFolder", porting::getDataPath("tmp" DIR_DELIM));
  settings->setDefault("touchscreen_threshold","20");
+ settings->setDefault("use_crosshair", "false");
  settings->setDefault("fixed_virtual_joystick", "false");
  settings->setDefault("virtual_joystick_triggers_aux", "false");
  settings->setDefault("smooth_lighting", "false");

src/gui/touchscreengui.cpp

@@ -459,6 +459,7 @@ TouchScreenGUI::TouchScreenGUI(IrrlichtDevice *device, IEventReceiver *receiver)
  m_touchscreen_threshold = g_settings->getU16("touchscreen_threshold");
  m_fixed_joystick = g_settings->getBool("fixed_virtual_joystick");
  m_joystick_triggers_special1 = g_settings->getBool("virtual_joystick_triggers_aux");
+ m_use_crosshair = g_settings->getBool("use_crosshair");
  m_screensize = m_device->getVideoDriver()->getScreenSize();
 }
 
@@ -761,8 +762,13 @@ void TouchScreenGUI::handleReleaseEvent(int evt_id)
  SEvent *translated = new SEvent;
  memset(translated, 0, sizeof(SEvent));
  translated->EventType = EET_MOUSE_INPUT_EVENT;
- translated->MouseInput.X = m_move_downlocation.X;
- translated->MouseInput.Y = m_move_downlocation.Y;
+ if (m_use_crosshair || m_camera_mode == CAMERA_MODE_THIRD) {
+ translated->MouseInput.X = m_screensize.X / 2;
+ translated->MouseInput.Y = m_screensize.Y / 2;
+ } else {
+ translated->MouseInput.X = m_move_downlocation.X;
+ translated->MouseInput.Y = m_move_downlocation.Y;
+ }
  translated->MouseInput.Shift = false;
  translated->MouseInput.Control = false;
  translated->MouseInput.ButtonStates = 0;
@@ -886,7 +892,11 @@ void TouchScreenGUI::translateEvent(const SEvent &event)
  m_move_id = event.TouchInput.ID;
  m_move_has_really_moved = false;
  m_move_downtime = porting::getTimeMs();
- m_move_downlocation = v2s32(event.TouchInput.X, event.TouchInput.Y);
+ if (m_use_crosshair || m_camera_mode == CAMERA_MODE_THIRD) {
+ m_move_downlocation = v2s32(m_screensize.X / 2, m_screensize.Y / 2);
+ } else {
+ m_move_downlocation = v2s32(event.TouchInput.X, event.TouchInput.Y);
+ }
  m_move_sent_as_mouse_event = false;
  }
  }
@@ -909,7 +919,8 @@ void TouchScreenGUI::translateEvent(const SEvent &event)
 
  if (m_move_id != -1) {
  if ((event.TouchInput.ID == m_move_id) &&
- (!m_move_sent_as_mouse_event)) {
+ (!m_move_sent_as_mouse_event || m_use_crosshair ||
+ m_camera_mode == CAMERA_MODE_THIRD)) {
 
  double distance = sqrt(
  (m_pointerpos[event.TouchInput.ID].X - event.TouchInput.X) *
@@ -926,6 +937,7 @@ void TouchScreenGUI::translateEvent(const SEvent &event)
  // update camera_yaw and camera_pitch
  s32 dx = X - m_pointerpos[event.TouchInput.ID].X;
  s32 dy = Y - m_pointerpos[event.TouchInput.ID].Y;
+ m_pointerpos[event.TouchInput.ID] = v2s32(X, Y);
 
  // adapt to similar behaviour as pc screen
  double d = g_settings->getFloat("mouse_sensitivity") * 4;
@@ -936,11 +948,14 @@ void TouchScreenGUI::translateEvent(const SEvent &event)
  m_camera_pitch = MYMIN(MYMAX(m_camera_pitch + (dy * d), -180), 180);
 
  // update shootline
+ if (m_use_crosshair || m_camera_mode == CAMERA_MODE_THIRD) {
+ X = m_screensize.X / 2;
+ Y = m_screensize.Y / 2;
+ }
  m_shootline = m_device
  ->getSceneManager()
  ->getSceneCollisionManager()
  ->getRayFromScreenCoordinates(v2s32(X, Y));
- m_pointerpos[event.TouchInput.ID] = v2s32(X, Y);
  }
  }
  else if ((event.TouchInput.ID == m_move_id) &&
@@ -1109,11 +1124,18 @@ bool TouchScreenGUI::doubleTapDetection()
  if (distance > (20 + m_touchscreen_threshold))
  return false;
 
+ s32 mX = m_key_events[0].x;
+ s32 mY = m_key_events[0].y;
+ if (m_use_crosshair || m_camera_mode == CAMERA_MODE_THIRD) {
+ mX = m_screensize.X / 2;
+ mY = m_screensize.Y / 2;
+ }
+
  SEvent *translated = new SEvent();
  memset(translated, 0, sizeof(SEvent));
  translated->EventType = EET_MOUSE_INPUT_EVENT;
- translated->MouseInput.X = m_key_events[0].x;
- translated->MouseInput.Y = m_key_events[0].y;
+ translated->MouseInput.X = mX;
+ translated->MouseInput.Y = mY;
  translated->MouseInput.Shift = false;
  translated->MouseInput.Control = false;
  translated->MouseInput.ButtonStates = EMBSM_RIGHT;
@@ -1122,7 +1144,7 @@ bool TouchScreenGUI::doubleTapDetection()
  m_shootline = m_device
  ->getSceneManager()
  ->getSceneCollisionManager()
- ->getRayFromScreenCoordinates(v2s32(m_key_events[0].x, m_key_events[0].y));
+ ->getRayFromScreenCoordinates(v2s32(mX, mY));
 
  translated->MouseInput.Event = EMIE_RMOUSE_PRESSED_DOWN;
  verbosestream << "TouchScreenGUI::translateEvent right click press" << std::endl;
@@ -1221,17 +1243,23 @@ void TouchScreenGUI::step(float dtime)
  u64 delta = porting::getDeltaMs(m_move_downtime, porting::getTimeMs());
 
  if (delta > MIN_DIG_TIME_MS) {
+ s32 mX = m_move_downlocation.X;
+ s32 mY = m_move_downlocation.Y;
+ if (m_use_crosshair || m_camera_mode == CAMERA_MODE_THIRD) {
+ mX = m_screensize.X / 2;
+ mY = m_screensize.Y / 2;
+ }
  m_shootline = m_device
  ->getSceneManager()
  ->getSceneCollisionManager()
  ->getRayFromScreenCoordinates(
- v2s32(m_move_downlocation.X,m_move_downlocation.Y));
+ v2s32(mX, mY));
 
  SEvent translated;
  memset(&translated, 0, sizeof(SEvent));
  translated.EventType = EET_MOUSE_INPUT_EVENT;
- translated.MouseInput.X = m_move_downlocation.X;
- translated.MouseInput.Y = m_move_downlocation.Y;
+ translated.MouseInput.X = mX;
+ translated.MouseInput.Y = mY;
  translated.MouseInput.Shift = false;
  translated.MouseInput.Control = false;
  translated.MouseInput.ButtonStates = EMBSM_LEFT;

src/gui/touchscreengui.h

@@ -28,6 +28,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 #include "client/tile.h"
 #include "client/game.h"
+#include "client/camera.h"
 
 using namespace irr;
 using namespace irr::core;
@@ -195,6 +196,7 @@ class TouchScreenGUI
  void step(float dtime);
  void resetHud();
  void registerHudItem(int index, const rect<s32> &rect);
+ inline void setCameraMode(CameraMode camera_mode) { m_camera_mode = camera_mode; }
  void Toggle(bool visible);
 
  void hide();
@@ -215,6 +217,9 @@ class TouchScreenGUI
  double m_camera_yaw_change = 0.0;
  double m_camera_pitch = 0.0;
 
+ // camera mode (used for crosshair)
+ CameraMode m_camera_mode = CAMERA_MODE_FIRST;
+
  // forward, backward, left, right
  touch_gui_button_id m_joystick_names[5] = {
  forward_id, backward_id, left_id, right_id, special1_id};
@@ -238,6 +243,7 @@ class TouchScreenGUI
  bool m_joystick_has_really_moved = false;
  bool m_fixed_joystick = false;
  bool m_joystick_triggers_special1 = false;
+ bool m_use_crosshair = false;
  button_info *m_joystick_btn_off = nullptr;
  button_info *m_joystick_btn_bg = nullptr;
  button_info *m_joystick_btn_center = nullptr;