1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-07-02 16:38:41 +00:00

Expose analog joystick input to the Lua API (#14348)

This commit is contained in:
grorp 2024-10-01 17:21:42 +02:00 committed by GitHub
parent 6569fdd4d1
commit 22ef4c8be1
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
13 changed files with 127 additions and 83 deletions

View file

@ -173,6 +173,42 @@ u16 Player::getMaxHotbarItemcount()
return mainlist ? std::min(mainlist->getSize(), (u32) hud_hotbar_itemcount) : 0;
}
void PlayerControl::setMovementFromKeys()
{
bool a_up = direction_keys & (1 << 0),
a_down = direction_keys & (1 << 1),
a_left = direction_keys & (1 << 2),
a_right = direction_keys & (1 << 3);
if (a_up || a_down || a_left || a_right) {
// if contradictory keys pressed, stay still
if (a_up && a_down && a_left && a_right)
movement_speed = 0.0f;
else if (a_up && a_down && !a_left && !a_right)
movement_speed = 0.0f;
else if (!a_up && !a_down && a_left && a_right)
movement_speed = 0.0f;
else
// If there is a keyboard event, assume maximum speed
movement_speed = 1.0f;
}
// Check keyboard for input
float x = 0, y = 0;
if (a_up)
y += 1;
if (a_down)
y -= 1;
if (a_left)
x -= 1;
if (a_right)
x += 1;
if (x != 0 || y != 0)
// If there is a keyboard event, it takes priority
movement_direction = std::atan2(x, y);
}
#ifndef SERVER
u32 PlayerControl::getKeysPressed() const
@ -231,6 +267,11 @@ void PlayerControl::unpackKeysPressed(u32 keypress_bits)
zoom = keypress_bits & (1 << 9);
}
v2f PlayerControl::getMovement() const
{
return v2f(std::sin(movement_direction), std::cos(movement_direction)) * movement_speed;
}
static auto tie(const PlayerPhysicsOverride &o)
{
// Make sure to add new members to this list!