diff options
| author | Fire-Head <Fire-Head@users.noreply.github.com> | 2021-01-20 23:00:39 +0100 |
|---|---|---|
| committer | Fire-Head <Fire-Head@users.noreply.github.com> | 2021-01-20 23:00:39 +0100 |
| commit | 4ba19c9556a94cba65a5033467e9fe2346f604bb (patch) | |
| tree | 79620db1c87618fddbe9866d6c7019ee67f64e57 /src/entities/Physical.h | |
| parent | Merge pull request #1 from GTAmodding/lcs (diff) | |
| parent | fix (diff) | |
| download | re3-4ba19c9556a94cba65a5033467e9fe2346f604bb.tar re3-4ba19c9556a94cba65a5033467e9fe2346f604bb.tar.gz re3-4ba19c9556a94cba65a5033467e9fe2346f604bb.tar.bz2 re3-4ba19c9556a94cba65a5033467e9fe2346f604bb.tar.lz re3-4ba19c9556a94cba65a5033467e9fe2346f604bb.tar.xz re3-4ba19c9556a94cba65a5033467e9fe2346f604bb.tar.zst re3-4ba19c9556a94cba65a5033467e9fe2346f604bb.zip | |
Diffstat (limited to 'src/entities/Physical.h')
| -rw-r--r-- | src/entities/Physical.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/entities/Physical.h b/src/entities/Physical.h index 926b9762..290c267c 100644 --- a/src/entities/Physical.h +++ b/src/entities/Physical.h @@ -158,8 +158,8 @@ public: void ApplyFrictionTurnForce(const CVector &j, const CVector &p) { ApplyFrictionTurnForce(j.x, j.y, j.z, p.x, p.y, p.z); } // springRatio: 1.0 fully extended, 0.0 fully compressed bool ApplySpringCollision(float springConst, CVector &springDir, CVector &point, float springRatio, float bias); - bool ApplySpringCollisionAlt(float springConst, CVector &springDir, CVector &point, float springRatio, float bias, CVector &forceDir); - bool ApplySpringDampening(float damping, CVector &springDir, CVector &point, CVector &speed); + bool ApplySpringCollisionAlt(float springConst, CVector &springDir, CVector &point, float springRatio, float bias, CVector &forceDir, float &impulse); + bool ApplySpringDampening(float damping, float dampingLimit, CVector &springDir, CVector &point, CVector &speed); void ApplyGravity(void); void ApplyFriction(void); void ApplyAirResistance(void); @@ -174,4 +174,8 @@ public: bool ProcessCollisionSectorList(CPtrList *lists); bool CheckCollision(void); bool CheckCollision_SimpleCar(void); + + // TEMP + bool ApplySpringCollisionAlt(float springConst, CVector &springDir, CVector &point, float springRatio, float bias, CVector &forceDir); + bool ApplySpringDampening(float damping, CVector &springDir, CVector &point, CVector &speed); }; |