phaneron/Kelsidavis-WoWee
1
0
Fork 0
mirror of https://github.com/Kelsidavis/WoWee.git synced 2026-04-17 01:23:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into feat/animation-handling

Browse source
This commit is contained in:
Pavel Okhlopkov 2026-04-05 12:37:08 +03:00 • committed by GitHub
commit e386fbb069
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 9 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

7
.gitmodules vendored
View file

@ -12,7 +12,6 @@
shallow = true shallow = true
update = none update = none
[submodule "extern/FidelityFX-FSR2"] [submodule "extern/FidelityFX-FSR2"]
path = extern/FidelityFX-FSR2 path = extern/FidelityFX-FSR2
url = https://github.com/Kelsidavis/FidelityFX-FSR2.git url = https://github.com/Kelsidavis/FidelityFX-FSR2.git
shallow = true ignore = dirty
update = none

14
src/game/movement_handler.cpp
View file

@ -2547,19 +2547,17 @@ void MovementHandler::checkAreaTriggers() {
bool inside = false; bool inside = false;
if (at.radius > 0.0f) { if (at.radius > 0.0f) {
// Sphere trigger — use actual radius, with small floor for very tiny triggers // Sphere trigger — use actual DBC radius
float effectiveRadius = std::max(at.radius, 3.0f);
float dx = px - at.x; float dx = px - at.x;
float dy = py - at.y; float dy = py - at.y;
float dz = pz - at.z; float dz = pz - at.z;
float distSq = dx * dx + dy * dy + dz * dz; float distSq = dx * dx + dy * dy + dz * dz;
inside = (distSq <= effectiveRadius * effectiveRadius); inside = (distSq <= at.radius * at.radius);
} else if (at.boxLength > 0.0f || at.boxWidth > 0.0f || at.boxHeight > 0.0f) { } else if (at.boxLength > 0.0f || at.boxWidth > 0.0f || at.boxHeight > 0.0f) {
// Box trigger — use actual size, with small floor for tiny triggers // Box trigger — use actual DBC dimensions
float boxMin = 4.0f; float effLength = at.boxLength;
float effLength = std::max(at.boxLength, boxMin); float effWidth = at.boxWidth;
float effWidth = std::max(at.boxWidth, boxMin); float effHeight = at.boxHeight;
float effHeight = std::max(at.boxHeight, boxMin);
float dx = px - at.x; float dx = px - at.x;
float dy = py - at.y; float dy = py - at.y;