nerdcruft/libcruft-util
1
0
Fork 0
Code Issues Releases Activity

vector: prefer constexpr functions over static variables

Browse Source
This commit is contained in:
Danny Robson 2016-12-12 17:04:22 +11:00
parent d2ba672a30
commit 4bf160934c
5 changed files with 25 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/coord.cpp
View File

@ -34,7 +34,7 @@ main (void)
auto vec = util::vector4f (0.5f); auto vec = util::vector4f (0.5f);
t.expect_eq (vec, util::normalised (vec), "normalisation of normalised vector"); t.expect_eq (vec, util::normalised (vec), "normalisation of normalised vector");
t.expect_eq (sum (util::vector4f::ONES), 4.f, "elementwise summation"); t.expect_eq (sum (util::vector4f::ones ()), 4.f, "elementwise summation");
return t.status (); return t.status ();
} }

4
test/vector.cpp
View File

@ -111,8 +111,8 @@ main ()
test_polar (tap); test_polar (tap);
test_euler (tap); test_euler (tap);
tap.expect (!is_normalised (util::vector3f::ZERO), "zero isn't normalised"); tap.expect (!is_normalised (util::vector3f::zeros ()), "zeros isn't normalised");
tap.expect (!is_normalised (util::vector3f::ONES), "ones isn't normalised"); tap.expect (!is_normalised (util::vector3f::ones ()), "ones isn't normalised");
tap.expect_eq ( tap.expect_eq (
util::hypot (util::vector3f{0,1,2} - util::vector3f{3,2,4}), util::hypot (util::vector3f{0,1,2} - util::vector3f{3,2,4}),

12
vector.cpp
View File

@ -112,18 +112,6 @@ util::cartesian_to_spherical (vector<3,T> c)
} }
///////////////////////////////////////////////////////////////////////////////
template <size_t S, typename T>
const util::vector<S,T>
util::vector<S,T>::ONES (T{1});
//-----------------------------------------------------------------------------
template <size_t S, typename T>
const util::vector<S,T>
util::vector<S,T>::ZERO (T{0});
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
template <size_t S, typename T> template <size_t S, typename T>
void void

4
vector.hpp
View File

@ -30,8 +30,8 @@ namespace util {
template <size_t D> vector<D,T> homog (void) const; template <size_t D> vector<D,T> homog (void) const;
// constants // constants
static const vector<S,T> ONES; static constexpr vector<S,T> ones (void);
static const vector<S,T> ZERO; static constexpr vector<S,T> zeros (void);
void sanity (void) const; void sanity (void) const;
}; };

20
vector.ipp
View File

@ -46,3 +46,23 @@ util::cross (util::vector<3,T> a, util::vector<3,T> b)
a.x * b.y - a.y * b.x a.x * b.y - a.y * b.x
}; };
} }
///////////////////////////////////////////////////////////////////////////////
template <size_t S, typename T>
constexpr
util::vector<S,T>
util::vector<S,T>::ones (void)
{
return vector<S,T> {1};
}
//-----------------------------------------------------------------------------
template <size_t S, typename T>
constexpr
util::vector<S,T>
util::vector<S,T>::zeros (void)
{
return vector<S,T> {0};
}