Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-06 16:42:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1013 from HifiExperiments/warnings_master2

Browse source 
Fix new debug build warning
This commit is contained in:
Dale Glass 2024-06-08 23:15:33 +02:00 committed by GitHub
commit d7d84c661f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

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

2
libraries/physics/src/CharacterController.h
View file

@ -54,7 +54,7 @@ class CharacterController : public btCharacterControllerInterface {
public:
enum class FollowType : uint8_t {
Rotation,
Rotation = 0,
Horizontal,
Vertical,
Count