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

Improve movement, crouching, and add M2 animation

Browse source 
Movement:
- Fix speed controls: Shift=sprint (28), normal run (14), Ctrl=walk (5)
- Reduce character height for doorway clearance (eye height 1.2)
- Add working crouch (C or X key) with smooth transition (eye height 0.6)
- Jump to stand up from crouch

M2 Animation:
- Add animation time tracking per M2 instance
- Add procedural swaying animation in vertex shader
- Update animation each frame for vegetation movement
This commit is contained in:
Kelsi 2026-02-02 23:10:19 -08:00
parent 4287878a73
commit 76a16a214e
5 changed files with 63 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/rendering/camera_controller.cpp
View file

@ -41,13 +41,15 @@ void CameraController::update(float deltaTime) {
// Calculate movement speed based on direction and modifiers
float speed;
if (useWoWSpeed) {
// WoW-correct speeds
// Movement speeds (Shift = sprint, Ctrl = walk)
if (nowBackward && !nowForward) {
speed = WOW_BACK_SPEED;
} else if (!uiWantsKeyboard && (input.isKeyPressed(SDL_SCANCODE_LSHIFT) || input.isKeyPressed(SDL_SCANCODE_RSHIFT))) {
speed = WOW_WALK_SPEED; // Shift = walk in WoW mode
speed = WOW_SPRINT_SPEED; // Shift = sprint (faster)
} else if (!uiWantsKeyboard && (input.isKeyPressed(SDL_SCANCODE_LCTRL) || input.isKeyPressed(SDL_SCANCODE_RCTRL))) {
speed = WOW_WALK_SPEED; // Ctrl = walk (slower)
} else {
speed = WOW_RUN_SPEED;
speed = WOW_RUN_SPEED; // Normal run
}
} else {
// Exploration mode (original behavior)
@ -69,13 +71,18 @@ void CameraController::update(float deltaTime) {
right = glm::normalize(right);
}
// Toggle sit with X key (edge-triggered) — only when UI doesn't want keyboard
bool xDown = !uiWantsKeyboard && input.isKeyPressed(SDL_SCANCODE_X);
// Toggle sit/crouch with X or C key (edge-triggered) — only when UI doesn't want keyboard
bool xDown = !uiWantsKeyboard && (input.isKeyPressed(SDL_SCANCODE_X) || input.isKeyPressed(SDL_SCANCODE_C));
if (xDown && !xKeyWasDown) {
sitting = !sitting;
}
xKeyWasDown = xDown;
// Update eye height based on crouch state (smooth transition)
float targetEyeHeight = sitting ? CROUCH_EYE_HEIGHT : STAND_EYE_HEIGHT;
float heightLerpSpeed = 10.0f * deltaTime;
eyeHeight = eyeHeight + (targetEyeHeight - eyeHeight) * std::min(1.0f, heightLerpSpeed);
// Calculate horizontal movement vector
glm::vec3 movement(0.0f);
@ -84,10 +91,8 @@ void CameraController::update(float deltaTime) {
if (nowStrafeLeft) movement -= right;
if (nowStrafeRight) movement += right;
// Stand up if any movement key is pressed while sitting
if (!uiWantsKeyboard && sitting && (input.isKeyPressed(SDL_SCANCODE_W) || input.isKeyPressed(SDL_SCANCODE_S) ||
input.isKeyPressed(SDL_SCANCODE_A) || input.isKeyPressed(SDL_SCANCODE_D) ||
input.isKeyPressed(SDL_SCANCODE_SPACE))) {
// Stand up if jumping while crouched
if (!uiWantsKeyboard && sitting && input.isKeyPressed(SDL_SCANCODE_SPACE)) {
sitting = false;
}