King_DuckZ
/
vectorwrapper
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add an example.cpp unit test to demonstrate usage. 

Shows what it looks like when you mix vectors of different
type vs using vectorwrapper.
This commit is contained in:
King_DuckZ 2015-07-25 20:55:52 +02:00
parent 958de67849
commit fe03f45f76
4 changed files with 100 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
include/vectorwrapper/vectorwrapper.inl
View File

@ -98,7 +98,7 @@ namespace vwr {
template <typename V>
template <typename V2>
VecBase<V>& VecBase<V>::operator+= (const VecBase<V2>& parOther) {
static_assert(VectorWrapperInfo<V>::dimensions == VectorWrapperInfo<V2>::dimensions, "Dimensions mismatch");
static_assert(static_cast<int>(VectorWrapperInfo<V>::dimensions) == static_cast<int>(VectorWrapperInfo<V2>::dimensions), "Dimensions mismatch");
for (int z = 0; z < VectorWrapperInfo<V>::dimensions; ++z) {
(*this)[z] += parOther[z];
}
@ -107,7 +107,7 @@ namespace vwr {
template <typename V>
template <typename V2>
VecBase<V>& VecBase<V>::operator-= (const VecBase<V2>& parOther) {
static_assert(VectorWrapperInfo<V>::dimensions == VectorWrapperInfo<V2>::dimensions, "Dimensions mismatch");
static_assert(static_cast<int>(VectorWrapperInfo<V>::dimensions) == static_cast<int>(VectorWrapperInfo<V2>::dimensions), "Dimensions mismatch");
for (int z = 0; z < VectorWrapperInfo<V>::dimensions; ++z) {
(*this)[z] -= parOther[z];
}
@ -116,7 +116,7 @@ namespace vwr {
template <typename V>
template <typename V2>
VecBase<V>& VecBase<V>::operator*= (const VecBase<V2>& parOther) {
static_assert(VectorWrapperInfo<V>::dimensions == VectorWrapperInfo<V2>::dimensions, "Dimensions mismatch");
static_assert(static_cast<int>(VectorWrapperInfo<V>::dimensions) == static_cast<int>(VectorWrapperInfo<V2>::dimensions), "Dimensions mismatch");
for (int z = 0; z < VectorWrapperInfo<V>::dimensions; ++z) {
(*this)[z] *= parOther[z];
}
@ -125,7 +125,7 @@ namespace vwr {
template <typename V>
template <typename V2>
VecBase<V>& VecBase<V>::operator/= (const VecBase<V2>& parOther) {
static_assert(VectorWrapperInfo<V>::dimensions == VectorWrapperInfo<V2>::dimensions, "Dimensions mismatch");
static_assert(static_cast<int>(VectorWrapperInfo<V>::dimensions) == static_cast<int>(VectorWrapperInfo<V2>::dimensions), "Dimensions mismatch");
for (int z = 0; z < VectorWrapperInfo<V>::dimensions; ++z) {
(*this)[z] /= parOther[z];
}
@ -300,7 +300,7 @@ namespace vwr {
template <typename V1, typename V2>
inline bool operator== (const Vec<V1>& parLeft, const Vec<V2>& parRight) {
static_assert(VectorWrapperInfo<V1>::dimensions == VectorWrapperInfo<V2>::dimensions, "Dimensions mismatch");
static_assert(static_cast<int>(VectorWrapperInfo<V1>::dimensions) == static_cast<int>(VectorWrapperInfo<V2>::dimensions), "Dimensions mismatch");
bool retval = true;
for (int z = 0; z < VectorWrapperInfo<V1>::dimensions; ++z) {
retval &= (parLeft[z] == parRight[z]);
@ -309,7 +309,7 @@ namespace vwr {
}
template <typename V1, typename V2>
inline bool operator< (const Vec<V1>& parLeft, const Vec<V2>& parRight) {
static_assert(VectorWrapperInfo<V1>::dimensions == VectorWrapperInfo<V2>::dimensions, "Dimensions mismatch");
static_assert(static_cast<int>(VectorWrapperInfo<V1>::dimensions) == static_cast<int>(VectorWrapperInfo<V2>::dimensions), "Dimensions mismatch");
bool retval = true;
for (int z = 0; z < VectorWrapperInfo<V1>::dimensions; ++z) {
retval &= (parLeft[z] < parRight[z]);
@ -353,7 +353,7 @@ namespace vwr {
template <typename V1, typename V2>
inline Vec<typename std::common_type<V1, V2>::type> operator+ (const Vec<V1>& parLeft, const Vec<V2>& parRight) {
static_assert(VectorWrapperInfo<V1>::dimensions == VectorWrapperInfo<V2>::dimensions, "Dimensions mismatch");
static_assert(static_cast<int>(VectorWrapperInfo<V1>::dimensions) == static_cast<int>(VectorWrapperInfo<V2>::dimensions), "Dimensions mismatch");
Vec<typename std::common_type<V1, V2>::type> retval;
for (int z = 0; z < VectorWrapperInfo<V1>::dimensions; ++z) {
retval[z] = parLeft[z] + parRight[z];
@ -362,7 +362,7 @@ namespace vwr {
}
template <typename V1, typename V2>
inline Vec<typename std::common_type<V1, V2>::type> operator- (const Vec<V1>& parLeft, const Vec<V2>& parRight) {
static_assert(VectorWrapperInfo<V1>::dimensions == VectorWrapperInfo<V2>::dimensions, "Dimensions mismatch");
static_assert(static_cast<int>(VectorWrapperInfo<V1>::dimensions) == static_cast<int>(VectorWrapperInfo<V2>::dimensions), "Dimensions mismatch");
Vec<typename std::common_type<V1, V2>::type> retval;
for (int z = 0; z < VectorWrapperInfo<V1>::dimensions; ++z) {
retval[z] = parLeft[z] - parRight[z];
@ -371,7 +371,7 @@ namespace vwr {
}
template <typename V1, typename V2>
inline Vec<typename std::common_type<V1, V2>::type> operator* (const Vec<V1>& parLeft, const Vec<V2>& parRight) {
static_assert(VectorWrapperInfo<V1>::dimensions == VectorWrapperInfo<V2>::dimensions, "Dimensions mismatch");
static_assert(static_cast<int>(VectorWrapperInfo<V1>::dimensions) == static_cast<int>(VectorWrapperInfo<V2>::dimensions), "Dimensions mismatch");
Vec<typename std::common_type<V1, V2>::type> retval;
for (int z = 0; z < VectorWrapperInfo<V1>::dimensions; ++z) {
retval[z] = parLeft[z] * parRight[z];
@ -380,7 +380,7 @@ namespace vwr {
}
template <typename V1, typename V2>
inline Vec<typename std::common_type<V1, V2>::type> operator/ (const Vec<V1>& parLeft, const Vec<V2>& parRight) {
static_assert(VectorWrapperInfo<V1>::dimensions == VectorWrapperInfo<V2>::dimensions, "Dimensions mismatch");
static_assert(static_cast<int>(VectorWrapperInfo<V1>::dimensions) == static_cast<int>(VectorWrapperInfo<V2>::dimensions), "Dimensions mismatch");
Vec<typename std::common_type<V1, V2>::type> retval;
for (int z = 0; z < VectorWrapperInfo<V1>::dimensions; ++z) {
retval[z] = parLeft[z] / parRight[z];

1
test/unit/CMakeLists.txt
View File

@ -4,6 +4,7 @@ add_executable(${PROJECT_NAME}
${GTEST_MAIN_CPP}
test_conversions.cpp
test_ops.cpp
example.cpp
)
target_link_libraries(${PROJECT_NAME}

77
test/unit/example.cpp Normal file
View File

@ -0,0 +1,77 @@
#include "sample_vectors.hpp"
#include <gtest/gtest.h>
namespace {
void simplevec_double (vwr::SimpleVector3& parVec, float parX, float parY, float parZ) {
EXPECT_EQ(parVec.x, parX);
EXPECT_EQ(parVec.y, parY);
EXPECT_EQ(parVec.z, parZ);
parVec.x *= 2.0f;
parVec.y *= 2.0f;
parVec.z *= 2.0f;
}
} //unnamed namespace
TEST(vwr, example) {
using namespace vwr;
//Using the bare vectors
{
//Imagine you get this vector from a function's return value.
auto vec = TrailingDataVector3{2.0f, 5.5f, 3.8f, 1, 2};
//Now you want to pass it on to a function from a different library.
//To be safe, create a temporary of the correct type.
//Was it lower case x, upper case, with or without paretheses?
auto vec_b = SimpleVector3{vec.X, vec.Y, vec.Z};
simplevec_double(vec_b, vec_b.x, vec_b.y, vec_b.z);
//The above call changed the input vector, so re-assign it (vec_b is
//just a converted copy, remember?)
vec.X = vec_b.x;
vec.Y = vec_b.y;
vec.Z = vec_b.z;
//Can't compare with vec == vec_b, so unroll it manually
EXPECT_EQ(vec.X, vec_b.x);
EXPECT_EQ(vec.Y, vec_b.y);
EXPECT_EQ(vec.Z, vec_b.z);
}
//Using vectorwrapper
{
auto vec_in = TrailingDataVector3{2.0f, 5.5f, 3.8f, 1, 2};
//In reality, I just wrote TrailingDataVector3's definition myself, but
//I'm already spending time to fix the build as I call vec.x instead of
//vec.X. Do you think it's a remote case? Think twice.
EXPECT_EQ(vec_in.X, 2.0f);
EXPECT_EQ(vec_in.Y, 5.5f);
EXPECT_EQ(vec_in.Z, 3.8f);
EXPECT_EQ(vec_in.a, 1);
EXPECT_EQ(vec_in.b, 2);
tvec3 vec(vec_in);
EXPECT_EQ(vec.x(), 2.0f);
EXPECT_EQ(vec.y(), 5.5f);
EXPECT_EQ(vec.z(), 3.8f);
//If you initialize vec from an object of the wrapped type, extra data
//also gets initialized correctly. But I think in most situations you
//won't need this.
EXPECT_EQ(vec.data().a, 1);
EXPECT_EQ(vec.data().b, 2);
//Suppose TrailingDataVector3 is a third-party struct and I'm not
//guaranteed it will never change. Sure I can reinterpret_cast it, as
//much as I could reinterpret_cast a short int to a TrailingDataVector3.
//The following line won't compile if casting is not deemed appropriate.
simplevec_double(vec.cast<vwr::svec3>().data(), vec.x(), vec.y(), vec.z());
//Well that's it.
//If what you wanted is indeed a copy of type SimpleVector3, here we go:
svec3 vec_b(vec);
EXPECT_EQ(vec_b, vec);
}
}

22
test/unit/test_conversions.cpp
View File

@ -1,17 +1,19 @@
#include "sample_vectors.hpp"
#include <gtest/gtest.h>
void test_svec3 (const vwr::svec3& parVec, float parX, float parY, float parZ) {
EXPECT_EQ(parVec.x(), parX);
EXPECT_EQ(parVec.y(), parY);
EXPECT_EQ(parVec.z(), parZ);
}
namespace {
void test_svec3 (const vwr::svec3& parVec, float parX, float parY, float parZ) {
EXPECT_EQ(parVec.x(), parX);
EXPECT_EQ(parVec.y(), parY);
EXPECT_EQ(parVec.z(), parZ);
}
void test_tvec3 (const vwr::tvec3& parVec, float parX, float parY, float parZ) {
EXPECT_EQ(parVec.x(), parX);
EXPECT_EQ(parVec.y(), parY);
EXPECT_EQ(parVec.z(), parZ);
}
void test_tvec3 (const vwr::tvec3& parVec, float parX, float parY, float parZ) {
EXPECT_EQ(parVec.x(), parX);
EXPECT_EQ(parVec.y(), parY);
EXPECT_EQ(parVec.z(), parZ);
}
} //unnamed namespace
TEST(vwr, conversion) {
using namespace vwr;