Fixed more typos
This commit is contained in:
parent
f8473154eb
commit
f73b0c5b80
@ -12,12 +12,11 @@
|
|||||||
|
|
||||||
#include "_fixes.hpp"
|
#include "_fixes.hpp"
|
||||||
|
|
||||||
namespace glm
|
namespace glm{
|
||||||
|
namespace core{
|
||||||
|
namespace function{
|
||||||
|
namespace common //!< Define common functions from Section 8.3 of GLSL 1.30.8 specification. Included in glm namespace.
|
||||||
{
|
{
|
||||||
namespace core{
|
|
||||||
namespace function{
|
|
||||||
namespace common{ //!< Define common functions from Section 8.3 of GLSL 1.30.8 specification. Included in glm namespace.
|
|
||||||
|
|
||||||
/// \addtogroup core_funcs
|
/// \addtogroup core_funcs
|
||||||
///@{
|
///@{
|
||||||
|
|
||||||
@ -325,10 +324,9 @@ namespace glm
|
|||||||
genType ldexp(genType const & x, genIType const & exp);
|
genType ldexp(genType const & x, genIType const & exp);
|
||||||
|
|
||||||
///@}
|
///@}
|
||||||
}//namespace common
|
}//namespace common
|
||||||
}//namespace function
|
}//namespace function
|
||||||
}//namespace core
|
}//namespace core
|
||||||
|
|
||||||
using namespace core::function::common;
|
using namespace core::function::common;
|
||||||
}//namespace glm
|
}//namespace glm
|
||||||
|
|
||||||
|
@ -10,13 +10,11 @@
|
|||||||
#ifndef glm_core_func_exponential
|
#ifndef glm_core_func_exponential
|
||||||
#define glm_core_func_exponential
|
#define glm_core_func_exponential
|
||||||
|
|
||||||
namespace glm
|
namespace glm{
|
||||||
|
namespace core{
|
||||||
|
namespace function{
|
||||||
|
namespace exponential //!< Define all exponential functions from Section 8.2 of GLSL 1.30.8 specification. Included in glm namespace.
|
||||||
{
|
{
|
||||||
namespace core{
|
|
||||||
namespace function{
|
|
||||||
//! Define all exponential functions from Section 8.2 of GLSL 1.30.8 specification. Included in glm namespace.
|
|
||||||
namespace exponential{
|
|
||||||
|
|
||||||
/// \addtogroup core_funcs
|
/// \addtogroup core_funcs
|
||||||
///@{
|
///@{
|
||||||
|
|
||||||
@ -73,11 +71,9 @@ namespace glm
|
|||||||
genType inversesqrt(genType const & x);
|
genType inversesqrt(genType const & x);
|
||||||
|
|
||||||
///@}
|
///@}
|
||||||
|
}//namespace exponential
|
||||||
}//namespace exponential
|
}//namespace function
|
||||||
}//namespace function
|
}//namespace core
|
||||||
}//namespace core
|
|
||||||
|
|
||||||
using namespace core::function::exponential;
|
using namespace core::function::exponential;
|
||||||
}//namespace glm
|
}//namespace glm
|
||||||
|
|
||||||
|
@ -10,14 +10,13 @@
|
|||||||
#ifndef glm_core_func_geometric
|
#ifndef glm_core_func_geometric
|
||||||
#define glm_core_func_geometric
|
#define glm_core_func_geometric
|
||||||
|
|
||||||
namespace glm
|
namespace glm{
|
||||||
|
namespace core{
|
||||||
|
namespace function{
|
||||||
|
namespace geometric //!< Define all geometric functions from Section 8.4 of GLSL 1.30.8 specification. Included in glm namespace.
|
||||||
{
|
{
|
||||||
namespace core{
|
|
||||||
namespace function{
|
|
||||||
namespace geometric{ //!< Define all geometric functions from Section 8.4 of GLSL 1.30.8 specification. Included in glm namespace.
|
|
||||||
|
|
||||||
/// \addtogroup core_funcs
|
/// \addtogroup core_funcs
|
||||||
///@{
|
/// @{
|
||||||
|
|
||||||
//! Returns the length of x, i.e., sqrt(x * x).
|
//! Returns the length of x, i.e., sqrt(x * x).
|
||||||
//!
|
//!
|
||||||
@ -94,12 +93,10 @@ namespace glm
|
|||||||
genType const & N,
|
genType const & N,
|
||||||
typename genType::value_type const & eta);
|
typename genType::value_type const & eta);
|
||||||
|
|
||||||
///@}
|
/// @}
|
||||||
|
}//namespace geometric
|
||||||
}//namespace geometric
|
}//namespace function
|
||||||
}//namespace function
|
}//namespace core
|
||||||
}//namespace core
|
|
||||||
|
|
||||||
using namespace core::function::geometric;
|
using namespace core::function::geometric;
|
||||||
}//namespace glm
|
}//namespace glm
|
||||||
|
|
||||||
|
@ -10,15 +10,13 @@
|
|||||||
#ifndef glm_core_func_integer
|
#ifndef glm_core_func_integer
|
||||||
#define glm_core_func_integer
|
#define glm_core_func_integer
|
||||||
|
|
||||||
namespace glm
|
namespace glm{
|
||||||
|
namespace core{
|
||||||
|
namespace function{
|
||||||
|
namespace integer //!< Define integer functions from Section 8.8 of GLSL 4.00.8 specification.
|
||||||
{
|
{
|
||||||
namespace core{
|
|
||||||
namespace function{
|
|
||||||
//! Define integer functions from Section 8.8 of GLSL 4.00.8 specification.
|
|
||||||
namespace integer{
|
|
||||||
|
|
||||||
/// \addtogroup core_funcs
|
/// \addtogroup core_funcs
|
||||||
///@{
|
/// @{
|
||||||
|
|
||||||
//! Adds 32-bit unsigned integer x and y, returning the sum
|
//! Adds 32-bit unsigned integer x and y, returning the sum
|
||||||
//! modulo pow(2, 32). The value carry is set to 0 if the sum was
|
//! modulo pow(2, 32). The value carry is set to 0 if the sum was
|
||||||
@ -143,12 +141,10 @@ namespace glm
|
|||||||
template <typename T, template <typename> class C>
|
template <typename T, template <typename> class C>
|
||||||
typename C<T>::signed_type findMSB(C<T> const & Value);
|
typename C<T>::signed_type findMSB(C<T> const & Value);
|
||||||
|
|
||||||
///@}
|
/// @}
|
||||||
|
}//namespace integer
|
||||||
}//namespace integer
|
}//namespace function
|
||||||
}//namespace function
|
}//namespace core
|
||||||
}//namespace core
|
|
||||||
|
|
||||||
using namespace core::function::integer;
|
using namespace core::function::integer;
|
||||||
}//namespace glm
|
}//namespace glm
|
||||||
|
|
||||||
|
@ -10,15 +10,13 @@
|
|||||||
#ifndef glm_core_func_matrix
|
#ifndef glm_core_func_matrix
|
||||||
#define glm_core_func_matrix
|
#define glm_core_func_matrix
|
||||||
|
|
||||||
namespace glm
|
namespace glm{
|
||||||
|
namespace core{
|
||||||
|
namespace function{
|
||||||
|
namespace matrix //!< Define all matrix functions from Section 8.5 of GLSL 1.30.8 specification. Included in glm namespace.
|
||||||
{
|
{
|
||||||
namespace core{
|
|
||||||
namespace function{
|
|
||||||
//! Define all matrix functions from Section 8.5 of GLSL 1.30.8 specification. Included in glm namespace.
|
|
||||||
namespace matrix{
|
|
||||||
|
|
||||||
/// \addtogroup core_funcs
|
/// \addtogroup core_funcs
|
||||||
///@{
|
/// @{
|
||||||
|
|
||||||
//! Multiply matrix x by matrix y component-wise, i.e.,
|
//! Multiply matrix x by matrix y component-wise, i.e.,
|
||||||
//! result[i][j] is the scalar product of x[i][j] and y[i][j].
|
//! result[i][j] is the scalar product of x[i][j] and y[i][j].
|
||||||
@ -97,12 +95,10 @@ namespace glm
|
|||||||
detail::tmat4x4<T> inverse(
|
detail::tmat4x4<T> inverse(
|
||||||
detail::tmat4x4<T> const & m);
|
detail::tmat4x4<T> const & m);
|
||||||
|
|
||||||
///@}
|
/// @}
|
||||||
|
}//namespace matrix
|
||||||
}//namespace matrix
|
}//namespace function
|
||||||
}//namespace function
|
}//namespace core
|
||||||
}//namespace core
|
|
||||||
|
|
||||||
using namespace core::function::matrix;
|
using namespace core::function::matrix;
|
||||||
}//namespace glm
|
}//namespace glm
|
||||||
|
|
||||||
|
@ -10,15 +10,13 @@
|
|||||||
#ifndef glm_core_func_noise
|
#ifndef glm_core_func_noise
|
||||||
#define glm_core_func_noise
|
#define glm_core_func_noise
|
||||||
|
|
||||||
namespace glm
|
namespace glm{
|
||||||
|
namespace core{
|
||||||
|
namespace function{
|
||||||
|
namespace noise //< Define all noise functions from Section 8.9 of GLSL 1.30.8 specification. Included in glm namespace.
|
||||||
{
|
{
|
||||||
namespace core{
|
|
||||||
namespace function{
|
|
||||||
// Define all noise functions from Section 8.9 of GLSL 1.30.8 specification. Included in glm namespace.
|
|
||||||
namespace noise{
|
|
||||||
|
|
||||||
/// \addtogroup core_funcs
|
/// \addtogroup core_funcs
|
||||||
///@{
|
/// @{
|
||||||
|
|
||||||
//! Returns a 1D noise value based on the input value x.
|
//! Returns a 1D noise value based on the input value x.
|
||||||
//!
|
//!
|
||||||
@ -48,12 +46,10 @@ namespace glm
|
|||||||
template <typename genType>
|
template <typename genType>
|
||||||
detail::tvec4<typename genType::value_type> noise4(genType const & x);
|
detail::tvec4<typename genType::value_type> noise4(genType const & x);
|
||||||
|
|
||||||
///@}
|
/// @}
|
||||||
|
}//namespace noise
|
||||||
}//namespace noise
|
}//namespace function
|
||||||
}//namespace function
|
}//namespace core
|
||||||
}//namespace core
|
|
||||||
|
|
||||||
using namespace core::function::noise;
|
using namespace core::function::noise;
|
||||||
}//namespace glm
|
}//namespace glm
|
||||||
|
|
||||||
|
@ -10,13 +10,11 @@
|
|||||||
#ifndef glm_core_func_packing
|
#ifndef glm_core_func_packing
|
||||||
#define glm_core_func_packing
|
#define glm_core_func_packing
|
||||||
|
|
||||||
namespace glm
|
namespace glm{
|
||||||
|
namespace core{
|
||||||
|
namespace function{
|
||||||
|
namespace packing //!< Define packing functions from section 8.4 floating-point pack and unpack functions of GLSL 4.00.8 specification
|
||||||
{
|
{
|
||||||
namespace core{
|
|
||||||
namespace function{
|
|
||||||
//! Define packing functions from section 8.4 floating-point pack and unpack functions of GLSL 4.00.8 specification
|
|
||||||
namespace packing
|
|
||||||
{
|
|
||||||
/// \addtogroup core_funcs
|
/// \addtogroup core_funcs
|
||||||
///@{
|
///@{
|
||||||
|
|
||||||
@ -118,11 +116,9 @@ namespace glm
|
|||||||
detail::tvec2<detail::uint32> unpackDouble2x32(double const & v);
|
detail::tvec2<detail::uint32> unpackDouble2x32(double const & v);
|
||||||
|
|
||||||
///@}
|
///@}
|
||||||
|
}//namespace packing
|
||||||
}//namespace packing
|
}//namespace function
|
||||||
}//namespace function
|
}//namespace core
|
||||||
}//namespace core
|
|
||||||
|
|
||||||
using namespace core::function::packing;
|
using namespace core::function::packing;
|
||||||
}//namespace glm
|
}//namespace glm
|
||||||
|
|
||||||
|
@ -10,17 +10,16 @@
|
|||||||
#ifndef glm_core_func_trigonometric
|
#ifndef glm_core_func_trigonometric
|
||||||
#define glm_core_func_trigonometric
|
#define glm_core_func_trigonometric
|
||||||
|
|
||||||
namespace glm
|
namespace glm{
|
||||||
|
namespace core{
|
||||||
|
namespace function{
|
||||||
|
//! Define Angle and trigonometry functions
|
||||||
|
//! from Section 8.1 of GLSL 1.30.8 specification.
|
||||||
|
//! Included in glm namespace.
|
||||||
|
namespace trigonometric
|
||||||
{
|
{
|
||||||
namespace core{
|
|
||||||
namespace function{
|
|
||||||
//! Define Angle and trigonometry functions
|
|
||||||
//! from Section 8.1 of GLSL 1.30.8 specification.
|
|
||||||
//! Included in glm namespace.
|
|
||||||
namespace trigonometric{
|
|
||||||
|
|
||||||
/// \addtogroup core_funcs
|
/// \addtogroup core_funcs
|
||||||
///@{
|
/// @{
|
||||||
|
|
||||||
//! Converts degrees to radians and returns the result.
|
//! Converts degrees to radians and returns the result.
|
||||||
//!
|
//!
|
||||||
@ -140,12 +139,10 @@ namespace glm
|
|||||||
template <typename genType>
|
template <typename genType>
|
||||||
genType atanh(genType const & x);
|
genType atanh(genType const & x);
|
||||||
|
|
||||||
///@}
|
/// @}
|
||||||
|
}//namespace trigonometric
|
||||||
}//namespace trigonometric
|
}//namespace function
|
||||||
}//namespace function
|
}//namespace core
|
||||||
}//namespace core
|
|
||||||
|
|
||||||
using namespace core::function::trigonometric;
|
using namespace core::function::trigonometric;
|
||||||
}//namespace glm
|
}//namespace glm
|
||||||
|
|
||||||
|
@ -12,16 +12,15 @@
|
|||||||
|
|
||||||
#include "_detail.hpp"
|
#include "_detail.hpp"
|
||||||
|
|
||||||
namespace glm
|
namespace glm{
|
||||||
|
namespace core{
|
||||||
|
namespace function{
|
||||||
|
//! Define vector relational functions from Section 8.6 of GLSL 1.30.8 specification.
|
||||||
|
//! Included in glm namespace.
|
||||||
|
namespace vector_relational
|
||||||
{
|
{
|
||||||
namespace core{
|
|
||||||
namespace function{
|
|
||||||
//! Define vector relational functions from Section 8.6 of GLSL 1.30.8 specification.
|
|
||||||
//! Included in glm namespace.
|
|
||||||
namespace vector_relational
|
|
||||||
{
|
|
||||||
/// \addtogroup core_funcs
|
/// \addtogroup core_funcs
|
||||||
///@{
|
/// @{
|
||||||
|
|
||||||
//! Returns the component-wise comparison result of x < y.
|
//! Returns the component-wise comparison result of x < y.
|
||||||
//!
|
//!
|
||||||
@ -201,12 +200,10 @@ namespace glm
|
|||||||
return Result;
|
return Result;
|
||||||
}
|
}
|
||||||
|
|
||||||
///@}
|
/// @}
|
||||||
|
}//namespace vector_relational
|
||||||
}//namespace vector_relational
|
}//namespace function
|
||||||
}//namespace function
|
}//namespace core
|
||||||
}//namespace core
|
|
||||||
|
|
||||||
using namespace core::function::vector_relational;
|
using namespace core::function::vector_relational;
|
||||||
}//namespace glm
|
}//namespace glm
|
||||||
|
|
||||||
|
@ -325,7 +325,7 @@ namespace gtc{
|
|||||||
namespace half_float ///< GLM_GTC_half_float extension: Add support for half precision floating-point types
|
namespace half_float ///< GLM_GTC_half_float extension: Add support for half precision floating-point types
|
||||||
{
|
{
|
||||||
/// \addtogroup gtc_half_float
|
/// \addtogroup gtc_half_float
|
||||||
///@{
|
/// @{
|
||||||
|
|
||||||
/// Type for half-precision floating-point numbers.
|
/// Type for half-precision floating-point numbers.
|
||||||
/// From GLM_GTC_half_float extension.
|
/// From GLM_GTC_half_float extension.
|
||||||
|
@ -25,7 +25,7 @@ namespace gtc{
|
|||||||
namespace matrix_integer ///< GLM_GTC_matrix_integer extension: Add integer matrices
|
namespace matrix_integer ///< GLM_GTC_matrix_integer extension: Add integer matrices
|
||||||
{
|
{
|
||||||
/// \addtogroup gtc_matrix_integer
|
/// \addtogroup gtc_matrix_integer
|
||||||
///@{
|
/// @{
|
||||||
|
|
||||||
typedef detail::tmat2x2<highp_int> highp_imat2; //!< \brief High-precision signed integer 2x2 matrix. (from GLM_GTC_matrix_integer extension)
|
typedef detail::tmat2x2<highp_int> highp_imat2; //!< \brief High-precision signed integer 2x2 matrix. (from GLM_GTC_matrix_integer extension)
|
||||||
typedef detail::tmat3x3<highp_int> highp_imat3; //!< \brief High-precision signed integer 3x3 matrix. (from GLM_GTC_matrix_integer extension)
|
typedef detail::tmat3x3<highp_int> highp_imat3; //!< \brief High-precision signed integer 3x3 matrix. (from GLM_GTC_matrix_integer extension)
|
||||||
|
@ -35,7 +35,6 @@ namespace detail
|
|||||||
template <typename T>
|
template <typename T>
|
||||||
struct tquat// : public genType<T, tquat>
|
struct tquat// : public genType<T, tquat>
|
||||||
{
|
{
|
||||||
|
|
||||||
enum ctor{null};
|
enum ctor{null};
|
||||||
|
|
||||||
typedef T value_type;
|
typedef T value_type;
|
||||||
|
@ -25,7 +25,6 @@ namespace glm{
|
|||||||
namespace gtc{
|
namespace gtc{
|
||||||
namespace type_ptr ///< GLM_GTC_type_ptr extension: Get access to vectors & matrices value type address.
|
namespace type_ptr ///< GLM_GTC_type_ptr extension: Get access to vectors & matrices value type address.
|
||||||
{
|
{
|
||||||
|
|
||||||
/// \addtogroup gtc_type_ptr
|
/// \addtogroup gtc_type_ptr
|
||||||
///@{
|
///@{
|
||||||
|
|
||||||
|
@ -26,7 +26,7 @@ namespace gtx{
|
|||||||
namespace associated_min_max ///< GLM_GTX_associated_min_max extension: Min and max functions that return associated values not the compared onces.
|
namespace associated_min_max ///< GLM_GTX_associated_min_max extension: Min and max functions that return associated values not the compared onces.
|
||||||
{
|
{
|
||||||
/// \addtogroup gtx_associated_min_max
|
/// \addtogroup gtx_associated_min_max
|
||||||
///@{
|
/// @{
|
||||||
|
|
||||||
//! \brief Min comparison between 2 variables
|
//! \brief Min comparison between 2 variables
|
||||||
template<typename genTypeT, typename genTypeU>
|
template<typename genTypeT, typename genTypeU>
|
||||||
@ -70,7 +70,7 @@ namespace associated_min_max ///< GLM_GTX_associated_min_max extension: Min and
|
|||||||
const genTypeT& z, const genTypeU& c,
|
const genTypeT& z, const genTypeU& c,
|
||||||
const genTypeT& w, const genTypeU& d);
|
const genTypeT& w, const genTypeU& d);
|
||||||
|
|
||||||
///@}
|
/// @}
|
||||||
} //namespace associated_min_max
|
} //namespace associated_min_max
|
||||||
} //namespace gtx
|
} //namespace gtx
|
||||||
} //namespace glm
|
} //namespace glm
|
||||||
|
@ -29,7 +29,7 @@ namespace bit ///< GLM_GTX_bit extension: Allow to perform bit operations on int
|
|||||||
using namespace gtc::half_float;
|
using namespace gtc::half_float;
|
||||||
|
|
||||||
/// \addtogroup gtx_bit
|
/// \addtogroup gtx_bit
|
||||||
///@{
|
/// @{
|
||||||
|
|
||||||
//! Build a mask of 'count' bits
|
//! Build a mask of 'count' bits
|
||||||
//! From GLM_GTX_bit extension.
|
//! From GLM_GTX_bit extension.
|
||||||
|
@ -29,7 +29,7 @@ namespace color_cast ///< GLM_GTX_color_cast extension: Conversion between two c
|
|||||||
using namespace gtx::number_precision;
|
using namespace gtx::number_precision;
|
||||||
|
|
||||||
/// \addtogroup gtx_color_cast
|
/// \addtogroup gtx_color_cast
|
||||||
///@{
|
/// @{
|
||||||
|
|
||||||
//! Conversion of a floating value into a 8bit unsigned int value.
|
//! Conversion of a floating value into a 8bit unsigned int value.
|
||||||
//! From GLM_GTX_color_cast extension.
|
//! From GLM_GTX_color_cast extension.
|
||||||
@ -95,7 +95,7 @@ namespace color_cast ///< GLM_GTX_color_cast extension: Conversion between two c
|
|||||||
template <typename T> gtc::type_precision::f64vec4 f64_bgra_cast(T c); //!< \brief Conversion of a u32 or u64 color into 4 components floating color. (From GLM_GTX_color_cast extension)
|
template <typename T> gtc::type_precision::f64vec4 f64_bgra_cast(T c); //!< \brief Conversion of a u32 or u64 color into 4 components floating color. (From GLM_GTX_color_cast extension)
|
||||||
template <typename T> gtc::type_precision::f64vec4 f64_abgr_cast(T c); //!< \brief Conversion of a u32 or u64 color into 4 components floating color. (From GLM_GTX_color_cast extension)
|
template <typename T> gtc::type_precision::f64vec4 f64_abgr_cast(T c); //!< \brief Conversion of a u32 or u64 color into 4 components floating color. (From GLM_GTX_color_cast extension)
|
||||||
|
|
||||||
///@}
|
/// @}
|
||||||
}//namespace color_space
|
}//namespace color_space
|
||||||
}//namespace gtx
|
}//namespace gtx
|
||||||
}//namespace glm
|
}//namespace glm
|
||||||
|
@ -25,7 +25,7 @@ namespace gtx{
|
|||||||
namespace color_space_YCoCg ///< GLM_GTX_color_space_YCoCg extension: RGB to YCoCg conversions and operations
|
namespace color_space_YCoCg ///< GLM_GTX_color_space_YCoCg extension: RGB to YCoCg conversions and operations
|
||||||
{
|
{
|
||||||
/// \addtogroup gtx_color_space_YCoCg
|
/// \addtogroup gtx_color_space_YCoCg
|
||||||
///@{
|
/// @{
|
||||||
|
|
||||||
//! Convert a color from RGB color space to YCoCg color space.
|
//! Convert a color from RGB color space to YCoCg color space.
|
||||||
//! From GLM_GTX_color_space_YCoCg extension.
|
//! From GLM_GTX_color_space_YCoCg extension.
|
||||||
|
Loading…
x
Reference in New Issue
Block a user