lenn/LearnOpenGL
1
0
Fork 0
mirror of https://github.com/JoeyDeVries/LearnOpenGL.git synced 2026-01-07 09:13:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

Updated GLM version w/ now standard radians as angles.

Browse Source
This commit is contained in:
J. de Vries
2016-05-11 20:04:52 +02:00
parent 336df22af5
commit a4c2bb2498
321 changed files with 42426 additions and 35972 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
includes/glm/gtx/vector_angle.hpp
View File

@@ -1,7 +1,7 @@
///////////////////////////////////////////////////////////////////////////////////
/// OpenGL Mathematics (glm.g-truc.net)
///
/// Copyright (c) 2005 - 2013 G-Truc Creation (www.g-truc.net)
/// Copyright (c) 2005 - 2015 G-Truc Creation (www.g-truc.net)
/// Permission is hereby granted, free of charge, to any person obtaining a copy
/// of this software and associated documentation files (the "Software"), to deal
/// in the Software without restriction, including without limitation the rights
@@ -12,6 +12,10 @@
/// The above copyright notice and this permission notice shall be included in
/// all copies or substantial portions of the Software.
///
/// Restrictions:
/// By making use of the Software for military purposes, you choose to make
/// a Bunny unhappy.
///
/// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
/// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
/// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -37,8 +41,7 @@
/// <glm/gtx/vector_angle.hpp> need to be included to use these functionalities.
///////////////////////////////////////////////////////////////////////////////////
#ifndef GLM_GTX_vector_angle
#define GLM_GTX_vector_angle GLM_VERSION
#pragma once
// Dependency:
#include "../glm.hpp"
@@ -46,7 +49,7 @@
#include "../gtx/quaternion.hpp"
#include "../gtx/rotate_vector.hpp"
#if(defined(GLM_MESSAGES) && !defined(glm_ext))
#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED))
# pragma message("GLM: GLM_GTX_vector_angle extension included")
#endif
@@ -55,34 +58,32 @@ namespace glm
/// @addtogroup gtx_vector_angle
/// @{
//! Returns the absolute angle between two vectors
//! Returns the absolute angle between two vectors.
//! Parameters need to be normalized.
//! From GLM_GTX_vector_angle extension
template <typename vecType>
GLM_FUNC_QUALIFIER typename vecType::value_type angle(
/// @see gtx_vector_angle extension.
template <typename vecType>
GLM_FUNC_DECL typename vecType::value_type angle(
vecType const & x,
vecType const & y);
//! Returns the oriented angle between two 2d vectors
//! Returns the oriented angle between two 2d vectors.
//! Parameters need to be normalized.
//! From GLM_GTX_vector_angle extension.
template <typename T>
GLM_FUNC_QUALIFIER T orientedAngle(
detail::tvec2<T> const & x,
detail::tvec2<T> const & y);
/// @see gtx_vector_angle extension.
template <typename T, precision P>
GLM_FUNC_DECL T orientedAngle(
tvec2<T, P> const & x,
tvec2<T, P> const & y);
//! Returns the oriented angle between two 3d vectors based from a reference axis.
//! Parameters need to be normalized.
//! From GLM_GTX_vector_angle extension.
template <typename T>
GLM_FUNC_QUALIFIER T orientedAngle(
detail::tvec3<T> const & x,
detail::tvec3<T> const & y,
detail::tvec3<T> const & ref);
/// @see gtx_vector_angle extension.
template <typename T, precision P>
GLM_FUNC_DECL T orientedAngle(
tvec3<T, P> const & x,
tvec3<T, P> const & y,
tvec3<T, P> const & ref);
/// @}
}// namespace glm
#include "vector_angle.inl"
#endif//GLM_GTX_vector_angle