Browse Source

Fixed references to GLM_FORCE_RADIANS which was removed #642

Christophe Riccio 8 years ago
parent
commit
4e6574749d
4 changed files with 5 additions and 4 deletions
  1. 1 1
      glm/gtc/quaternion.hpp
  2. 1 1
      glm/gtx/matrix_transform_2d.hpp
  3. 2 2
      glm/gtx/rotate_normalized_axis.hpp
  4. 1 0
      readme.md

+ 1 - 1
glm/gtc/quaternion.hpp

@@ -251,7 +251,7 @@ namespace glm
 	GLM_FUNC_DECL tquat<T, P> rotate(tquat<T, P> const & q, T const & angle, vec<3, T, P> const & axis);
 	GLM_FUNC_DECL tquat<T, P> rotate(tquat<T, P> const & q, T const & angle, vec<3, T, P> const & axis);
 
 
 	/// Returns euler angles, pitch as x, yaw as y, roll as z.
 	/// Returns euler angles, pitch as x, yaw as y, roll as z.
-	/// The result is expressed in radians if GLM_FORCE_RADIANS is defined or degrees otherwise.
+	/// The result is expressed in radians.
 	/// 
 	/// 
 	/// @see gtc_quaternion
 	/// @see gtc_quaternion
 	template<typename T, precision P>
 	template<typename T, precision P>

+ 1 - 1
glm/gtx/matrix_transform_2d.hpp

@@ -42,7 +42,7 @@ namespace glm
 	/// Builds a rotation 3 * 3 matrix created from an angle. 
 	/// Builds a rotation 3 * 3 matrix created from an angle. 
 	///
 	///
 	/// @param m Input matrix multiplied by this translation matrix.
 	/// @param m Input matrix multiplied by this translation matrix.
-	/// @param angle Rotation angle expressed in radians if GLM_FORCE_RADIANS is defined or degrees otherwise.
+	/// @param angle Rotation angle expressed in radians.
 	template<typename T, precision P> 
 	template<typename T, precision P> 
 	GLM_FUNC_QUALIFIER mat<3, 3, T, P> rotate(
 	GLM_FUNC_QUALIFIER mat<3, 3, T, P> rotate(
 		mat<3, 3, T, P> const& m,
 		mat<3, 3, T, P> const& m,

+ 2 - 2
glm/gtx/rotate_normalized_axis.hpp

@@ -35,7 +35,7 @@ namespace glm
 	/// Builds a rotation 4 * 4 matrix created from a normalized axis and an angle. 
 	/// Builds a rotation 4 * 4 matrix created from a normalized axis and an angle. 
 	/// 
 	/// 
 	/// @param m Input matrix multiplied by this rotation matrix.
 	/// @param m Input matrix multiplied by this rotation matrix.
-	/// @param angle Rotation angle expressed in radians if GLM_FORCE_RADIANS is define or degrees otherwise.
+	/// @param angle Rotation angle expressed in radians.
 	/// @param axis Rotation axis, must be normalized.
 	/// @param axis Rotation axis, must be normalized.
 	/// @tparam T Value type used to build the matrix. Currently supported: half (not recommanded), float or double.
 	/// @tparam T Value type used to build the matrix. Currently supported: half (not recommanded), float or double.
 	/// 
 	/// 
@@ -52,7 +52,7 @@ namespace glm
 	/// Rotates a quaternion from a vector of 3 components normalized axis and an angle.
 	/// Rotates a quaternion from a vector of 3 components normalized axis and an angle.
 	/// 
 	/// 
 	/// @param q Source orientation
 	/// @param q Source orientation
-	/// @param angle Angle expressed in radians if GLM_FORCE_RADIANS is define or degrees otherwise.
+	/// @param angle Angle expressed in radians.
 	/// @param axis Normalized axis of the rotation, must be normalized.
 	/// @param axis Normalized axis of the rotation, must be normalized.
 	/// 
 	/// 
 	/// @see gtx_rotate_normalized_axis
 	/// @see gtx_rotate_normalized_axis

+ 1 - 0
readme.md

@@ -78,6 +78,7 @@ glm::mat4 camera(float Translate, glm::vec2 const & Rotate)
 - Fixed intersectRayTriangle #6
 - Fixed intersectRayTriangle #6
 - Fixed dual quaternion != operator #629
 - Fixed dual quaternion != operator #629
 - Fixed usused variable warning in GTX_spline #618
 - Fixed usused variable warning in GTX_spline #618
+- Fixed references to GLM_FORCE_RADIANS which was removed #642
 
 
 #### Deprecation:
 #### Deprecation:
 - Requires Visual Studio 2013, GCC 4.7, Clang 3.4, Cuda 7, ICC 2013 or a C++11 compiler
 - Requires Visual Studio 2013, GCC 4.7, Clang 3.4, Cuda 7, ICC 2013 or a C++11 compiler