Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-04-08 10:34:35 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix compile error building macOS-latest: changed MINIMUM_TIME_REMAINING from const to constexpr in CharacterController::playerStep.

Browse source 
Error was: "static_assert expression is not an integral constant expression", "read of non-constexpr variable 'MINIMUM_TIME_REMAINING' is not allowed in a constant expression".
Error started in last commit (2179c153de).
This commit is contained in:
Phil Palmer 2020-12-22 15:51:03 -05:00
parent 2179c153de
commit 6fc40385ca
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -350,7 +350,7 @@ void CharacterController::playerStep(btCollisionWorld* collisionWorld, btScalar
btVector3 velocity = _rigidBody->getLinearVelocity() - _parentVelocity;
computeNewVelocity(dt, velocity);
const float MINIMUM_TIME_REMAINING = 0.005f;
constexpr float MINIMUM_TIME_REMAINING = 0.005f;
static_assert(FOLLOW_TIME_IMMEDIATE_SNAP > MINIMUM_TIME_REMAINING, "The code below assumes this condition is true.");
bool hasFollowTimeRemaining = false;