Merge branch 'develop' into optimization

This commit is contained in:
Daniel Chappuis 2016-08-21 20:49:22 +02:00
commit 5b17652adb
6 changed files with 8 additions and 8 deletions

View File

@ -32,7 +32,7 @@
using namespace reactphysics3d;
// Initialization of static variables
constexpr int TreeNode::NULL_TREE_NODE = -1;
const int TreeNode::NULL_TREE_NODE = -1;
// Constructor
DynamicAABBTree::DynamicAABBTree(decimal extraAABBGap) : mExtraAABBGap(extraAABBGap) {

View File

@ -30,7 +30,7 @@
using namespace reactphysics3d;
// Static variables definition
constexpr decimal BallAndSocketJoint::BETA = decimal(0.2);
const decimal BallAndSocketJoint::BETA = decimal(0.2);
// Constructor
BallAndSocketJoint::BallAndSocketJoint(const BallAndSocketJointInfo& jointInfo)

View File

@ -30,7 +30,7 @@
using namespace reactphysics3d;
// Static variables definition
constexpr decimal FixedJoint::BETA = decimal(0.2);
const decimal FixedJoint::BETA = decimal(0.2);
// Constructor
FixedJoint::FixedJoint(const FixedJointInfo& jointInfo)

View File

@ -31,7 +31,7 @@
using namespace reactphysics3d;
// Static variables definition
constexpr decimal HingeJoint::BETA = decimal(0.2);
const decimal HingeJoint::BETA = decimal(0.2);
// Constructor
HingeJoint::HingeJoint(const HingeJointInfo& jointInfo)

View File

@ -29,7 +29,7 @@
using namespace reactphysics3d;
// Static variables definition
constexpr decimal SliderJoint::BETA = decimal(0.2);
const decimal SliderJoint::BETA = decimal(0.2);
// Constructor
SliderJoint::SliderJoint(const SliderJointInfo& jointInfo)

View File

@ -34,9 +34,9 @@ using namespace reactphysics3d;
using namespace std;
// Constants initialization
constexpr decimal ContactSolver::BETA = decimal(0.2);
constexpr decimal ContactSolver::BETA_SPLIT_IMPULSE = decimal(0.2);
constexpr decimal ContactSolver::SLOP= decimal(0.01);
const decimal ContactSolver::BETA = decimal(0.2);
const decimal ContactSolver::BETA_SPLIT_IMPULSE = decimal(0.2);
const decimal ContactSolver::SLOP= decimal(0.01);
// Constructor
ContactSolver::ContactSolver(const std::map<RigidBody*, uint>& mapBodyToVelocityIndex)