Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-08 12:57:59 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix type range comparison

Browse source
This commit is contained in:
Dale Glass 2022-06-05 13:09:13 +02:00
parent 1310e536c8
commit 0c09ac6030
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
interface/src/avatar/MyAvatar.cpp
View file

@ -5738,7 +5738,8 @@ void MyAvatar::FollowHelper::deactivate() {
} }
void MyAvatar::FollowHelper::deactivate(CharacterController::FollowType type) { void MyAvatar::FollowHelper::deactivate(CharacterController::FollowType type) {
assert(static_cast<int>(type) >= 0 && type < CharacterController::FollowType::Count); int int_type = static_cast<int>(type);
assert(int_type >= 0 && int_type < static_cast<int>(CharacterController::FollowType::Count));
_timeRemaining[(int)type] = 0.0f; _timeRemaining[(int)type] = 0.0f;
} }
@ -5746,14 +5747,16 @@ void MyAvatar::FollowHelper::deactivate(CharacterController::FollowType type) {
// eg. activate(FollowType::Rotation, true) snaps the FollowHelper's rotation immediately // eg. activate(FollowType::Rotation, true) snaps the FollowHelper's rotation immediately
// to the rotation of its _followDesiredBodyTransform. // to the rotation of its _followDesiredBodyTransform.
void MyAvatar::FollowHelper::activate(CharacterController::FollowType type, const bool snapFollow) { void MyAvatar::FollowHelper::activate(CharacterController::FollowType type, const bool snapFollow) {
assert(static_cast<int>(type) >= 0 && type < CharacterController::FollowType::Count); int int_type = static_cast<int>(type);
assert(int_type >= 0 && int_type < static_cast<int>(CharacterController::FollowType::Count));
// TODO: Perhaps, the follow time should be proportional to the displacement. // TODO: Perhaps, the follow time should be proportional to the displacement.
_timeRemaining[(int)type] = snapFollow ? CharacterController::FOLLOW_TIME_IMMEDIATE_SNAP : FOLLOW_TIME; _timeRemaining[(int)type] = snapFollow ? CharacterController::FOLLOW_TIME_IMMEDIATE_SNAP : FOLLOW_TIME;
} }
bool MyAvatar::FollowHelper::isActive(CharacterController::FollowType type) const { bool MyAvatar::FollowHelper::isActive(CharacterController::FollowType type) const {
assert(static_cast<int>(type) >= 0 && type < CharacterController::FollowType::Count); int int_type = static_cast<int>(type);
assert(int_type >= 0 && int_type < static_cast<int>(CharacterController::FollowType::Count));
return _timeRemaining[(int)type] > 0.0f; return _timeRemaining[(int)type] > 0.0f;
} }