mrq/reactphysics3d
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge and fix conflicts

Browse Source
This commit is contained in:
Daniel Chappuis 2020-05-08 23:54:28 +02:00
commit dfc6710dc0
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -302,7 +302,7 @@ SET_TARGET_PROPERTIES(reactphysics3d PROPERTIES
SOVERSION "0.7" SOVERSION "0.7"
) )
# Install target # Install target (install library only, not headers)
INSTALL(TARGETS reactphysics3d INSTALL(TARGETS reactphysics3d
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}

4
src/systems/SolveHingeJointSystem.cpp
View File

@ -234,13 +234,13 @@ void SolveHingeJointSystem::initBeforeSolve() {
bool oldIsLowerLimitViolated = mHingeJointComponents.mIsLowerLimitViolated[i]; bool oldIsLowerLimitViolated = mHingeJointComponents.mIsLowerLimitViolated[i];
bool isLowerLimitViolated = lowerLimitError <= 0; bool isLowerLimitViolated = lowerLimitError <= 0;
mHingeJointComponents.mIsLowerLimitViolated[i] = isLowerLimitViolated; mHingeJointComponents.mIsLowerLimitViolated[i] = isLowerLimitViolated;
if (isLowerLimitViolated != oldIsLowerLimitViolated) { if (!isLowerLimitViolated || isLowerLimitViolated != oldIsLowerLimitViolated) {
mHingeJointComponents.mImpulseLowerLimit[i] = decimal(0.0); mHingeJointComponents.mImpulseLowerLimit[i] = decimal(0.0);
} }
bool oldIsUpperLimitViolated = mHingeJointComponents.mIsUpperLimitViolated[i]; bool oldIsUpperLimitViolated = mHingeJointComponents.mIsUpperLimitViolated[i];
bool isUpperLimitViolated = upperLimitError <= 0; bool isUpperLimitViolated = upperLimitError <= 0;
mHingeJointComponents.mIsUpperLimitViolated[i] = isUpperLimitViolated; mHingeJointComponents.mIsUpperLimitViolated[i] = isUpperLimitViolated;
if (isUpperLimitViolated != oldIsUpperLimitViolated) { if (!isUpperLimitViolated || isUpperLimitViolated != oldIsUpperLimitViolated) {
mHingeJointComponents.mImpulseUpperLimit[i] = decimal(0.0); mHingeJointComponents.mImpulseUpperLimit[i] = decimal(0.0);
} }

4
src/systems/SolveSliderJointSystem.cpp
View File

@ -136,12 +136,12 @@ void SolveSliderJointSystem::initBeforeSolve() {
decimal upperLimitError = mSliderJointComponents.mUpperLimit[i] - uDotSliderAxis; decimal upperLimitError = mSliderJointComponents.mUpperLimit[i] - uDotSliderAxis;
bool oldIsLowerLimitViolated = mSliderJointComponents.mIsLowerLimitViolated[i]; bool oldIsLowerLimitViolated = mSliderJointComponents.mIsLowerLimitViolated[i];
mSliderJointComponents.mIsLowerLimitViolated[i] = lowerLimitError <= 0; mSliderJointComponents.mIsLowerLimitViolated[i] = lowerLimitError <= 0;
if (mSliderJointComponents.mIsLowerLimitViolated[i] != oldIsLowerLimitViolated) { if (!mSliderJointComponents.mIsLowerLimitViolated[i] || mSliderJointComponents.mIsLowerLimitViolated[i] != oldIsLowerLimitViolated) {
mSliderJointComponents.mImpulseLowerLimit[i] = decimal(0.0); mSliderJointComponents.mImpulseLowerLimit[i] = decimal(0.0);
} }
bool oldIsUpperLimitViolated = mSliderJointComponents.mIsUpperLimitViolated[i]; bool oldIsUpperLimitViolated = mSliderJointComponents.mIsUpperLimitViolated[i];
mSliderJointComponents.mIsUpperLimitViolated[i] = upperLimitError <= 0; mSliderJointComponents.mIsUpperLimitViolated[i] = upperLimitError <= 0;
if (mSliderJointComponents.mIsUpperLimitViolated[i] != oldIsUpperLimitViolated) { if (!mSliderJointComponents.mIsUpperLimitViolated[i] || mSliderJointComponents.mIsUpperLimitViolated[i] != oldIsUpperLimitViolated) {
mSliderJointComponents.mImpulseUpperLimit[i] = decimal(0.0); mSliderJointComponents.mImpulseUpperLimit[i] = decimal(0.0);
} }