diff --git a/glm/gtc/dual_quaternion.hpp b/glm/gtx/dual_quaternion.hpp similarity index 94% rename from glm/gtc/dual_quaternion.hpp rename to glm/gtx/dual_quaternion.hpp index 3f8c1e96..c4d7b267 100644 --- a/glm/gtc/dual_quaternion.hpp +++ b/glm/gtx/dual_quaternion.hpp @@ -20,9 +20,9 @@ /// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN /// THE SOFTWARE. /// -/// @ref gtc_dual_quaternion -/// @file glm/gtc/dual_quaternion.hpp -/// @date 2013-02-10 / 2013-02-13 +/// @ref gtx_dual_quaternion +/// @file glm/gtx/dual_quaternion.hpp +/// @date 2013-02-10 / 2013-02-20 /// @author Maksim Vorobiev (msomeone@gmail.com) /// /// @see core (dependence) @@ -30,16 +30,16 @@ /// @see gtc_constants (dependence) /// @see gtc_quaternion (dependence) /// -/// @defgroup gtc_dual_quaternion GLM_GTC_dual_quaternion +/// @defgroup gtc_dual_quaternion GLM_GTX_dual_quaternion /// @ingroup gtc /// /// @brief Defines a templated dual-quaternion type and several dual-quaternion operations. /// -/// need to be included to use these functionalities. +/// need to be included to use these functionalities. /////////////////////////////////////////////////////////////////////////////////// -#ifndef GLM_GTC_dual_quaternion -#define GLM_GTC_dual_quaternion GLM_VERSION +#ifndef GLM_GTX_dual_quaternion +#define GLM_GTX_dual_quaternion GLM_VERSION // Dependency: #include "../glm.hpp" @@ -48,7 +48,7 @@ #include "../gtc/quaternion.hpp" #if(defined(GLM_MESSAGES) && !defined(glm_ext)) -# pragma message("GLM: GLM_GTC_dual_quaternion extension included") +# pragma message("GLM: GLM_GTX_dual_quaternion extension included") #endif namespace glm{ @@ -239,4 +239,4 @@ namespace detail #include "dual_quaternion.inl" -#endif//GLM_GTC_dual_quaternion +#endif//GLM_GTX_dual_quaternion diff --git a/glm/gtc/dual_quaternion.inl b/glm/gtx/dual_quaternion.inl similarity index 99% rename from glm/gtc/dual_quaternion.inl rename to glm/gtx/dual_quaternion.inl index 03d58a53..65a76401 100644 --- a/glm/gtc/dual_quaternion.inl +++ b/glm/gtx/dual_quaternion.inl @@ -20,8 +20,8 @@ /// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN /// THE SOFTWARE. /// -/// @ref gtc_quaternion -/// @file glm/gtc/quaternion.inl +/// @ref gtx_quaternion +/// @file glm/gtx/quaternion.inl /// @date 2013-02-10 / 2013-02-13 /// @author Maksim Vorobiev (msomeone@gmail.com) /////////////////////////////////////////////////////////////////////////////////// diff --git a/test/gtc/CMakeLists.txt b/test/gtc/CMakeLists.txt index 2ba9f3ca..273341a8 100644 --- a/test/gtc/CMakeLists.txt +++ b/test/gtc/CMakeLists.txt @@ -7,7 +7,6 @@ glmCreateTestGTC(gtc_matrix_inverse) glmCreateTestGTC(gtc_matrix_transform) glmCreateTestGTC(gtc_noise) glmCreateTestGTC(gtc_quaternion) -glmCreateTestGTC(gtc_dual_quaternion) glmCreateTestGTC(gtc_random) glmCreateTestGTC(gtc_reciprocal) glmCreateTestGTC(gtc_swizzle) diff --git a/test/gtx/CMakeLists.txt b/test/gtx/CMakeLists.txt index 1beed4d3..e268abc4 100644 --- a/test/gtx/CMakeLists.txt +++ b/test/gtx/CMakeLists.txt @@ -5,6 +5,7 @@ glmCreateTestGTC(gtx_matrix_interpolation) glmCreateTestGTC(gtx_matrix_query) glmCreateTestGTC(gtx_multiple) glmCreateTestGTC(gtx_quaternion) +glmCreateTestGTC(gtx_dual_quaternion) glmCreateTestGTC(gtx_rotate_normalized_axis) glmCreateTestGTC(gtx_rotate_vector) glmCreateTestGTC(gtx_scalar_relational) diff --git a/test/gtc/gtc_dual_quaternion.cpp b/test/gtx/gtx_dual_quaternion.cpp similarity index 99% rename from test/gtc/gtc_dual_quaternion.cpp rename to test/gtx/gtx_dual_quaternion.cpp index 8aef1fb2..ed716334 100644 --- a/test/gtc/gtc_dual_quaternion.cpp +++ b/test/gtx/gtx_dual_quaternion.cpp @@ -8,7 +8,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #include -#include +#include #include #include #include