diff options
author | Dave Parks <davep@lindenlab.com> | 2010-08-25 14:48:18 -0500 |
---|---|---|
committer | Dave Parks <davep@lindenlab.com> | 2010-08-25 14:48:18 -0500 |
commit | 2f012dd34f01b359c487c778cbf8842eb419e7c3 (patch) | |
tree | 2682cf545422d6656a0635bc6a28cba1b797dc66 /indra/llmath/tests/v4math_test.cpp | |
parent | 6fbc79d5e861085375d776a4da4a5921650b3115 (diff) | |
parent | 314a89535791e1e5a0c3f4d901c9c1d16fb9b6cc (diff) |
merge
Diffstat (limited to 'indra/llmath/tests/v4math_test.cpp')
-rw-r--r-- | indra/llmath/tests/v4math_test.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llmath/tests/v4math_test.cpp b/indra/llmath/tests/v4math_test.cpp index fe051c27e9..e919c90efa 100644 --- a/indra/llmath/tests/v4math_test.cpp +++ b/indra/llmath/tests/v4math_test.cpp @@ -102,7 +102,7 @@ namespace tut { F32 x = 10.f, y = -2.3f, z = -.023f; LLVector4 vec4(x,y,z); - ensure("magVec:Fail ", is_approx_equal(vec4.magVec(), fsqrtf(x*x + y*y + z*z))); + ensure("magVec:Fail ", is_approx_equal(vec4.magVec(), (F32) sqrt(x*x + y*y + z*z))); ensure("magVecSquared:Fail ", is_approx_equal(vec4.magVecSquared(), (x*x + y*y + z*z))); } @@ -343,7 +343,7 @@ namespace tut F32 val1,val2; LLVector4 vec4(x1,y1,z1),vec4a(x2,y2,z2); val1 = dist_vec(vec4,vec4a); - val2 = fsqrtf((x1 - x2)*(x1 - x2) + (y1 - y2)* (y1 - y2) + (z1 - z2)* (z1 -z2)); + val2 = (F32) sqrt((x1 - x2)*(x1 - x2) + (y1 - y2)* (y1 - y2) + (z1 - z2)* (z1 -z2)); ensure_equals("dist_vec: Fail ",val2, val1); val1 = dist_vec_squared(vec4,vec4a); val2 =((x1 - x2)*(x1 - x2) + (y1 - y2)* (y1 - y2) + (z1 - z2)* (z1 -z2)); |