diff options
| author | Richard Linden <none@none> | 2013-08-18 22:30:27 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-08-18 22:30:27 -0700 |
| commit | 612892b45a3413b16e40c49d3bfde77a4ca927fd (patch) | |
| tree | 2272a24c7f0a8354791f74c7485a376abb377f67 /indra/llcommon/llcriticaldamp.h | |
| parent | f8e3a34348ab98ecd56d53360b8f2b6512ad6bba (diff) | |
SH-4433 WIP: Interesting: Statistics > Ping Sim is always 0 ms
continued conversion to units system
made units perform type promotion correctly and preserve type in arithmetic
e.g. can now do LLVector3 in units
added typedefs for remaining common unit types, including implicits
Diffstat (limited to 'indra/llcommon/llcriticaldamp.h')
| -rwxr-xr-x | indra/llcommon/llcriticaldamp.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llcommon/llcriticaldamp.h b/indra/llcommon/llcriticaldamp.h index 7b2a414459..a02a2a0dcf 100755 --- a/indra/llcommon/llcriticaldamp.h +++ b/indra/llcommon/llcriticaldamp.h @@ -42,10 +42,10 @@ public: static void updateInterpolants(); // ACCESSORS - static F32 getInterpolant(LLUnitImplicit<F32, LLUnits::Seconds> time_constant, bool use_cache = true); + static F32 getInterpolant(F32SecondsImplicit time_constant, bool use_cache = true); template<typename T> - static T lerp(T a, T b, LLUnitImplicit<F32, LLUnits::Seconds> time_constant, bool use_cache = true) + static T lerp(T a, T b, F32SecondsImplicit time_constant, bool use_cache = true) { F32 interpolant = getInterpolant(time_constant, use_cache); return ((a * (1.f - interpolant)) |