Bart/bullet3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of https://github.com/erwincoumans/bullet3

Browse Source
This commit is contained in:
Erwin Coumans
2019-09-11 08:39:11 -07:00
parent 93810cb09a 66fc3a9ce9
commit dee463eaae
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/BulletSoftBody/btConjugateGradient.h
View File

@@ -100,7 +100,7 @@ public:
TVStack sub(const TVStack& a, const TVStack& b) TVStack sub(const TVStack& a, const TVStack& b)
{ {
// c = a-b // c = a-b
btAssert(a.size() == b.size()) btAssert(a.size() == b.size());
TVStack c; TVStack c;
c.resize(a.size()); c.resize(a.size());
for (int i = 0; i < a.size(); ++i) for (int i = 0; i < a.size(); ++i)
@@ -126,7 +126,7 @@ public:
void multAndAddTo(btScalar s, const TVStack& a, TVStack& result) void multAndAddTo(btScalar s, const TVStack& a, TVStack& result)
{ {
// result += s*a // result += s*a
btAssert(a.size() == result.size()) btAssert(a.size() == result.size());
for (int i = 0; i < a.size(); ++i) for (int i = 0; i < a.size(); ++i)
result[i] += s * a[i]; result[i] += s * a[i];
} }

2
src/BulletSoftBody/btDeformableGravityForce.h
View File

@@ -53,7 +53,7 @@ public:
virtual void addScaledGravityForce(btScalar scale, TVStack& force) virtual void addScaledGravityForce(btScalar scale, TVStack& force)
{ {
int numNodes = getNumNodes(); int numNodes = getNumNodes();
btAssert(numNodes <= force.size()) btAssert(numNodes <= force.size());
for (int i = 0; i < m_softBodies.size(); ++i) for (int i = 0; i < m_softBodies.size(); ++i)
{ {
btSoftBody* psb = m_softBodies[i]; btSoftBody* psb = m_softBodies[i];

4
src/BulletSoftBody/btDeformableMassSpringForce.h
View File

@@ -45,7 +45,7 @@ public:
virtual void addScaledDampingForce(btScalar scale, TVStack& force) virtual void addScaledDampingForce(btScalar scale, TVStack& force)
{ {
int numNodes = getNumNodes(); int numNodes = getNumNodes();
btAssert(numNodes <= force.size()) btAssert(numNodes <= force.size());
for (int i = 0; i < m_softBodies.size(); ++i) for (int i = 0; i < m_softBodies.size(); ++i)
{ {
const btSoftBody* psb = m_softBodies[i]; const btSoftBody* psb = m_softBodies[i];
@@ -77,7 +77,7 @@ public:
virtual void addScaledElasticForce(btScalar scale, TVStack& force) virtual void addScaledElasticForce(btScalar scale, TVStack& force)
{ {
int numNodes = getNumNodes(); int numNodes = getNumNodes();
btAssert(numNodes <= force.size()) btAssert(numNodes <= force.size());
for (int i = 0; i < m_softBodies.size(); ++i) for (int i = 0; i < m_softBodies.size(); ++i)
{ {
const btSoftBody* psb = m_softBodies[i]; const btSoftBody* psb = m_softBodies[i];