diff options
| author | Mahmoud Badri <mahmoud.badri@qt.io> | 2019-08-23 11:59:54 +0300 |
|---|---|---|
| committer | Mahmoud Badri <mahmoud.badri@qt.io> | 2019-08-26 16:06:29 +0300 |
| commit | dd75a7e02bb368c31864d9261e5f0bb7fbd92bf9 (patch) | |
| tree | 8a60f54e55fdaa9ba649d047592e24f3e7a1dd1c /src/system | |
| parent | b4564780edadae35e7bb3c74ef2343ce9281124a (diff) | |
Unify timeline unit to millisecond
The studio and runtime had mixed timing units (seconds and milliseconds)
. This commit unifies the timings to milliseconds. The values are
however kept saved in the UIP file in seconds for backward compatibility
and also cause it is more compact (ex: 1 vs 1000).
Change-Id: Id3515ed90fdb8eb027c581aef9598b02b974a40e
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Diffstat (limited to 'src/system')
| -rw-r--r-- | src/system/Qt3DSBezierEval.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/system/Qt3DSBezierEval.h b/src/system/Qt3DSBezierEval.h index bdb2e18..ef99eec 100644 --- a/src/system/Qt3DSBezierEval.h +++ b/src/system/Qt3DSBezierEval.h @@ -140,8 +140,8 @@ double evaluateForT(double t, double p0, double p1, double p2, double p3) + p2 * 3.0 * it * std::pow(t, 2.0) + p3 * std::pow(t, 3.0); } -inline float EvaluateBezierKeyframe(float inTime, float inTime1, float inValue1, float inC1Time, - float inC1Value, float inC2Time, float inC2Value, float inTime2, +inline float EvaluateBezierKeyframe(long inTime, long inTime1, float inValue1, long inC1Time, + float inC1Value, long inC2Time, float inC2Value, long inTime2, float inValue2) { if (inTime == inTime1) |