diff options
| author | Loren Shih <seraph@lindenlab.com> | 2009-11-06 18:31:52 -0500 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2009-11-06 18:31:52 -0500 |
| commit | 9c048d12fdd9fd9c95cc93223fc731ee7b548294 (patch) | |
| tree | 4d6e91028b4ab48b6600c34f9cf126610fbce690 /indra/newview/lltracker.cpp | |
| parent | 2aa981ac23bbdf2fd609e04434179be0cfec79ce (diff) | |
| parent | f3bbcfb9d41b41f8c4b144ae9a1173fc7719b88c (diff) | |
merge
--HG--
branch : avatar-pipeline
Diffstat (limited to 'indra/newview/lltracker.cpp')
| -rw-r--r-- | indra/newview/lltracker.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/lltracker.cpp b/indra/newview/lltracker.cpp index 5929ecd928..1a61717658 100644 --- a/indra/newview/lltracker.cpp +++ b/indra/newview/lltracker.cpp @@ -416,10 +416,10 @@ F32 pulse_func(F32 t, F32 z) return 0.f; } - t *= 3.14159f; + t *= F_PI; z -= t*64.f - 256.f; - F32 a = cosf(z*3.14159/512.f)*10.0f; + F32 a = cosf(z*F_PI/512.f)*10.0f; a = llmax(a, 9.9f); a -= 9.9f; a *= 10.f; @@ -433,7 +433,7 @@ void draw_shockwave(F32 center_z, F32 t, S32 steps, LLColor4 color) return; } - t *= 0.6284f/3.14159f; + t *= 0.6284f/F_PI; t -= (F32) (S32) t; |