diff options
| author | Mark Palange (Mani) <palange@lindenlab.com> | 2009-11-06 12:54:33 -0800 |
|---|---|---|
| committer | Mark Palange (Mani) <palange@lindenlab.com> | 2009-11-06 12:54:33 -0800 |
| commit | 9317e46a878b36d8f44bbeb4a06ad22d66772e66 (patch) | |
| tree | 71bdb2fbd3cc931c886c81b404aa02f80f14bea7 /indra/newview/lltracker.cpp | |
| parent | 7caf37b9778d3f515a3a796547c09533bd4816b8 (diff) | |
| parent | 05baf9940bd8e9491c4cc7fb426d8e56f50e4d22 (diff) | |
Automated merge with ssh://hg.lindenlab.com/brad/brad-parabuild
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; |