games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-25 22:42:04 +02:00
Code Issues Releases Activity

Merge branch 'master' into 'develop'

Browse Source
This commit is contained in:
Ivan Savenko
2025-02-27 21:15:42 +00:00
parent 319d90cbb4 dfda6d2626
commit 8f074490a7
52 changed files with 864 additions and 386 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
client/eventsSDL/InputSourceTouch.cpp
View File

@@ -58,6 +58,14 @@ InputSourceTouch::InputSourceTouch()
void InputSourceTouch::handleEventFingerMotion(const SDL_TouchFingerEvent & tfinger)
{
Point screenSize = ENGINE->screenDimensions();
motionAccumulatedY[tfinger.fingerId] += tfinger.dy;
float motionThreshold = 1.0 / std::min(screenSize.x, screenSize.y);
if(std::abs(motionAccumulatedX[tfinger.fingerId]) < motionThreshold && std::abs(motionAccumulatedY[tfinger.fingerId]) < motionThreshold)
return;
if (settings["video"]["cursor"].String() == "software" && state != TouchState::RELATIVE_MODE)
ENGINE->cursor().cursorMove(ENGINE->getCursorPosition().x, ENGINE->getCursorPosition().y);
@@ -65,12 +73,11 @@ void InputSourceTouch::handleEventFingerMotion(const SDL_TouchFingerEvent & tfin
{
case TouchState::RELATIVE_MODE:
{
Point screenSize = ENGINE->screenDimensions();
int scalingFactor = ENGINE->screenHandler().getScalingFactor();
Point moveDistance {
static_cast<int>(screenSize.x * params.relativeModeSpeedFactor * tfinger.dx),
static_cast<int>(screenSize.y * params.relativeModeSpeedFactor * tfinger.dy)
static_cast<int>(screenSize.x * params.relativeModeSpeedFactor * motionAccumulatedX[tfinger.fingerId]),
static_cast<int>(screenSize.y * params.relativeModeSpeedFactor * motionAccumulatedY[tfinger.fingerId])
};
ENGINE->input().moveCursorPosition(moveDistance);
@@ -111,6 +118,11 @@ void InputSourceTouch::handleEventFingerMotion(const SDL_TouchFingerEvent & tfin
break;
}
}
if(std::abs(motionAccumulatedX[tfinger.fingerId]) >= motionThreshold)
motionAccumulatedX[tfinger.fingerId] = 0;
if(std::abs(motionAccumulatedY[tfinger.fingerId]) >= motionThreshold)
motionAccumulatedY[tfinger.fingerId] = 0;
}
void InputSourceTouch::handleEventFingerDown(const SDL_TouchFingerEvent & tfinger)
@@ -292,7 +304,7 @@ int InputSourceTouch::getNumTouchFingers() const
void InputSourceTouch::emitPanningEvent(const SDL_TouchFingerEvent & tfinger)
{
Point distance = convertTouchToMouse(-tfinger.dx, -tfinger.dy);
Point distance = convertTouchToMouse(-motionAccumulatedX[tfinger.fingerId], -motionAccumulatedY[tfinger.fingerId]);
ENGINE->events().dispatchGesturePanning(lastTapPosition, convertTouchToMouse(tfinger), distance);
}
@@ -326,8 +338,8 @@ void InputSourceTouch::emitPinchEvent(const SDL_TouchFingerEvent & tfinger)
float thisX = tfinger.x * ENGINE->screenDimensions().x;
float thisY = tfinger.y * ENGINE->screenDimensions().y;
float deltaX = tfinger.dx * ENGINE->screenDimensions().x;
float deltaY = tfinger.dy * ENGINE->screenDimensions().y;
float deltaX = motionAccumulatedX[tfinger.fingerId] * ENGINE->screenDimensions().x;
float deltaY = motionAccumulatedY[tfinger.fingerId] * ENGINE->screenDimensions().y;
float oldX = thisX - deltaX - otherX;
float oldY = thisY - deltaY - otherY;