diff --git a/src/engine/ContactSolver.cpp b/src/engine/ContactSolver.cpp index 2967d6d8..e450fbd7 100644 --- a/src/engine/ContactSolver.cpp +++ b/src/engine/ContactSolver.cpp @@ -285,7 +285,7 @@ void ContactSolver::initializeContactConstraints() { // Compute the inverse K matrix for the rolling resistance constraint manifold.inverseRollingResistance.setToZero(); - if (manifold.rollingResistanceFactor > 0 && manifold.isBody1DynamicType || manifold.isBody2DynamicType) { + if (manifold.rollingResistanceFactor > 0 && (manifold.isBody1DynamicType || manifold.isBody2DynamicType)) { manifold.inverseRollingResistance = manifold.inverseInertiaTensorBody1 + manifold.inverseInertiaTensorBody2; manifold.inverseRollingResistance = manifold.inverseRollingResistance.getInverse(); } diff --git a/src/engine/Material.cpp b/src/engine/Material.cpp index a569fccc..7d4d0b70 100644 --- a/src/engine/Material.cpp +++ b/src/engine/Material.cpp @@ -31,15 +31,15 @@ using namespace reactphysics3d; // Constructor Material::Material() : mFrictionCoefficient(DEFAULT_FRICTION_COEFFICIENT), - mBounciness(DEFAULT_BOUNCINESS), - mRollingResistance(DEFAULT_ROLLING_RESISTANCE) { + mRollingResistance(DEFAULT_ROLLING_RESISTANCE), + mBounciness(DEFAULT_BOUNCINESS) { } // Copy-constructor Material::Material(const Material& material) - : mFrictionCoefficient(material.mFrictionCoefficient), mBounciness(material.mBounciness), - mRollingResistance(material.mRollingResistance) { + : mFrictionCoefficient(material.mFrictionCoefficient), + mRollingResistance(material.mRollingResistance), mBounciness(material.mBounciness) { }