removed unused code

This commit is contained in:
Irlan
2019-04-02 12:48:49 -03:00
parent 756c4d354a
commit f86ec88adf
7 changed files with 4 additions and 371 deletions

View File

@ -31,7 +31,6 @@ class b3Particle;
class b3Force;
class b3BodyContact;
class b3ParticleContact;
class b3TriangleContact;
struct b3ParticleDef;
struct b3ForceDef;
@ -186,7 +185,7 @@ private:
// Pool of body contacts
b3BlockPool m_bodyContactBlocks;
// Pool of particle contacts
b3BlockPool m_particleContactBlocks;
@ -201,9 +200,6 @@ private:
// List of particle contacts
b3List2<b3ParticleContact> m_particleContactList;
// List of triangle contacts
b3List2<b3TriangleContact> m_triangleContactList;
};
inline void b3Cloth::SetGravity(const b3Vec3& gravity)

View File

@ -29,7 +29,6 @@ class b3Body;
class b3BodyContact;
class b3ParticleContact;
class b3TriangleContact;
struct b3DenseVec3;
@ -136,23 +135,6 @@ struct b3ClothSolverTriangleContactVelocityConstraint
float32 normalImpulse;
};
struct b3ClothSolverTriangleContactPositionConstraint
{
u32 indexA;
float32 invMassA;
float32 radiusA;
u32 indexB;
float32 invMassB;
u32 indexC;
float32 invMassC;
u32 indexD;
float32 invMassD;
float32 triangleRadius;
bool front;
};
struct b3ClothContactSolverDef
{
b3StackAllocator* allocator;
@ -165,9 +147,6 @@ struct b3ClothContactSolverDef
u32 particleContactCount;
b3ParticleContact** particleContacts;
u32 triangleContactCount;
b3TriangleContact** triangleContacts;
};
inline float32 b3MixFriction(float32 u1, float32 u2)
@ -185,24 +164,17 @@ public:
void InitializeParticleContactConstraints();
void InitializeTriangleContactConstraints();
void WarmStart();
void SolveBodyContactVelocityConstraints();
void SolveParticleContactVelocityConstraints();
void SolveTriangleContactVelocityConstraints();
void StoreImpulses();
bool SolveBodyContactPositionConstraints();
bool SolveParticleContactPositionConstraints();
bool SolveTriangleContactPositionConstraints();
protected:
b3StackAllocator* m_allocator;
@ -218,11 +190,6 @@ protected:
b3ParticleContact** m_particleContacts;
b3ClothSolverParticleContactVelocityConstraint* m_particleVelocityConstraints;
b3ClothSolverParticleContactPositionConstraint* m_particlePositionConstraints;
u32 m_triangleContactCount;
b3TriangleContact** m_triangleContacts;
b3ClothSolverTriangleContactVelocityConstraint* m_triangleVelocityConstraints;
b3ClothSolverTriangleContactPositionConstraint* m_trianglePositionConstraints;
};
#endif

View File

@ -34,7 +34,6 @@ struct b3SparseSymMat33;
class b3BodyContact;
class b3ParticleContact;
class b3TriangleContact;
struct b3ClothSolverDef
{
@ -43,7 +42,6 @@ struct b3ClothSolverDef
u32 forceCapacity;
u32 bodyContactCapacity;
u32 particleContactCapacity;
u32 triangleContactCapacity;
};
struct b3ClothSolverData
@ -79,7 +77,6 @@ public:
void Add(b3Force* f);
void Add(b3BodyContact* c);
void Add(b3ParticleContact* c);
void Add(b3TriangleContact* c);
void Solve(float32 dt, const b3Vec3& gravity);
private:
@ -113,11 +110,7 @@ private:
u32 m_particleContactCapacity;
u32 m_particleContactCount;
b3ParticleContact** m_particleContacts;
u32 m_triangleContactCapacity;
u32 m_triangleContactCount;
b3TriangleContact** m_triangleContacts;
b3ClothSolverData m_solverData;
};

View File

@ -123,27 +123,6 @@ struct b3ParticleContactWorldPoint
float32 separation;
};
// A contact between a particle and a triangle
class b3TriangleContact
{
public:
b3TriangleContact() { }
~b3TriangleContact() { }
b3Particle* p1;
b3Particle* p2;
b3Particle* p3;
b3Particle* p4;
bool front;
// Contact constraint
float32 normalImpulse;
b3TriangleContact* m_prev;
b3TriangleContact* m_next;
};
// A cloth particle.
class b3Particle
{