mirror of
https://github.com/overte-org/overte.git
synced 2025-08-11 03:28:48 +02:00
Fix compile error building macOS-latest: changed MINIMUM_TIME_REMAINING from const to constexpr in CharacterController::playerStep.
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:
parent
2179c153de
commit
6fc40385ca
1 changed files with 1 additions and 1 deletions
|
@ -350,7 +350,7 @@ void CharacterController::playerStep(btCollisionWorld* collisionWorld, btScalar
|
||||||
btVector3 velocity = _rigidBody->getLinearVelocity() - _parentVelocity;
|
btVector3 velocity = _rigidBody->getLinearVelocity() - _parentVelocity;
|
||||||
computeNewVelocity(dt, velocity);
|
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.");
|
static_assert(FOLLOW_TIME_IMMEDIATE_SNAP > MINIMUM_TIME_REMAINING, "The code below assumes this condition is true.");
|
||||||
|
|
||||||
bool hasFollowTimeRemaining = false;
|
bool hasFollowTimeRemaining = false;
|
||||||
|
|
Loading…
Reference in a new issue