summaryrefslogtreecommitdiffstats
path: root/src/entities/Physical.h
diff options
context:
space:
mode:
authoraap <aap@papnet.eu>2021-01-16 19:38:05 +0100
committeraap <aap@papnet.eu>2021-01-18 10:59:19 +0100
commita672860c401aa1ca179fce42e439c59f8d07f6d8 (patch)
tree50e4189f7b85a1d66c25c459eec40cdd551a5dce /src/entities/Physical.h
parentremove scriptspath from premake (diff)
downloadre3-a672860c401aa1ca179fce42e439c59f8d07f6d8.tar
re3-a672860c401aa1ca179fce42e439c59f8d07f6d8.tar.gz
re3-a672860c401aa1ca179fce42e439c59f8d07f6d8.tar.bz2
re3-a672860c401aa1ca179fce42e439c59f8d07f6d8.tar.lz
re3-a672860c401aa1ca179fce42e439c59f8d07f6d8.tar.xz
re3-a672860c401aa1ca179fce42e439c59f8d07f6d8.tar.zst
re3-a672860c401aa1ca179fce42e439c59f8d07f6d8.zip
Diffstat (limited to 'src/entities/Physical.h')
-rw-r--r--src/entities/Physical.h8
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);
};