mirror of
https://github.com/JoeyDeVries/LearnOpenGL.git
synced 2026-01-05 08:13:23 +08:00
Updated GLM version w/ now standard radians as angles.
This commit is contained in:
@@ -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
|
||||
@@ -20,8 +24,8 @@
|
||||
/// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||
/// THE SOFTWARE.
|
||||
///
|
||||
/// @ref gtx_bit
|
||||
/// @file glm/gtx/bit.hpp
|
||||
/// @ref gtx_closest_point
|
||||
/// @file glm/gtx/closest_point.hpp
|
||||
/// @date 2005-12-30 / 2011-06-07
|
||||
/// @author Christophe Riccio
|
||||
///
|
||||
@@ -35,13 +39,12 @@
|
||||
/// <glm/gtx/closest_point.hpp> need to be included to use these functionalities.
|
||||
///////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
#ifndef GLM_GTX_closest_point
|
||||
#define GLM_GTX_closest_point GLM_VERSION
|
||||
#pragma once
|
||||
|
||||
// Dependency:
|
||||
#include "../glm.hpp"
|
||||
|
||||
#if(defined(GLM_MESSAGES) && !defined(glm_ext))
|
||||
#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED))
|
||||
# pragma message("GLM: GLM_GTX_closest_point extension included")
|
||||
#endif
|
||||
|
||||
@@ -52,15 +55,20 @@ namespace glm
|
||||
|
||||
/// Find the point on a straight line which is the closet of a point.
|
||||
/// @see gtx_closest_point
|
||||
template <typename T>
|
||||
detail::tvec3<T> closestPointOnLine(
|
||||
detail::tvec3<T> const & point,
|
||||
detail::tvec3<T> const & a,
|
||||
detail::tvec3<T> const & b);
|
||||
template <typename T, precision P>
|
||||
GLM_FUNC_DECL tvec3<T, P> closestPointOnLine(
|
||||
tvec3<T, P> const & point,
|
||||
tvec3<T, P> const & a,
|
||||
tvec3<T, P> const & b);
|
||||
|
||||
/// 2d lines work as well
|
||||
template <typename T, precision P>
|
||||
GLM_FUNC_DECL tvec2<T, P> closestPointOnLine(
|
||||
tvec2<T, P> const & point,
|
||||
tvec2<T, P> const & a,
|
||||
tvec2<T, P> const & b);
|
||||
|
||||
/// @}
|
||||
}// namespace glm
|
||||
|
||||
#include "closest_point.inl"
|
||||
|
||||
#endif//GLM_GTX_closest_point
|
||||
|
||||
Reference in New Issue
Block a user