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

get rid of 'using'

Browse Source
This commit is contained in:
Xuchen Han
2019-08-02 15:27:10 -07:00
parent f624b60c19
commit 7f33d8cdb9
9 changed files with 22 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/BulletSoftBody/btCGProjection.h
View File

@@ -104,9 +104,12 @@ class btCGProjection
{ {
public: public:
// static const int dim = 3; // static const int dim = 3;
using TVStack = btAlignedObjectArray<btVector3>; typedef btAlignedObjectArray<btVector3> TVStack;
using TVArrayStack = btAlignedObjectArray<btAlignedObjectArray<btVector3> >; typedef btAlignedObjectArray<btAlignedObjectArray<btVector3> > TVArrayStack;
using TArrayStack = btAlignedObjectArray<btAlignedObjectArray<btScalar> >; typedef btAlignedObjectArray<btAlignedObjectArray<btScalar> > TArrayStack;
// using TVStack = btAlignedObjectArray<btVector3>;
// using TVArrayStack = btAlignedObjectArray<btAlignedObjectArray<btVector3> >;
// using TArrayStack = btAlignedObjectArray<btAlignedObjectArray<btScalar> >;
btAlignedObjectArray<btSoftBody *> m_softBodies; btAlignedObjectArray<btSoftBody *> m_softBodies;
btDeformableRigidDynamicsWorld* m_world; btDeformableRigidDynamicsWorld* m_world;
const std::unordered_map<btSoftBody::Node *, size_t>* m_indices; const std::unordered_map<btSoftBody::Node *, size_t>* m_indices;

3
src/BulletSoftBody/btConjugateGradient.h
View File

@@ -15,7 +15,8 @@
template <class TM> template <class TM>
class btConjugateGradient class btConjugateGradient
{ {
using TVStack = btAlignedObjectArray<btVector3>; // using TVStack = btAlignedObjectArray<btVector3>;
typedef btAlignedObjectArray<btVector3> TVStack;
TVStack r,p,z,temp; TVStack r,p,z,temp;
int max_iterations; int max_iterations;

3
src/BulletSoftBody/btDeformableBackwardEulerObjective.h
View File

@@ -20,7 +20,8 @@ class btDeformableRigidDynamicsWorld;
class btDeformableBackwardEulerObjective class btDeformableBackwardEulerObjective
{ {
public: public:
using TVStack = btAlignedObjectArray<btVector3>; // using TVStack = btAlignedObjectArray<btVector3>;
typedef btAlignedObjectArray<btVector3> TVStack;
btScalar m_dt; btScalar m_dt;
btDeformableRigidDynamicsWorld* m_world; btDeformableRigidDynamicsWorld* m_world;
btAlignedObjectArray<btDeformableLagrangianForce*> m_lf; btAlignedObjectArray<btDeformableLagrangianForce*> m_lf;

3
src/BulletSoftBody/btDeformableBodySolver.h
View File

@@ -21,7 +21,8 @@ class btDeformableRigidDynamicsWorld;
class btDeformableBodySolver : public btSoftBodySolver class btDeformableBodySolver : public btSoftBodySolver
{ {
using TVStack = btAlignedObjectArray<btVector3>; // using TVStack = btAlignedObjectArray<btVector3>;
typedef btAlignedObjectArray<btVector3> TVStack;
protected: protected:
int m_numNodes; int m_numNodes;
TVStack m_dv; TVStack m_dv;

3
src/BulletSoftBody/btDeformableGravityForce.h
View File

@@ -13,7 +13,8 @@
class btDeformableGravityForce : public btDeformableLagrangianForce class btDeformableGravityForce : public btDeformableLagrangianForce
{ {
public: public:
using TVStack = btDeformableLagrangianForce::TVStack; // using TVStack = btDeformableLagrangianForce::TVStack;
typedef btAlignedObjectArray<btVector3> TVStack;
btVector3 m_gravity; btVector3 m_gravity;
btDeformableGravityForce(const btVector3& g) : m_gravity(g) btDeformableGravityForce(const btVector3& g) : m_gravity(g)

3
src/BulletSoftBody/btDeformableLagrangianForce.h
View File

@@ -19,7 +19,8 @@ enum btDeformableLagrangianForceType
class btDeformableLagrangianForce class btDeformableLagrangianForce
{ {
public: public:
using TVStack = btAlignedObjectArray<btVector3>; // using TVStack = btAlignedObjectArray<btVector3>;
typedef btAlignedObjectArray<btVector3> TVStack;
btAlignedObjectArray<btSoftBody *> m_softBodies; btAlignedObjectArray<btSoftBody *> m_softBodies;
const std::unordered_map<btSoftBody::Node *, size_t>* m_indices; const std::unordered_map<btSoftBody::Node *, size_t>* m_indices;

3
src/BulletSoftBody/btDeformableMassSpringForce.h
View File

@@ -13,7 +13,8 @@
class btDeformableMassSpringForce : public btDeformableLagrangianForce class btDeformableMassSpringForce : public btDeformableLagrangianForce
{ {
public: public:
using TVStack = btDeformableLagrangianForce::TVStack; // using TVStack = btDeformableLagrangianForce::TVStack;
typedef btAlignedObjectArray<btVector3> TVStack;
btDeformableMassSpringForce() btDeformableMassSpringForce()
{ {
} }

3
src/BulletSoftBody/btDeformableRigidDynamicsWorld.h
View File

@@ -30,7 +30,8 @@ typedef btAlignedObjectArray<btSoftBody*> btSoftBodyArray;
class btDeformableRigidDynamicsWorld : public btMultiBodyDynamicsWorld class btDeformableRigidDynamicsWorld : public btMultiBodyDynamicsWorld
{ {
using TVStack = btAlignedObjectArray<btVector3>; typedef btAlignedObjectArray<btVector3> TVStack;
// using TVStack = btAlignedObjectArray<btVector3>;
///Solver classes that encapsulate multiple deformable bodies for solving ///Solver classes that encapsulate multiple deformable bodies for solving
btDeformableBodySolver* m_deformableBodySolver; btDeformableBodySolver* m_deformableBodySolver;
btSoftBodyArray m_softBodies; btSoftBodyArray m_softBodies;

3
src/BulletSoftBody/btPreconditioner.h
View File

@@ -11,7 +11,8 @@
class Preconditioner class Preconditioner
{ {
public: public:
using TVStack = btAlignedObjectArray<btVector3>; typedef btAlignedObjectArray<btVector3> TVStack;
// using TVStack = btAlignedObjectArray<btVector3>;
virtual void operator()(const TVStack& x, TVStack& b) = 0; virtual void operator()(const TVStack& x, TVStack& b) = 0;
virtual void reinitialize(bool nodeUpdated) = 0; virtual void reinitialize(bool nodeUpdated) = 0;
}; };