summaryrefslogtreecommitdiff
path: root/indra/newview/lltracker.cpp
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2009-11-06 14:58:27 +0000
committerTofu Linden <tofu.linden@lindenlab.com>2009-11-06 14:58:27 +0000
commit6552c1a973ec26a889b6ad4a34c492a3ffc3f644 (patch)
tree1de466344826fd5d586f5cee784afd6e76a73582 /indra/newview/lltracker.cpp
parentc189943583f13dba0b56d58e4e4adec4f7f7f650 (diff)
parent904f6124b282e3e9668289bef9f7d44f8539ce51 (diff)
merge.
Diffstat (limited to 'indra/newview/lltracker.cpp')
-rw-r--r--indra/newview/lltracker.cpp6
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;