Fix warnings
This commit is contained in:
parent
59b237e992
commit
235b1db90c
|
@ -285,7 +285,7 @@ void ContactSolver::initializeContactConstraints() {
|
||||||
|
|
||||||
// Compute the inverse K matrix for the rolling resistance constraint
|
// Compute the inverse K matrix for the rolling resistance constraint
|
||||||
manifold.inverseRollingResistance.setToZero();
|
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.inverseInertiaTensorBody1 + manifold.inverseInertiaTensorBody2;
|
||||||
manifold.inverseRollingResistance = manifold.inverseRollingResistance.getInverse();
|
manifold.inverseRollingResistance = manifold.inverseRollingResistance.getInverse();
|
||||||
}
|
}
|
||||||
|
|
|
@ -31,15 +31,15 @@ using namespace reactphysics3d;
|
||||||
// Constructor
|
// Constructor
|
||||||
Material::Material()
|
Material::Material()
|
||||||
: mFrictionCoefficient(DEFAULT_FRICTION_COEFFICIENT),
|
: mFrictionCoefficient(DEFAULT_FRICTION_COEFFICIENT),
|
||||||
mBounciness(DEFAULT_BOUNCINESS),
|
mRollingResistance(DEFAULT_ROLLING_RESISTANCE),
|
||||||
mRollingResistance(DEFAULT_ROLLING_RESISTANCE) {
|
mBounciness(DEFAULT_BOUNCINESS) {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Copy-constructor
|
// Copy-constructor
|
||||||
Material::Material(const Material& material)
|
Material::Material(const Material& material)
|
||||||
: mFrictionCoefficient(material.mFrictionCoefficient), mBounciness(material.mBounciness),
|
: mFrictionCoefficient(material.mFrictionCoefficient),
|
||||||
mRollingResistance(material.mRollingResistance) {
|
mRollingResistance(material.mRollingResistance), mBounciness(material.mBounciness) {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user