fix #ifdef for old damping method in btRigidBody #2748
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| m_angularVelocity *= GEN_clamped((btScalar(1.) - timeStep * m_angularDamping), (btScalar)btScalar(0.0), (btScalar)btScalar(1.0)); | ||
| #ifdef BT_USE_OLD_DAMPING_METHOD | ||
| m_linearVelocity *= btClamped((btScalar(1.0) - timeStep * m_linearDamping), btScalar(0.0), btScalar(1.0)); | ||
| m_angularVelocity *= btClamped((btScalar(1.0) - timeStep * m_angularDamping), btScalar(0.0), btScalar(1.0)); |
There was a problem hiding this comment.
You can just use max here, because it can't be more than 1, so we save one if condition.
m_linearVelocity *= btMax(btScalar(1.0) - timeStep * m_linearDamping, btScalar(0.0));
m_angularVelocity *= btMax(btScalar(1.0) - timeStep * m_angularDamping, btScalar(0.0));There was a problem hiding this comment.
Thanks, I've just pushed this change.
pouleyKetchoupp
force-pushed
the
fix-old-damping-method
branch
from
29bb2c4 to
760960f
Compare
|
thanks, looks good to me. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
As discussed in godotengine/godot#19182 I've made some fixes to be able to use the old damping method.
When
BT_USE_OLD_DAMPING_METHODis defined:setDampingallows any non-negative value instead of clamping between 0 and 1