diff options
author | Jacek Antonelli | 2008-12-01 17:39:58 -0600 |
---|---|---|
committer | Jacek Antonelli | 2008-12-01 17:40:06 -0600 |
commit | 7abecb48babe6a6f09bf6692ba55076546cfced9 (patch) | |
tree | 8d18a88513fb97adf32c10aae78f4be1984942db /linden/indra/test/v4math_tut.cpp | |
parent | Second Life viewer sources 1.21.6 (diff) | |
download | meta-impy-7abecb48babe6a6f09bf6692ba55076546cfced9.zip meta-impy-7abecb48babe6a6f09bf6692ba55076546cfced9.tar.gz meta-impy-7abecb48babe6a6f09bf6692ba55076546cfced9.tar.bz2 meta-impy-7abecb48babe6a6f09bf6692ba55076546cfced9.tar.xz |
Second Life viewer sources 1.22.0-RC
Diffstat (limited to '')
-rw-r--r-- | linden/indra/test/v4math_tut.cpp | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/linden/indra/test/v4math_tut.cpp b/linden/indra/test/v4math_tut.cpp index 07b4797..8169a2b 100644 --- a/linden/indra/test/v4math_tut.cpp +++ b/linden/indra/test/v4math_tut.cpp | |||
@@ -166,14 +166,13 @@ namespace tut | |||
166 | template<> template<> | 166 | template<> template<> |
167 | void v4math_object::test<8>() | 167 | void v4math_object::test<8>() |
168 | { | 168 | { |
169 | #if LL_DEBUG && LL_WINDOWS && _MSC_VER >= 1400 | ||
170 | skip_fail("This fails on VS2005 debug builds!"); | ||
171 | #else | ||
172 | #if LL_WINDOWS && _MSC_VER < 1400 | ||
173 | skip_fail("This fails on VS2003!"); | ||
174 | #else | ||
175 | F32 x = 10.f, y = -2.3f, z = -.023f, w = -2.0f; | 169 | F32 x = 10.f, y = -2.3f, z = -.023f, w = -2.0f; |
176 | const F32 val[10] = {1.f,2.f,3.f,.34f,.1f,-.5f,2.f,1.23f,1.234f,.89f}; | 170 | const F32 val[16] = { |
171 | 1.f, 2.f, 3.f, 0.f, | ||
172 | .34f, .1f, -.5f, 0.f, | ||
173 | 2.f, 1.23f, 1.234f, 0.f, | ||
174 | .89f, 0.f, 0.f, 0.f | ||
175 | }; | ||
177 | LLMatrix4 mat(val); | 176 | LLMatrix4 mat(val); |
178 | LLVector4 vec4(x,y,z,w),vec4a; | 177 | LLVector4 vec4(x,y,z,w),vec4a; |
179 | vec4.rotVec(mat); | 178 | vec4.rotVec(mat); |
@@ -187,8 +186,6 @@ namespace tut | |||
187 | vec4c.setVec(a, b, c, d); | 186 | vec4c.setVec(a, b, c, d); |
188 | vec4c.rotVec(q); | 187 | vec4c.rotVec(q); |
189 | ensure_equals("2:rotVec: Fail " ,vec4b, vec4c); | 188 | ensure_equals("2:rotVec: Fail " ,vec4b, vec4c); |
190 | #endif | ||
191 | #endif | ||
192 | } | 189 | } |
193 | 190 | ||
194 | template<> template<> | 191 | template<> template<> |