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

Fix build errors and typos in the documentation.

Browse source
This commit is contained in:
King_DuckZ 2015-07-23 23:10:55 +02:00
parent b7c7d77dac
commit 7547450913
3 changed files with 20 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
README.md
View file

@ -56,7 +56,7 @@ In this example we will adapt `std::array<float, N>` and `Ogre::VectorN`. In you
//Include Vec's header
#include "vectorwrapper.hpp"
#include <array>
#include <stddef.h>
#include <cstddef>
template <>
struct VectorWrapperInfo<std::array<float, 3>> {
@ -74,7 +74,7 @@ In this example we will adapt `std::array<float, N>` and `Ogre::VectorN`. In you
//This will make the xy(), xz() and yz() methods available
typedef std::array<float, 2> lower_vector_type;
scalar_type& get_at (size_t parIndex, vector_type& parVector) {
static scalar_type& get_at (size_t parIndex, vector_type& parVector) {
//parIndex is already asserted to be < dimensions
//so you can always assume it's valid.
return parVector[parIndex];
@ -92,7 +92,7 @@ In this example we will adapt `std::array<float, N>` and `Ogre::VectorN`. In you
typedef std::array<float, 3> higher_vector_type;
typedef std::array<float, 1> lower_vector_type;
scalar_type& get_at (size_t parIndex, vector_type& parVector) {
static scalar_type& get_at (size_t parIndex, vector_type& parVector) {
return parVector[parIndex];
}
};
@ -108,7 +108,7 @@ In this example we will adapt `std::array<float, N>` and `Ogre::VectorN`. In you
typedef float vector_type;
typedef std::array<float, 2> higher_vector_type;
scalar_type& get_at (size_t, vector_type& parVector) {
static scalar_type& get_at (size_t, vector_type& parVector) {
return parVector;
}
};
@ -131,7 +131,7 @@ In this example we will adapt `std::array<float, N>` and `Ogre::VectorN`. In you
//certain casts that would be disabled if you provided
//the get_at() method instead.
enum {
offset_x = offestof(Ogre::Vector3, x),
offset_x = offsetof(Ogre::Vector3, x),
offset_y = offsetof(Ogre::Vector3, y),
offset_z = offsetof(Ogre::Vector3, z)
};
@ -148,7 +148,7 @@ In this example we will adapt `std::array<float, N>` and `Ogre::VectorN`. In you
typedef Ogre::Vector3 higher_vector_type;
enum {
offset_x = offestof(Ogre::Vector3, x),
offset_x = offsetof(Ogre::Vector3, x),
offset_y = offsetof(Ogre::Vector3, y)
};
};
@ -161,4 +161,4 @@ In this example we will adapt `std::array<float, N>` and `Ogre::VectorN`. In you
## Limitations ##
* 4D vectors are not currently supported
* Read-only vectors are not supported (not sure if such a thing is really needed)
* Read-only vectors are not supported (not sure if such a thing is really needed)

17
include/vectorwrapper/vectorwrapper.hpp
View file

@ -35,7 +35,7 @@ namespace vwr {
namespace implem {
define_has_typedef(lower_vector_type, LowerVec);
define_has_typedef(higher_vector_type, HigherVec);
define_has_enum(vector_x, VectorX);
define_has_enum(offset_x, OffsetX);
define_has_method(get_at, GetAt);
template <typename V1, typename V2, std::size_t D>
@ -77,9 +77,9 @@ namespace vwr {
struct have_same_layout {
enum {
value =
HasVectorXEnum<T>::value and HasVectorXEnum<U>::value and
HasOffsetXEnum<T>::value and HasOffsetXEnum<U>::value and
VectorWrapperInfo<T>::dimensions == VectorWrapperInfo<U>::dimensions and
have_same_offsets<T, U>::value;
have_same_offsets<T, U>::value
};
};
@ -102,7 +102,8 @@ namespace vwr {
};
VecBase ( void ) = default;
explicit VecBase ( scalar_type parInit );
template <typename T>
explicit VecBase ( const typename std::enable_if<std::is_same<T, scalar_type>::value and not std::is_same<scalar_type, vector_type>::value, T>::type& parInit );
explicit VecBase ( const vector_type& parInit );
template <typename... Args>
VecBase ( scalar_type parX, scalar_type parY, Args... parArgs );
@ -152,7 +153,7 @@ namespace vwr {
const std::array<unsigned int, S> offsets;
};
template <typename T, bool=HasVectorXEnum<VectorWrapperInfo<T>>::value and std::is_standard_layout<typename VectorWrapperInfo<T>::vector_type>::value>
template <typename T, bool=HasOffsetXEnum<VectorWrapperInfo<T>>::value and std::is_standard_layout<typename VectorWrapperInfo<T>::vector_type>::value>
class VecGetter;
template <typename T>
struct VecGetter<T, true> {
@ -162,7 +163,8 @@ namespace vwr {
struct VecGetter<T, false> {
private:
static_assert(HasGetAtMethod<VectorWrapperInfo<T>>::value, "You must provide a get_at() static method for this vector_type");
typedef decltype(&VectorWrapperInfo<T>::get_at) get_at_func;
typedef typename VectorWrapperInfo<T>::scalar_type scalar_type;
using get_at_func = decltype(&VectorWrapperInfo<T>::get_at)(std::size_t, scalar_type&);
static_assert(not std::is_rvalue_reference<typename std::result_of<get_at_func>::type>::value, "rvalue ref return types not implemented");
static_assert(std::is_lvalue_reference<typename std::result_of<get_at_func>::type>::value, "Read-only vectors not implemented");
@ -261,7 +263,8 @@ namespace vwr {
Vec ( void ) = default;
Vec ( const Vec& ) = default;
explicit Vec ( const vector_type& parIn ) : implem::VecBase<V>(parIn) { }
explicit Vec ( const scalar_type parX ) : implem::VecBase<V>(parX) { }
template <typename T>
explicit Vec ( const typename std::enable_if<std::is_same<T, scalar_type>::value and not std::is_same<scalar_type, vector_type>::value, T>::type& parX ) : implem::VecBase<V>(parX) { }
template <typename V2> Vec ( const Vec<V2, dimensions>& parOther ) { implem::assign(*this, parOther); }
scalar_type& x ( void ) { return (*this)[0]; }

5
include/vectorwrapper/vectorwrapper.inl
View file

@ -17,7 +17,8 @@
namespace vwr {
namespace implem {
template <typename V>
VecBase<V>::VecBase (scalar_type parInit) :
template <typename T>
VecBase<V>::VecBase (const typename std::enable_if<std::is_same<T, scalar_type>::value and not std::is_same<scalar_type, vector_type>::value, T>::type& parInit) :
m_wrapped(parInit)
{
}
@ -121,7 +122,7 @@ namespace vwr {
template <typename T>
typename VectorWrapperInfo<T>::scalar_type& VecGetter<T, false>::get_at (typename VectorWrapperInfo<T>::vector_type& parVec, std::size_t parIndex) {
assert(parIndex < VectorWrapperInfo<T>::dimensions);
return VectorWrapperInfo<T>::get_at(parVec, parIndex);
return VectorWrapperInfo<T>::get_at(parIndex, parVec);
}
template <typename V1, typename V2, std::size_t D>