mewin/glm
1
0
Fork 0
Code Releases Activity

Fixed bad merge

Browse Source
This commit is contained in:
Christophe Riccio
2016-07-16 01:00:24 +02:00
parent 6271aa1530
commit 61e8432634
1 changed files with 0 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
glm/gtc/reciprocal.hpp
View File

@@ -30,11 +30,7 @@ namespace glm
/// @tparam genType Floating-point scalar or vector types. /// @tparam genType Floating-point scalar or vector types.
/// ///
/// @see gtc_reciprocal /// @see gtc_reciprocal
<<<<<<< HEAD
template <typename genType> template <typename genType>
=======
template <typename genType>
>>>>>>> 0.9.7
GLM_FUNC_DECL genType sec(genType angle); GLM_FUNC_DECL genType sec(genType angle);
/// Cosecant function. /// Cosecant function.
@@ -52,11 +48,7 @@ namespace glm
/// @tparam genType Floating-point scalar or vector types. /// @tparam genType Floating-point scalar or vector types.
/// ///
/// @see gtc_reciprocal /// @see gtc_reciprocal
<<<<<<< HEAD
template <typename genType> template <typename genType>
=======
template <typename genType>
>>>>>>> 0.9.7
GLM_FUNC_DECL genType cot(genType angle); GLM_FUNC_DECL genType cot(genType angle);
/// Inverse secant function. /// Inverse secant function.
@@ -65,11 +57,7 @@ namespace glm
/// @tparam genType Floating-point scalar or vector types. /// @tparam genType Floating-point scalar or vector types.
/// ///
/// @see gtc_reciprocal /// @see gtc_reciprocal
<<<<<<< HEAD
template <typename genType> template <typename genType>
=======
template <typename genType>
>>>>>>> 0.9.7
GLM_FUNC_DECL genType asec(genType x); GLM_FUNC_DECL genType asec(genType x);
/// Inverse cosecant function. /// Inverse cosecant function.
@@ -78,11 +66,7 @@ namespace glm
/// @tparam genType Floating-point scalar or vector types. /// @tparam genType Floating-point scalar or vector types.
/// ///
/// @see gtc_reciprocal /// @see gtc_reciprocal
<<<<<<< HEAD
template <typename genType> template <typename genType>
=======
template <typename genType>
>>>>>>> 0.9.7
GLM_FUNC_DECL genType acsc(genType x); GLM_FUNC_DECL genType acsc(genType x);
/// Inverse cotangent function. /// Inverse cotangent function.
@@ -91,11 +75,7 @@ namespace glm
/// @tparam genType Floating-point scalar or vector types. /// @tparam genType Floating-point scalar or vector types.
/// ///
/// @see gtc_reciprocal /// @see gtc_reciprocal
<<<<<<< HEAD
template <typename genType> template <typename genType>
=======
template <typename genType>
>>>>>>> 0.9.7
GLM_FUNC_DECL genType acot(genType x); GLM_FUNC_DECL genType acot(genType x);
/// Secant hyperbolic function. /// Secant hyperbolic function.
@@ -103,11 +83,7 @@ namespace glm
/// @tparam genType Floating-point scalar or vector types. /// @tparam genType Floating-point scalar or vector types.
/// ///
/// @see gtc_reciprocal /// @see gtc_reciprocal
<<<<<<< HEAD
template <typename genType> template <typename genType>
=======
template <typename genType>
>>>>>>> 0.9.7
GLM_FUNC_DECL genType sech(genType angle); GLM_FUNC_DECL genType sech(genType angle);
/// Cosecant hyperbolic function. /// Cosecant hyperbolic function.