Pixyco-XYZ/openmesh
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

C++11: Create version of homogenized() for C++11 branch (without macros).

Browse Source
This commit is contained in:
Hans-Christian Ebke
2015-11-10 16:08:53 +01:00
parent dfcc98c845
commit 0d619f33d3
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/OpenMesh/Core/Geometry/VectorT_inc.hh
View File

@@ -107,6 +107,17 @@ public:
typename = typename std::enable_if<are_convertible_to<float, T...>::value>::type> typename = typename std::enable_if<are_convertible_to<float, T...>::value>::type>
constexpr VectorT(T... vs) : Base { static_cast<Scalar>(vs)...} constexpr VectorT(T... vs) : Base { static_cast<Scalar>(vs)...}
{ } { }
template<int D = DIM, typename = typename std::enable_if<D == DIM>::type>
typename std::enable_if<D==4, VectorT>::type
homogenized() const {
return VectorT(
Base::values_[0]/Base::values_[3],
Base::values_[1]/Base::values_[3],
Base::values_[2]/Base::values_[3],
1);
}
#else #else
/// special constructor for 1D vectors /// special constructor for 1D vectors
explicit inline VectorT(const Scalar& v) { explicit inline VectorT(const Scalar& v) {
@@ -136,7 +147,7 @@ public:
Base::values_[0]=v0; Base::values_[1]=v1; Base::values_[2]=v2; Base::values_[3]=v3; Base::values_[0]=v0; Base::values_[1]=v1; Base::values_[2]=v2; Base::values_[3]=v3;
} }
VectorT homogenized() { return VectorT(Base::values_[0]/Base::values_[3], Base::values_[1]/Base::values_[3], Base::values_[2]/Base::values_[3], 1); } VectorT homogenized() const { return VectorT(Base::values_[0]/Base::values_[3], Base::values_[1]/Base::values_[3], Base::values_[2]/Base::values_[3], 1); }
#endif #endif
#if DIM == 5 #if DIM == 5