Pārlūkot izejas kodu

Removed scalar functions

Christophe Riccio 12 gadi atpakaļ
vecāks
revīzija
a319cff426
2 mainītis faili ar 0 papildinājumiem un 100 dzēšanām
  1. 0 47
      glm/gtx/transform.hpp
  2. 0 53
      glm/gtx/transform.inl

+ 0 - 47
glm/gtx/transform.hpp

@@ -54,21 +54,6 @@ namespace glm
 	/// @addtogroup gtx_transform
 	/// @{
 
-	/// Builds a translation 4 * 4 matrix created from 3 scalars.
-	/// - From \link gtx_transform GLM_GTX_transform \endlink extension
-	/// - See also: \link glm::translate GLM_GTC_matrix_transform \endlink
-	template <typename T>
-	detail::tmat4x4<T, defaultp> translate(
-		T x, T y, T z);
-		
-	/// Transforms a matrix with a translation 4 * 4 matrix created from 3 scalars. 
-	/// - From \link gtx_transform GLM_GTX_transform \endlink extension
-	/// - See also: \link glm::translate GLM_GTC_matrix_transform \endlink
-	template <typename T>
-	detail::tmat4x4<T, defaultp> translate(
-		detail::tmat4x4<T, defaultp> const & m,
-		T x, T y, T z);
-		
 	/// Transforms a matrix with a translation 4 * 4 matrix created from 3 scalars. 
 	/// - From \link gtx_transform GLM_GTX_transform \endlink extension
 	/// - See also: \link glm::translate GLM_GTC_matrix_transform \endlink
@@ -76,14 +61,6 @@ namespace glm
 	detail::tmat4x4<T, P> translate(
 		detail::tvec3<T, P> const & v);
 
-	/// Builds a rotation 4 * 4 matrix created from an axis of 3 scalars and an angle expressed in degrees. 
-	/// - From \link gtx_transform GLM_GTX_transform \endlink extension
-	/// - See also: \link glm::rotate GLM_GTC_matrix_transform \endlink
-	template <typename T>
-	detail::tmat4x4<T, defaultp> rotate(
-		T angle, 
-		T x, T y, T z);
-
 	/// Builds a rotation 4 * 4 matrix created from an axis of 3 scalars and an angle expressed in degrees. 
 	/// - From \link gtx_transform GLM_GTX_transform \endlink extension
 	/// - See also: \link glm::rotate GLM_GTC_matrix_transform \endlink
@@ -92,30 +69,6 @@ namespace glm
 		T angle, 
 		detail::tvec3<T, P> const & v);
 
-	/// Transforms a matrix with a rotation 4 * 4 matrix created from an axis of 3 scalars and an angle expressed in degrees. 
-	/// - From \link gtx_transform GLM_GTX_transform \endlink extension
-	/// - See also: \link glm::rotate GLM_GTC_matrix_transform \endlink
-	template <typename T, precision P>
-	detail::tmat4x4<T, P> rotate(
-		detail::tmat4x4<T, P> const & m,
-		T angle,
-		T x, T y, T z);
-		
-	/// Builds a scale 4 * 4 matrix created from 3 scalars. 
-	/// - From \link gtx_transform GLM_GTX_transform \endlink extension
-	/// - See also: \link glm::scale GLM_GTC_matrix_transform \endlink
-	template <typename T>
-	detail::tmat4x4<T, defaultp> scale(
-		T x, T y, T z);
-		
-	/// Transforms a matrix with a scale 4 * 4 matrix created from 3 scalars.
-	/// - From \link gtx_transform GLM_GTX_transform \endlink extension
-	/// - See also: \link glm::scale GLM_GTC_matrix_transform \endlink
-	template <typename T, precision P>
-	detail::tmat4x4<T, P> scale(
-		detail::tmat4x4<T, P> const & m,
-		T x, T y, T z);
-
 	/// Transforms a matrix with a scale 4 * 4 matrix created from a vector of 3 components.
 	/// - From \link gtx_transform GLM_GTX_transform \endlink extension
 	/// - See also: \link glm::scale GLM_GTC_matrix_transform \endlink

+ 0 - 53
glm/gtx/transform.inl

@@ -9,24 +9,6 @@
 
 namespace glm
 {
-	template <typename T>
-	GLM_FUNC_QUALIFIER detail::tmat4x4<T, defaultp> translate(
-		T x, T y, T z)
-	{
-		return translate(
-			detail::tmat4x4<T, defaultp>(1.0f),
-			detail::tvec3<T, defaultp>(x, y , z));
-	}
-
-	template <typename T, precision P>
-	GLM_FUNC_QUALIFIER detail::tmat4x4<T, P> translate(
-		detail::tmat4x4<T, P> const & m,
-		T x, T y, T z)
-	{
-		return translate(
-			m, detail::tvec3<T, P>(x, y , z));
-	}
-
 	template <typename T, precision P>
 	GLM_FUNC_QUALIFIER detail::tmat4x4<T, P> translate(
 		detail::tvec3<T, P> const & v)
@@ -35,15 +17,6 @@ namespace glm
 			detail::tmat4x4<T, P>(1.0f), v);
 	}
 
-	template <typename T>
-	GLM_FUNC_QUALIFIER detail::tmat4x4<T, defaultp> rotate(
-		T angle,
-		T x, T y, T z)
-	{
-		return rotate(
-			detail::tmat4x4<T, defaultp>(1), angle, detail::tvec3<T, defaultp>(x, y, z));
-	}
-
 	template <typename T, precision P>
 	GLM_FUNC_QUALIFIER detail::tmat4x4<T, P> rotate(
 		T angle, 
@@ -53,32 +26,6 @@ namespace glm
 			detail::tmat4x4<T, P>(1), angle, v);
 	}
 
-	template <typename T, precision P>
-	GLM_FUNC_QUALIFIER detail::tmat4x4<T, P> rotate(
-		detail::tmat4x4<T, P> const & m,
-		T angle, 
-		T x, T y, T z)
-	{
-		return rotate(
-			m, angle, detail::tvec3<T, P>(x, y, z));
-	}
-
-	template <typename T>
-	GLM_FUNC_QUALIFIER detail::tmat4x4<T, defaultp> scale(T x, T y, T z)
-	{
-		return scale(
-			detail::tmat4x4<T, defaultp>(1), detail::tvec3<T, defaultp>(x, y, z));
-	}
-
-	template <typename T, precision P>
-	GLM_FUNC_QUALIFIER detail::tmat4x4<T, P> scale(
-		detail::tmat4x4<T, P> const & m,
-		T x, T y, T z)
-	{
-		return scale(
-			m, detail::tvec3<T, P>(x, y, z));
-	}
-
 	template <typename T, precision P>
 	GLM_FUNC_QUALIFIER detail::tmat4x4<T, P> scale(
 		detail::tvec3<T, P> const & v)