clean up after merge
This commit is contained in:
@@ -39,10 +39,13 @@ public:
|
||||
Vec3 getVelocityOfMassPoint(int index);
|
||||
void applyExternalForce(Vec3 force);
|
||||
|
||||
Vec3 calcualtePositionTimestepEuler(Vec3 oldPosition, float timestep, Vec3 veloctiy);
|
||||
Vec3 calcualteVelocityTimestepEuler(Vec3 oldVelocity, float timestep, Vec3 acceleration);
|
||||
void Midpoint(Spring& spring, float timestep);
|
||||
int LengthCalculator(Vec3 position1, Vec3 position2);
|
||||
|
||||
Vec3 calculatePositionTimestepEuler(Vec3 oldPosition, float timestep, Vec3 veloctiy);
|
||||
Vec3 calculateVelocityTimestepEuler(Vec3 oldVelocity, float timestep, Vec3 acceleration);
|
||||
Vec3 calculateAcceleration(Vec3 acceleration, float mass);
|
||||
void Euler(MassPoint& masspoint1, MassPoint& masspoint2, Spring& spring, float timestep);
|
||||
void Euler(Spring& spring, float timestep);
|
||||
|
||||
void printSpring(const Spring& spring);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user