summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/defaults.cpp2
-rw-r--r--src/gui/setup_other.cpp2
-rw-r--r--src/gui/viewport.cpp120
-rw-r--r--src/gui/viewport.h1
4 files changed, 108 insertions, 17 deletions
diff --git a/src/defaults.cpp b/src/defaults.cpp
index 192a6184f..dead34aaf 100644
--- a/src/defaults.cpp
+++ b/src/defaults.cpp
@@ -109,11 +109,13 @@ DefaultsData* getConfigDefaults()
AddDEF("screenheight", 0);
AddDEF("showScreenJoystick", true);
AddDEF("showBeingPopup", false);
+ AddDEF("mouseDirectionMove", true);
#else
AddDEF("screenwidth", defaultScreenWidth);
AddDEF("screenheight", defaultScreenHeight);
AddDEF("showScreenJoystick", false);
AddDEF("showBeingPopup", true);
+ AddDEF("mouseDirectionMove", false);
#endif
AddDEF("screen", false);
AddDEF("hwaccel", false);
diff --git a/src/gui/setup_other.cpp b/src/gui/setup_other.cpp
index 0fec8a99d..e638af3a8 100644
--- a/src/gui/setup_other.cpp
+++ b/src/gui/setup_other.cpp
@@ -111,6 +111,8 @@ Setup_Other::Setup_Other(const Widget2 *const widget) :
new SetupItemTextField(_("Crazy move A program"), "",
"crazyMoveProgram", this, "crazyMoveProgramEvent");
+ new SetupItemCheckBox(_("Mouse relative moves (good for touch interfaces"),
+ "", "mouseDirectionMove", this, "mouseDirectionMoveEvent");
new SetupItemLabel(_("Player"), "", this);
diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp
index 3fb487811..5f12d0df4 100644
--- a/src/gui/viewport.cpp
+++ b/src/gui/viewport.cpp
@@ -64,6 +64,7 @@ Viewport::Viewport() :
mEnableLazyScrolling(config.getBoolValue("enableLazyScrolling")),
mScrollCenterOffsetX(config.getIntValue("ScrollCenterOffsetX")),
mScrollCenterOffsetY(config.getIntValue("ScrollCenterOffsetY")),
+ mMouseDirectionMove(config.getBoolValue("mouseDirectionMove")),
mMouseX(0),
mMouseY(0),
mPixelViewX(0),
@@ -89,6 +90,7 @@ Viewport::Viewport() :
config.addListener("showBeingPopup", this);
config.addListener("selfMouseHeal", this);
config.addListener("enableLazyScrolling", this);
+ config.addListener("mouseDirectionMove", this);
setFocusable(true);
}
@@ -583,27 +585,109 @@ void Viewport::mouseDragged(gcn::MouseEvent &event)
if (mLocalWalkTime != player_node->getActionTime())
{
mLocalWalkTime = cur_time;
- const int destX = (event.getX() + mPixelViewX)
- / static_cast<float>(mMap->getTileWidth());
- const int destY = (event.getY() + mPixelViewY)
- / static_cast<float>(mMap->getTileHeight());
player_node->unSetPickUpTarget();
- if (!player_node->navigateTo(destX, destY))
+ int playerX = player_node->getTileX();
+ int playerY = player_node->getTileY();
+ if (mMouseDirectionMove)
{
- int playerX = player_node->getTileX();
- int playerY = player_node->getTileY();
+ const int width = mainGraphics->mWidth / 2;
+ const int height = mainGraphics->mHeight / 2;
+ const float wh = static_cast<float>(width)
+ / static_cast<float>(height);
+ int x = event.getX() - width;
+ int y = event.getY() - height;
+ if (!x && !y)
+ return;
+ const int x2 = abs(x);
+ const int y2 = abs(y);
+ const float diff = 2;
+ int dx = 0;
+ int dy = 0;
+ if (x2 > y2)
+ {
+ if (y2 && x2 / y2 / wh > diff)
+ y = 0;
+ }
+ else
+ {
+ if (x2 && y2 * wh / x2 > diff)
+ x = 0;
+ }
+ if (x > 0)
+ dx = 1;
+ else if (x < 0)
+ dx = -1;
+ if (y > 0)
+ dy = 1;
+ else if (y < 0)
+ dy = -1;
+
+ if (mMap->getWalk(playerX + dx, playerY + dy))
+ {
+ player_node->navigateTo(playerX + dx, playerY + dy);
+ }
+ else
+ {
+ if (dx && dy)
+ {
+ // try avoid diagonal collision
+ if (x2 > y2)
+ {
+ if (mMap->getWalk(playerX + dx, playerY))
+ dy = 0;
+ else
+ dx = 0;
+ }
+ else
+ {
+ if (mMap->getWalk(playerX, playerY + dy))
+ dx = 0;
+ else
+ dy = 0;
+ }
+ }
+ else
+ {
+ // try avoid vertical or horisontal collision
+ if (!dx)
+ {
+ if (mMap->getWalk(playerX + 1, playerY + dy))
+ dx = 1;
+ if (mMap->getWalk(playerX - 1, playerY + dy))
+ dx = -1;
+ }
+ if (!dy)
+ {
+ if (mMap->getWalk(playerX + dx, playerY + 1))
+ dy = 1;
+ if (mMap->getWalk(playerX + dx, playerY - 1))
+ dy = -1;
+ }
+ }
+ player_node->navigateTo(playerX + dx, playerY + dy);
+ }
+ }
+ else
+ {
+ const int destX = (event.getX() + mPixelViewX)
+ / static_cast<float>(mMap->getTileWidth());
+ const int destY = (event.getY() + mPixelViewY)
+ / static_cast<float>(mMap->getTileHeight());
if (playerX != destX && playerY != destY)
{
- if (playerX > destX)
- playerX --;
- else if (playerX < destX)
- playerX ++;
- if (playerY > destY)
- playerY --;
- else if (playerY < destY)
- playerY ++;
- if (mMap->getWalk(playerX, playerY, 0))
- player_node->navigateTo(playerX, playerY);
+ if (!player_node->navigateTo(destX, destY))
+ {
+ if (playerX > destX)
+ playerX --;
+ else if (playerX < destX)
+ playerX ++;
+ if (playerY > destY)
+ playerY --;
+ else if (playerY < destY)
+ playerY ++;
+ if (mMap->getWalk(playerX, playerY, 0))
+ player_node->navigateTo(playerX, playerY);
+ }
}
}
}
@@ -742,6 +826,8 @@ void Viewport::optionChanged(const std::string &name A_UNUSED)
mSelfMouseHeal = config.getBoolValue("selfMouseHeal");
else if (name == "enableLazyScrolling")
mEnableLazyScrolling = config.getBoolValue("enableLazyScrolling");
+ else if (name == "mouseDirectionMove")
+ mMouseDirectionMove = config.getBoolValue("mouseDirectionMove");
}
void Viewport::mouseMoved(gcn::MouseEvent &event A_UNUSED)
diff --git a/src/gui/viewport.h b/src/gui/viewport.h
index c370f1e3b..3724b4925 100644
--- a/src/gui/viewport.h
+++ b/src/gui/viewport.h
@@ -311,6 +311,7 @@ class Viewport final : public WindowContainer,
bool mEnableLazyScrolling;
int mScrollCenterOffsetX;
int mScrollCenterOffsetY;
+ bool mMouseDirectionMove;
int mMouseX; /**< Current mouse position in pixels. */
int mMouseY; /**< Current mouse position in pixels. */
int mPixelViewX; /**< Current viewpoint in pixels. */
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-01 14:17:19 +0000