phaneron/Kelsidavis-WoWee
1
0
Fork 0
mirror of https://github.com/Kelsidavis/WoWee.git synced 2026-05-03 16:03:52 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix mounted first-person camera pivot

Browse source
This commit is contained in:
Kelsi 2026-02-07 20:05:07 -08:00
parent 6f1f3b295b
commit 9556d49ca1
3 changed files with 14 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/rendering/camera_controller.hpp
View file

@ -74,6 +74,7 @@ public:
void setUseWoWSpeed(bool use) { useWoWSpeed = use; } void setUseWoWSpeed(bool use) { useWoWSpeed = use; }
void setRunSpeedOverride(float speed) { runSpeedOverride_ = speed; } void setRunSpeedOverride(float speed) { runSpeedOverride_ = speed; }
void setMounted(bool m) { mounted_ = m; } void setMounted(bool m) { mounted_ = m; }
void setMountHeightOffset(float offset) { mountHeightOffset_ = offset; }
// For first-person player hiding // For first-person player hiding
void setCharacterRenderer(class CharacterRenderer* cr, uint32_t playerId) { void setCharacterRenderer(class CharacterRenderer* cr, uint32_t playerId) {
@ -193,6 +194,7 @@ private:
// Server-driven run speed override (0 = use default WOW_RUN_SPEED) // Server-driven run speed override (0 = use default WOW_RUN_SPEED)
float runSpeedOverride_ = 0.0f; float runSpeedOverride_ = 0.0f;
bool mounted_ = false; bool mounted_ = false;
float mountHeightOffset_ = 0.0f;
// Online mode: trust server position, don't prefer outdoors over WMO floors // Online mode: trust server position, don't prefer outdoors over WMO floors
bool onlineMode = false; bool onlineMode = false;

6
src/rendering/camera_controller.cpp
View file

@ -643,7 +643,8 @@ void CameraController::update(float deltaTime) {
// ===== WoW-style orbit camera ===== // ===== WoW-style orbit camera =====
// Pivot point at upper chest/neck // Pivot point at upper chest/neck
glm::vec3 pivot = targetPos + glm::vec3(0.0f, 0.0f, PIVOT_HEIGHT); float mountedOffset = mounted_ ? mountHeightOffset_ : 0.0f;
glm::vec3 pivot = targetPos + glm::vec3(0.0f, 0.0f, PIVOT_HEIGHT + mountedOffset);
// Camera direction from yaw/pitch (already computed as forward3D) // Camera direction from yaw/pitch (already computed as forward3D)
glm::vec3 camDir = -forward3D; // Camera looks at pivot, so it's behind glm::vec3 camDir = -forward3D; // Camera looks at pivot, so it's behind
@ -1219,7 +1220,8 @@ void CameraController::reset() {
currentDistance = userTargetDistance; currentDistance = userTargetDistance;
collisionDistance = currentDistance; collisionDistance = currentDistance;
glm::vec3 pivot = spawnPos + glm::vec3(0.0f, 0.0f, PIVOT_HEIGHT); float mountedOffset = mounted_ ? mountHeightOffset_ : 0.0f;
glm::vec3 pivot = spawnPos + glm::vec3(0.0f, 0.0f, PIVOT_HEIGHT + mountedOffset);
glm::vec3 camDir = -forward3D; glm::vec3 camDir = -forward3D;
glm::vec3 camPos = pivot + camDir * currentDistance; glm::vec3 camPos = pivot + camDir * currentDistance;
smoothedCamPos = camPos; smoothedCamPos = camPos;

10
src/rendering/renderer.cpp
View file

@ -499,14 +499,20 @@ void Renderer::setMounted(uint32_t mountInstId, float heightOffset) {
mountInstanceId_ = mountInstId; mountInstanceId_ = mountInstId;
mountHeightOffset_ = heightOffset; mountHeightOffset_ = heightOffset;
charAnimState = CharAnimState::MOUNT; charAnimState = CharAnimState::MOUNT;
if (cameraController) cameraController->setMounted(true); if (cameraController) {
cameraController->setMounted(true);
cameraController->setMountHeightOffset(heightOffset);
}
} }
void Renderer::clearMount() { void Renderer::clearMount() {
mountInstanceId_ = 0; mountInstanceId_ = 0;
mountHeightOffset_ = 0.0f; mountHeightOffset_ = 0.0f;
charAnimState = CharAnimState::IDLE; charAnimState = CharAnimState::IDLE;
if (cameraController) cameraController->setMounted(false); if (cameraController) {
cameraController->setMounted(false);
cameraController->setMountHeightOffset(0.0f);
}
} }
uint32_t Renderer::resolveMeleeAnimId() { uint32_t Renderer::resolveMeleeAnimId() {