phaneron/Kelsidavis-WoWee
1
0
Fork 0
mirror of https://github.com/Kelsidavis/WoWee.git synced 2026-03-22 23:30:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

physics: sync server turn rate and fix SPLINE speed handlers

Browse source 
- Add getServerTurnRate() accessor and turnRateOverride_ field so the
  keyboard turn speed respects SMSG_FORCE_TURN_RATE_CHANGE from server
- Convert rad/s → deg/s before applying to camera yaw logic
- Fix SMSG_SPLINE_SET_RUN_BACK/SWIM/FLIGHT/FLIGHT_BACK/SWIM_BACK/WALK/
  TURN_RATE handlers: all previously discarded the value; now update the
  corresponding serverXxxSpeed_ / serverTurnRate_ field when GUID matches
  playerGuid (camera controller syncs these every frame)
This commit is contained in:
Kelsi 2026-03-10 14:18:25 -07:00
parent e2f65dfc59
commit a9ddfe70c2
5 changed files with 36 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

1
include/game/game_handler.hpp
View file

@ -1158,6 +1158,7 @@ public:
float getServerFlightSpeed() const { return serverFlightSpeed_; }
float getServerFlightBackSpeed() const { return serverFlightBackSpeed_; }
float getServerRunBackSpeed() const { return serverRunBackSpeed_; }
float getServerTurnRate() const { return serverTurnRate_; }
bool isPlayerRooted() const {
return (movementInfo.flags & static_cast<uint32_t>(MovementFlags::ROOT)) != 0;
}

3
include/rendering/camera_controller.hpp
View file

@ -98,6 +98,8 @@ public:
void setFlightSpeedOverride(float speed) { flightSpeedOverride_ = speed; }
void setFlightBackSpeedOverride(float speed) { flightBackSpeedOverride_ = speed; }
void setRunBackSpeedOverride(float speed) { runBackSpeedOverride_ = speed; }
// Server turn rate in rad/s (SMSG_FORCE_TURN_RATE_CHANGE); 0 = use WOW_TURN_SPEED default
void setTurnRateOverride(float rateRadS) { turnRateOverride_ = rateRadS; }
void setMovementRooted(bool rooted) { movementRooted_ = rooted; }
bool isMovementRooted() const { return movementRooted_; }
void setGravityDisabled(bool disabled) { gravityDisabled_ = disabled; }
@ -287,6 +289,7 @@ private:
float flightSpeedOverride_ = 0.0f;
float flightBackSpeedOverride_ = 0.0f;
float runBackSpeedOverride_ = 0.0f;
float turnRateOverride_ = 0.0f; // rad/s; 0 = WOW_TURN_SPEED default (π rad/s)
// Server-driven root state: when true, block all horizontal movement input.
bool movementRooted_ = false;
// Server-driven gravity disable (levitate/hover): skip gravity accumulation.

1
src/core/application.cpp
View file

@ -1015,6 +1015,7 @@ void Application::update(float deltaTime) {
renderer->getCameraController()->setFlightSpeedOverride(gameHandler->getServerFlightSpeed());
renderer->getCameraController()->setFlightBackSpeedOverride(gameHandler->getServerFlightBackSpeed());
renderer->getCameraController()->setRunBackSpeedOverride(gameHandler->getServerRunBackSpeed());
renderer->getCameraController()->setTurnRateOverride(gameHandler->getServerTurnRate());
renderer->getCameraController()->setMovementRooted(gameHandler->isPlayerRooted());
renderer->getCameraController()->setGravityDisabled(gameHandler->isGravityDisabled());
renderer->getCameraController()->setFeatherFallActive(gameHandler->isFeatherFalling());

31
src/game/game_handler.cpp
View file

@ -2401,9 +2401,13 @@ void GameHandler::handlePacket(network::Packet& packet) {
uint64_t guid = UpdateObjectParser::readPackedGuid(packet);
if (packet.getSize() - packet.getReadPos() < 4) break;
float speed = packet.readFloat();
if (guid == playerGuid && std::isfinite(speed) && speed > 0.1f && speed < 100.0f &&
*logicalOp == Opcode::SMSG_SPLINE_SET_RUN_SPEED) {
serverRunSpeed_ = speed;
if (guid == playerGuid && std::isfinite(speed) && speed > 0.01f && speed < 200.0f) {
if (*logicalOp == Opcode::SMSG_SPLINE_SET_RUN_SPEED)
serverRunSpeed_ = speed;
else if (*logicalOp == Opcode::SMSG_SPLINE_SET_RUN_BACK_SPEED)
serverRunBackSpeed_ = speed;
else if (*logicalOp == Opcode::SMSG_SPLINE_SET_SWIM_SPEED)
serverSwimSpeed_ = speed;
}
break;
}
@ -5190,11 +5194,22 @@ void GameHandler::handlePacket(network::Packet& packet) {
case Opcode::SMSG_SPLINE_SET_WALK_SPEED:
case Opcode::SMSG_SPLINE_SET_TURN_RATE:
case Opcode::SMSG_SPLINE_SET_PITCH_RATE: {
// Minimal parse: PackedGuid + float speed (no per-entity speed store yet)
if (packet.getSize() - packet.getReadPos() >= 5) {
(void)UpdateObjectParser::readPackedGuid(packet);
if (packet.getSize() - packet.getReadPos() >= 4)
(void)packet.readFloat();
// Minimal parse: PackedGuid + float speed
if (packet.getSize() - packet.getReadPos() < 5) break;
uint64_t sGuid = UpdateObjectParser::readPackedGuid(packet);
if (packet.getSize() - packet.getReadPos() < 4) break;
float sSpeed = packet.readFloat();
if (sGuid == playerGuid && std::isfinite(sSpeed) && sSpeed > 0.01f && sSpeed < 200.0f) {
if (*logicalOp == Opcode::SMSG_SPLINE_SET_FLIGHT_SPEED)
serverFlightSpeed_ = sSpeed;
else if (*logicalOp == Opcode::SMSG_SPLINE_SET_FLIGHT_BACK_SPEED)
serverFlightBackSpeed_ = sSpeed;
else if (*logicalOp == Opcode::SMSG_SPLINE_SET_SWIM_BACK_SPEED)
serverSwimBackSpeed_ = sSpeed;
else if (*logicalOp == Opcode::SMSG_SPLINE_SET_WALK_SPEED)
serverWalkSpeed_ = sSpeed;
else if (*logicalOp == Opcode::SMSG_SPLINE_SET_TURN_RATE)
serverTurnRate_ = sSpeed; // rad/s
}
break;
}

11
src/rendering/camera_controller.cpp
View file

@ -298,11 +298,16 @@ void CameraController::update(float deltaTime) {
nowStrafeRight = !movBlocked && (keyD || keyE);
}
// Keyboard turning updates camera yaw (character follows yaw in renderer)
// Keyboard turning updates camera yaw (character follows yaw in renderer).
// Use server turn rate (rad/s) when set; otherwise fall back to WOW_TURN_SPEED (deg/s).
const float activeTurnSpeedDeg = (turnRateOverride_ > 0.0f && turnRateOverride_ < 20.0f
&& !std::isnan(turnRateOverride_))
? glm::degrees(turnRateOverride_)
: WOW_TURN_SPEED;
if (nowTurnLeft && !nowTurnRight) {
yaw += WOW_TURN_SPEED * deltaTime;
yaw += activeTurnSpeedDeg * deltaTime;
} else if (nowTurnRight && !nowTurnLeft) {
yaw -= WOW_TURN_SPEED * deltaTime;
yaw -= activeTurnSpeedDeg * deltaTime;
}
if (nowTurnLeft || nowTurnRight) {
camera->setRotation(yaw, pitch);