diff --git a/Makefile.am b/Makefile.am index d83d31c7..d34e2e16 100644 --- a/Makefile.am +++ b/Makefile.am @@ -246,6 +246,7 @@ UTIL_FILES = \ variadic.ipp \ vector.cpp \ vector.hpp \ + vector.ipp \ version.cpp \ version.hpp \ view.cpp \ diff --git a/vector.hpp b/vector.hpp index 2ba6bb0b..ce194f14 100644 --- a/vector.hpp +++ b/vector.hpp @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. * - * Copyright 2011 Danny Robson + * Copyright 2011-2015 Danny Robson */ #ifndef __UTIL_VECTOR_HPP @@ -45,6 +45,9 @@ namespace util { vector& normalise (void); vector normalised [[gnu::warn_unused_result]] (void) const; + // representations + template vector homog (void) const; + // constants static const vector UNIT; static const vector ZERO; @@ -83,5 +86,7 @@ namespace util { typedef vector<3,double> vector4d; } +#include "vector.ipp" + #endif diff --git a/vector.ipp b/vector.ipp new file mode 100644 index 00000000..87ec483e --- /dev/null +++ b/vector.ipp @@ -0,0 +1,33 @@ +/* + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * Copyright 2011-2015 Danny Robson + */ + +#if defined(__UTIL_VECTOR_IPP) +#error +#else +#define __UTIL_VECTOR_IPP +#endif + + +namespace util { + template + template + vector + vector::homog (void) const + { + static_assert (D > S, "reducing size loses data"); + return (*this).template redim (0.f); + } +}