mirror of
https://github.com/Kelsidavis/WoWee.git
synced 2026-05-03 00:03:50 +00:00
physics: implement Water Walk movement state tracking and surface clamping
SMSG_MOVE_WATER_WALK / SMSG_MOVE_LAND_WALK now correctly set/clear WATER_WALK (0x00008000) in movementInfo.flags, ensuring the flag is included in movement ACKs sent to the server. In CameraController, when waterWalkActive_ is set and the player is at or above the water surface (within 0.5 units), clamp them to the water surface and mark as grounded — preventing water entry and allowing them to walk across the water surface as the spell intends.
This commit is contained in:
parent
0b99cbafb2
commit
1853e8aa56
6 changed files with 20 additions and 3 deletions
|
|
@ -1163,6 +1163,9 @@ public:
|
||||||
bool isFeatherFalling() const {
|
bool isFeatherFalling() const {
|
||||||
return (movementInfo.flags & static_cast<uint32_t>(MovementFlags::FEATHER_FALL)) != 0;
|
return (movementInfo.flags & static_cast<uint32_t>(MovementFlags::FEATHER_FALL)) != 0;
|
||||||
}
|
}
|
||||||
|
bool isWaterWalking() const {
|
||||||
|
return (movementInfo.flags & static_cast<uint32_t>(MovementFlags::WATER_WALK)) != 0;
|
||||||
|
}
|
||||||
void dismount();
|
void dismount();
|
||||||
|
|
||||||
// Taxi / Flight Paths
|
// Taxi / Flight Paths
|
||||||
|
|
|
||||||
|
|
@ -396,6 +396,7 @@ enum class MovementFlags : uint32_t {
|
||||||
FALLING = 0x00001000,
|
FALLING = 0x00001000,
|
||||||
FALLINGFAR = 0x00002000,
|
FALLINGFAR = 0x00002000,
|
||||||
FEATHER_FALL = 0x00004000, // Slow fall / Parachute
|
FEATHER_FALL = 0x00004000, // Slow fall / Parachute
|
||||||
|
WATER_WALK = 0x00008000, // Walk on water surface
|
||||||
SWIMMING = 0x00200000,
|
SWIMMING = 0x00200000,
|
||||||
ASCENDING = 0x00400000,
|
ASCENDING = 0x00400000,
|
||||||
CAN_FLY = 0x00800000,
|
CAN_FLY = 0x00800000,
|
||||||
|
|
|
||||||
|
|
@ -98,6 +98,7 @@ public:
|
||||||
bool isMovementRooted() const { return movementRooted_; }
|
bool isMovementRooted() const { return movementRooted_; }
|
||||||
void setGravityDisabled(bool disabled) { gravityDisabled_ = disabled; }
|
void setGravityDisabled(bool disabled) { gravityDisabled_ = disabled; }
|
||||||
void setFeatherFallActive(bool active) { featherFallActive_ = active; }
|
void setFeatherFallActive(bool active) { featherFallActive_ = active; }
|
||||||
|
void setWaterWalkActive(bool active) { waterWalkActive_ = active; }
|
||||||
void setMounted(bool m) { mounted_ = m; }
|
void setMounted(bool m) { mounted_ = m; }
|
||||||
void setMountHeightOffset(float offset) { mountHeightOffset_ = offset; }
|
void setMountHeightOffset(float offset) { mountHeightOffset_ = offset; }
|
||||||
void setExternalFollow(bool enabled) { externalFollow_ = enabled; }
|
void setExternalFollow(bool enabled) { externalFollow_ = enabled; }
|
||||||
|
|
@ -282,6 +283,8 @@ private:
|
||||||
bool gravityDisabled_ = false;
|
bool gravityDisabled_ = false;
|
||||||
// Server-driven feather fall: cap downward velocity to slow-fall terminal.
|
// Server-driven feather fall: cap downward velocity to slow-fall terminal.
|
||||||
bool featherFallActive_ = false;
|
bool featherFallActive_ = false;
|
||||||
|
// Server-driven water walk: treat water surface as ground (don't swim).
|
||||||
|
bool waterWalkActive_ = false;
|
||||||
bool mounted_ = false;
|
bool mounted_ = false;
|
||||||
float mountHeightOffset_ = 0.0f;
|
float mountHeightOffset_ = 0.0f;
|
||||||
bool externalMoving_ = false;
|
bool externalMoving_ = false;
|
||||||
|
|
|
||||||
|
|
@ -1014,6 +1014,7 @@ void Application::update(float deltaTime) {
|
||||||
renderer->getCameraController()->setMovementRooted(gameHandler->isPlayerRooted());
|
renderer->getCameraController()->setMovementRooted(gameHandler->isPlayerRooted());
|
||||||
renderer->getCameraController()->setGravityDisabled(gameHandler->isGravityDisabled());
|
renderer->getCameraController()->setGravityDisabled(gameHandler->isGravityDisabled());
|
||||||
renderer->getCameraController()->setFeatherFallActive(gameHandler->isFeatherFalling());
|
renderer->getCameraController()->setFeatherFallActive(gameHandler->isFeatherFalling());
|
||||||
|
renderer->getCameraController()->setWaterWalkActive(gameHandler->isWaterWalking());
|
||||||
}
|
}
|
||||||
|
|
||||||
bool onTaxi = gameHandler &&
|
bool onTaxi = gameHandler &&
|
||||||
|
|
|
||||||
|
|
@ -2459,7 +2459,8 @@ void GameHandler::handlePacket(network::Packet& packet) {
|
||||||
static_cast<uint32_t>(MovementFlags::FEATHER_FALL), true);
|
static_cast<uint32_t>(MovementFlags::FEATHER_FALL), true);
|
||||||
break;
|
break;
|
||||||
case Opcode::SMSG_MOVE_WATER_WALK:
|
case Opcode::SMSG_MOVE_WATER_WALK:
|
||||||
handleForceMoveFlagChange(packet, "WATER_WALK", Opcode::CMSG_MOVE_WATER_WALK_ACK, 0, true);
|
handleForceMoveFlagChange(packet, "WATER_WALK", Opcode::CMSG_MOVE_WATER_WALK_ACK,
|
||||||
|
static_cast<uint32_t>(MovementFlags::WATER_WALK), true);
|
||||||
break;
|
break;
|
||||||
case Opcode::SMSG_MOVE_SET_HOVER:
|
case Opcode::SMSG_MOVE_SET_HOVER:
|
||||||
handleForceMoveFlagChange(packet, "SET_HOVER", Opcode::CMSG_MOVE_HOVER_ACK,
|
handleForceMoveFlagChange(packet, "SET_HOVER", Opcode::CMSG_MOVE_HOVER_ACK,
|
||||||
|
|
@ -5588,7 +5589,8 @@ void GameHandler::handlePacket(network::Packet& packet) {
|
||||||
static_cast<uint32_t>(MovementFlags::LEVITATING), false);
|
static_cast<uint32_t>(MovementFlags::LEVITATING), false);
|
||||||
break;
|
break;
|
||||||
case Opcode::SMSG_MOVE_LAND_WALK:
|
case Opcode::SMSG_MOVE_LAND_WALK:
|
||||||
handleForceMoveFlagChange(packet, "LAND_WALK", Opcode::CMSG_MOVE_WATER_WALK_ACK, 0, false);
|
handleForceMoveFlagChange(packet, "LAND_WALK", Opcode::CMSG_MOVE_WATER_WALK_ACK,
|
||||||
|
static_cast<uint32_t>(MovementFlags::WATER_WALK), false);
|
||||||
break;
|
break;
|
||||||
case Opcode::SMSG_MOVE_NORMAL_FALL:
|
case Opcode::SMSG_MOVE_NORMAL_FALL:
|
||||||
handleForceMoveFlagChange(packet, "NORMAL_FALL", Opcode::CMSG_MOVE_FEATHER_FALL_ACK,
|
handleForceMoveFlagChange(packet, "NORMAL_FALL", Opcode::CMSG_MOVE_FEATHER_FALL_ACK,
|
||||||
|
|
|
||||||
|
|
@ -410,7 +410,14 @@ void CameraController::update(float deltaTime) {
|
||||||
constexpr float MAX_SWIM_DEPTH_FROM_SURFACE = 12.0f;
|
constexpr float MAX_SWIM_DEPTH_FROM_SURFACE = 12.0f;
|
||||||
constexpr float MIN_SWIM_WATER_DEPTH = 1.0f;
|
constexpr float MIN_SWIM_WATER_DEPTH = 1.0f;
|
||||||
bool inWater = false;
|
bool inWater = false;
|
||||||
if (waterH && targetPos.z < *waterH) {
|
// Water Walk: treat water surface as ground — player walks on top, not through.
|
||||||
|
if (waterWalkActive_ && waterH && targetPos.z >= *waterH - 0.5f) {
|
||||||
|
// Clamp to water surface so the player stands on it
|
||||||
|
targetPos.z = *waterH;
|
||||||
|
verticalVelocity = 0.0f;
|
||||||
|
grounded = true;
|
||||||
|
inWater = false;
|
||||||
|
} else if (waterH && targetPos.z < *waterH) {
|
||||||
std::optional<uint16_t> waterType;
|
std::optional<uint16_t> waterType;
|
||||||
if (waterRenderer) {
|
if (waterRenderer) {
|
||||||
waterType = waterRenderer->getWaterTypeAt(targetPos.x, targetPos.y);
|
waterType = waterRenderer->getWaterTypeAt(targetPos.x, targetPos.y);
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue