Mirrors/eepp
1
0
Fork 0
mirror of https://github.com/SpartanJ/eepp.git synced 2026-10-27 16:38:20 +03:00
Code Issues Packages Projects Releases Wiki Activity

Clean up format errors.

Browse Source
This commit is contained in:
Martín Lucas Golini
2024-05-11 14:12:38 -03:00
parent 1760c7da07
commit 44b1656ca1
5 changed files with 237 additions and 239 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitignore
+2 -1
View File
@@ -65,4 +65,5 @@ ecode.dmg
/.ecode/.prjallowed
/.cache/
/compile_commands.json
/bin/unit_tests/eepp-*
/bin/unit_tests/eepp*
/bin/unit_tests/lib*
src/tests/unit_tests/textformat.cpp
-3
View File
@@ -68,9 +68,6 @@ UTEST( TextFormat, autodetectProject ) {
{ "InfoPlist.strings", TextFormat::Encoding::UTF16BE },
{ "version.rc", TextFormat::Encoding::Latin1 },
{ "SDL_RLEaccel.c", TextFormat::Encoding::Latin1 },
{ "func_common.hpp", TextFormat::Encoding::Latin1 },
{ "func_common.inl", TextFormat::Encoding::Latin1 },
{ "type_half.inl", TextFormat::Encoding::Latin1 },
};
auto found = KNOWN_ENCS.find( filename );
if ( found != KNOWN_ENCS.end() )
src/thirdparty/glm/core/func_common.hpp
Vendored
+116 -116
View File
@@ -8,10 +8,10 @@
/// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
/// copies of the Software, and to permit persons to whom the Software is
/// furnished to do so, subject to the following conditions:
///
///
/// The above copyright notice and this permission notice shall be included in
/// all copies or substantial portions of the Software.
///
///
/// 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
@@ -24,12 +24,12 @@
/// @file glm/core/func_common.hpp
/// @date 2008-03-08 / 2010-01-26
/// @author Christophe Riccio
///
///
/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.3 Common Functions</a>
///
/// @defgroup core_func_common Common functions
/// @ingroup core
///
///
/// These all operate component-wise. The description is per component.
///////////////////////////////////////////////////////////////////////////////////
@@ -44,181 +44,181 @@ namespace glm
/// @{
/// Returns x if x >= 0; otherwise, it returns -x.
///
///
/// @tparam genType floating-point or signed integer; scalar or vector types.
///
///
/// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/abs.xml">GLSL abs man page</a>
/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.3 Common Functions</a>
template <typename genType>
template <typename genType>
genType abs(genType const & x);
/// Returns 1.0 if x > 0, 0.0 if x == 0, or -1.0 if x < 0.
///
/// Returns 1.0 if x > 0, 0.0 if x == 0, or -1.0 if x < 0.
///
/// @tparam genType Floating-point or signed integer; scalar or vector types.
///
///
/// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/sign.xml">GLSL sign man page</a>
/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.3 Common Functions</a>
template <typename genType>
template <typename genType>
genType sign(genType const & x);
/// Returns a value equal to the nearest integer that is less then or equal to x.
///
/// Returns a value equal to the nearest integer that is less then or equal to x.
///
/// @tparam genType Floating-point scalar or vector types.
///
///
/// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/floor.xml">GLSL floor man page</a>
/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.3 Common Functions</a>
template <typename genType>
template <typename genType>
genType floor(genType const & x);
/// Returns a value equal to the nearest integer to x
/// whose absolute value is not larger than the absolute value of x.
///
/// Returns a value equal to the nearest integer to x
/// whose absolute value is not larger than the absolute value of x.
///
/// @tparam genType Floating-point scalar or vector types.
///
///
/// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/trunc.xml">GLSL trunc man page</a>
/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.3 Common Functions</a>
template <typename genType>
template <typename genType>
genType trunc(genType const & x);
/// Returns a value equal to the nearest integer to x.
/// The fraction 0.5 will round in a direction chosen by the
/// implementation, presumably the direction that is fastest.
/// This includes the possibility that round(x) returns the
/// same value as roundEven(x) for all values of x.
///
/// Returns a value equal to the nearest integer to x.
/// The fraction 0.5 will round in a direction chosen by the
/// implementation, presumably the direction that is fastest.
/// This includes the possibility that round(x) returns the
/// same value as roundEven(x) for all values of x.
///
/// @tparam genType Floating-point scalar or vector types.
///
///
/// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/round.xml">GLSL round man page</a>
/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.3 Common Functions</a>
template <typename genType>
template <typename genType>
genType round(genType const & x);
/// Returns a value equal to the nearest integer to x.
/// A fractional part of 0.5 will round toward the nearest even
/// integer. (Both 3.5 and 4.5 for x will return 4.0.)
/// integer. (Both 3.5 and 4.5 for x will return 4.0.)
///
/// @tparam genType Floating-point scalar or vector types.
///
///
/// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/roundEven.xml">GLSL roundEven man page</a>
/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.3 Common Functions</a>
/// @see <a href="http://developer.amd.com/documentation/articles/pages/New-Round-to-Even-Technique.aspx">New round to even technique</a>
template <typename genType>
template <typename genType>
genType roundEven(genType const & x);
/// Returns a value equal to the nearest integer
/// that is greater than or equal to x.
///
/// Returns a value equal to the nearest integer
/// that is greater than or equal to x.
///
/// @tparam genType Floating-point scalar or vector types.
///
/// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/ceil.xml">GLSL ceil man page</a>
/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.3 Common Functions</a>
template <typename genType>
template <typename genType>
genType ceil(genType const & x);
/// Return x - floor(x).
///
///
/// @tparam genType Floating-point scalar or vector types.
///
/// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/fract.xml">GLSL fract man page</a>
/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.3 Common Functions</a>
template <typename genType>
template <typename genType>
genType fract(genType const & x);
/// Modulus. Returns x - y * floor(x / y)
/// Modulus. Returns x - y * floor(x / y)
/// for each component in x using the floating point value y.
///
/// @tparam genType Floating-point scalar or vector types.
///
/// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/mod.xml">GLSL mod man page</a>
/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.3 Common Functions</a>
template <typename genType>
template <typename genType>
genType mod(
genType const & x,
genType const & x,
genType const & y);
/// Modulus. Returns x - y * floor(x / y)
/// Modulus. Returns x - y * floor(x / y)
/// for each component in x using the floating point value y.
///
///
/// @tparam genType Floating-point scalar or vector types.
///
///
/// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/mod.xml">GLSL mod man page</a>
/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.3 Common Functions</a>
template <typename genType>
template <typename genType>
genType mod(
genType const & x,
genType const & x,
typename genType::value_type const & y);
/// Returns the fractional part of x and sets i to the integer
/// part (as a whole number floating point value). Both the
/// return value and the output parameter will have the same
/// sign as x.
///
///
/// @tparam genType Floating-point scalar or vector types.
///
/// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/modf.xml">GLSL modf man page</a>
/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.3 Common Functions</a>
template <typename genType>
template <typename genType>
genType modf(
genType const & x,
genType const & x,
genType & i);
/// Returns y if y < x; otherwise, it returns x.
///
/// @tparam genType Floating-point or integer; scalar or vector types.
///
///
/// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/min.xml">GLSL min man page</a>
/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.3 Common Functions</a>
template <typename genType>
template <typename genType>
genType min(
genType const & x,
genType const & x,
genType const & y);
template <typename genType>
template <typename genType>
genType min(
genType const & x,
genType const & x,
typename genType::value_type const & y);
/// Returns y if x < y; otherwise, it returns x.
///
///
/// @tparam genType Floating-point or integer; scalar or vector types.
///
///
/// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/max.xml">GLSL max man page</a>
/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.3 Common Functions</a>
template <typename genType>
template <typename genType>
genType max(
genType const & x,
genType const & x,
genType const & y);
template <typename genType>
template <typename genType>
genType max(
genType const & x,
genType const & x,
typename genType::value_type const & y);
/// Returns min(max(x, minVal), maxVal) for each component in x
/// Returns min(max(x, minVal), maxVal) for each component in x
/// using the floating-point values minVal and maxVal.
///
/// @tparam genType Floating-point or integer; scalar or vector types.
///
/// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/clamp.xml">GLSL clamp man page</a>
/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.3 Common Functions</a>
template <typename genType>
template <typename genType>
genType clamp(
genType const & x,
genType const & minVal,
genType const & maxVal);
genType const & x,
genType const & minVal,
genType const & maxVal);
template <typename genType>
template <typename genType>
genType clamp(
genType const & x,
typename genType::value_type const & minVal,
typename genType::value_type const & maxVal);
genType const & x,
typename genType::value_type const & minVal,
typename genType::value_type const & maxVal);
//! @return If genTypeU is a floating scalar or vector:
//! Returns x * (1.0 - a) + y * a, i.e., the linear blend of
//! x and y using the floating-point value a.
//! @return If genTypeU is a floating scalar or vector:
//! Returns x * (1.0 - a) + y * a, i.e., the linear blend of
//! x and y using the floating-point value a.
//! The value for a is not restricted to the range [0, 1].
//!
//! @return If genTypeU is a boolean scalar or vector:
//!
//! @return If genTypeU is a boolean scalar or vector:
//! Selects which vector each returned component comes
//! from. For a component of a that is false, the
//! corresponding component of x is returned. For a
@@ -229,17 +229,17 @@ namespace glm
//! provides different functionality than
//! genType mix(genType x, genType y, genType(a))
//! where a is a Boolean vector.
///
///
/// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/mix.xml">GLSL mix man page</a>
/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.3 Common Functions</a>
///
///
/// @param[in] x Value to interpolate.
/// @param[in] y Value to interpolate.
/// @param[in] a Interpolant.
///
///
/// @tparam genTypeT Floating point scalar or vector.
/// @tparam genTypeU Floating point or boolean scalar or vector. It can't be a vector if it is the length of genTypeT.
///
///
/// @code
/// #include <glm/glm.hpp>
/// ...
@@ -250,26 +250,26 @@ namespace glm
/// glm::vec4 g;
/// glm::vec4 h;
/// ...
/// glm::vec4 r = glm::mix(g, h, a); // Interpolate with a floating-point scalar two vectors.
/// glm::vec4 r = glm::mix(g, h, a); // Interpolate with a floating-point scalar two vectors.
/// glm::vec4 s = glm::mix(g, h, b); // Teturns g or h;
/// glm::dvec3 t = glm::mix(e, f, a); // Types of the third parameter is not required to match with the first and the second.
/// glm::vec4 u = glm::mix(g, h, r); // Interpolations can be perform per component with a vector for the last parameter.
/// @endcode
template <typename genTypeT, typename genTypeU>
template <typename genTypeT, typename genTypeU>
genTypeT mix(genTypeT const & x, genTypeT const & y, genTypeU const & a);
//! Returns 0.0 if x < edge, otherwise it returns 1.0.
//!
//!
/// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/step.xml">GLSL step man page</a>
/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.3 Common Functions</a>
template <typename genType>
template <typename genType>
genType step(
genType const & edge,
genType const & edge,
genType const & x);
template <typename genType>
template <typename genType>
genType step(
typename genType::value_type const & edge,
typename genType::value_type const & edge,
genType const & x);
/// Returns 0.0 if x <= edge0 and 1.0 if x >= edge1 and
@@ -278,24 +278,24 @@ namespace glm
/// you would want a threshold function with a smooth
/// transition. This is equivalent to:
/// genType t;
/// t = clamp ((x – edge0) / (edge1 – edge0), 0, 1);
/// return t * t * (3 – 2 * t);
/// t = clamp ((x – edge0) / (edge1 – edge0), 0, 1);
/// return t * t * (3 – 2 * t);
/// Results are undefined if edge0 >= edge1.
///
/// @tparam genType Floating-point scalar or vector types.
///
///
/// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/smoothstep.xml">GLSL smoothstep man page</a>
/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.3 Common Functions</a>
template <typename genType>
template <typename genType>
genType smoothstep(
genType const & edge0,
genType const & edge1,
genType const & edge0,
genType const & edge1,
genType const & x);
template <typename genType>
template <typename genType>
genType smoothstep(
typename genType::value_type const & edge0,
typename genType::value_type const & edge1,
typename genType::value_type const & edge0,
typename genType::value_type const & edge1,
genType const & x);
/// Returns true if x holds a NaN (not a number)
@@ -303,14 +303,14 @@ namespace glm
/// floating point representations. Returns false otherwise,
/// including for implementations with no NaN
/// representations.
///
///
/// /!\ When using compiler fast math, this function may fail.
///
///
/// @tparam genType Floating-point scalar or vector types.
///
/// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/isnan.xml">GLSL isnan man page</a>
/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.3 Common Functions</a>
template <typename genType>
template <typename genType>
typename genType::bool_type isnan(genType const & x);
/// Returns true if x holds a positive infinity or negative
@@ -318,12 +318,12 @@ namespace glm
/// set of floating point representations. Returns false
/// otherwise, including for implementations with no infinity
/// representations.
///
///
/// @tparam genType Floating-point scalar or vector types.
///
///
/// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/isinf.xml">GLSL isinf man page</a>
/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.3 Common Functions</a>
template <typename genType>
template <typename genType>
typename genType::bool_type isinf(genType const & x);
/// Returns a signed integer value representing
@@ -332,7 +332,7 @@ namespace glm
///
/// @tparam genType Single-precision floating-point scalar or vector types.
/// @tparam genIType Signed integer scalar or vector types.
///
///
/// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/floatBitsToInt.xml">GLSL floatBitsToInt man page</a>
/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.3 Common Functions</a>
template <typename genType, typename genIType>
@@ -344,7 +344,7 @@ namespace glm
///
/// @tparam genType Single-precision floating-point scalar or vector types.
/// @tparam genUType Unsigned integer scalar or vector types.
///
///
/// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/floatBitsToUint.xml">GLSL floatBitsToUint man page</a>
/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.3 Common Functions</a>
template <typename genType, typename genUType>
@@ -355,13 +355,13 @@ namespace glm
/// If an inf or NaN is passed in, it will not signal, and the
/// resulting floating point value is unspecified. Otherwise,
/// the bit-level representation is preserved.
///
///
/// @tparam genType Single-precision floating-point scalar or vector types.
/// @tparam genIType Signed integer scalar or vector types.
///
///
/// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/intBitsToFloat.xml">GLSL intBitsToFloat man page</a>
/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.3 Common Functions</a>
///
///
/// @todo Clarify this declaration, we don't need to actually specify the return type
template <typename genType, typename genIType>
genType intBitsToFloat(genIType const & value);
@@ -371,21 +371,21 @@ namespace glm
/// If an inf or NaN is passed in, it will not signal, and the
/// resulting floating point value is unspecified. Otherwise,
/// the bit-level representation is preserved.
///
///
/// @tparam genType Single-precision floating-point scalar or vector types.
/// @tparam genUType Unsigned integer scalar or vector types.
///
///
/// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/uintBitsToFloat.xml">GLSL uintBitsToFloat man page</a>
/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.3 Common Functions</a>
///
///
/// @todo Clarify this declaration, we don't need to actually specify the return type
template <typename genType, typename genUType>
genType uintBitsToFloat(genUType const & value);
/// Computes and returns a * b + c.
///
///
/// @tparam genType Floating-point scalar or vector types.
///
///
/// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/fma.xml">GLSL fma man page</a>
/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.3 Common Functions</a>
template <typename genType>
@@ -394,15 +394,15 @@ namespace glm
/// Splits x into a floating-point significand in the range
/// [0.5, 1.0) and an integral exponent of two, such that:
/// x = significand * exp(2, exponent)
///
///
/// The significand is returned by the function and the
/// exponent is returned in the parameter exp. For a
/// floating-point value of zero, the significant and exponent
/// are both zero. For a floating-point value that is an
/// infinity or is not a number, the results are undefined.
///
///
/// @tparam genType Floating-point scalar or vector types.
///
///
/// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/frexp.xml">GLSL frexp man page</a>
/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.3 Common Functions</a>
template <typename genType, typename genIType>
@@ -411,13 +411,13 @@ namespace glm
/// Builds a floating-point number from x and the
/// corresponding integral exponent of two in exp, returning:
/// significand * exp(2, exponent)
///
///
/// If this product is too large to be represented in the
/// floating-point type, the result is undefined.
///
///
/// @tparam genType Floating-point scalar or vector types.
///
/// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/ldexp.xml">GLSL ldexp man page</a>;
///
/// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/ldexp.xml">GLSL ldexp man page</a>;
/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.3 Common Functions</a>
template <typename genType, typename genIType>
genType ldexp(genType const & x, genIType const & exp);
src/thirdparty/glm/core/func_common.inl
Vendored
+103 -103
View File
@@ -8,10 +8,10 @@
/// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
/// copies of the Software, and to permit persons to whom the Software is
/// furnished to do so, subject to the following conditions:
///
///
/// The above copyright notice and this permission notice shall be included in
/// all copies or substantial portions of the Software.
///
///
/// 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
@@ -39,7 +39,7 @@ namespace detail
static genFIType get(genFIType const & x)
{
GLM_STATIC_ASSERT(
detail::type<genFIType>::is_float ||
detail::type<genFIType>::is_float ||
detail::type<genFIType>::is_int, "'abs' only accept floating-point and integer inputs");
return x >= genFIType(0) ? x : -x;
// TODO, perf comp with: *(((int *) &x) + 1) &= 0x7fffffff;
@@ -72,14 +72,14 @@ namespace detail
// sign
//Try something like based on x >> 31 to get the sign bit
template <typename genFIType>
template <typename genFIType>
GLM_FUNC_QUALIFIER genFIType sign
(
genFIType const & x
)
{
GLM_STATIC_ASSERT(
detail::type<genFIType>::is_float ||
detail::type<genFIType>::is_float ||
detail::type<genFIType>::is_int, "'sign' only accept signed inputs");
genFIType result;
@@ -91,7 +91,7 @@ namespace detail
result = genFIType(0);
return result;
}
VECTORIZE_VEC(sign)
// floor
@@ -144,13 +144,13 @@ namespace detail
return genType(int(x + genType(int(x) % 2)));
}
*/
// roundEven
template <typename genType>
GLM_FUNC_QUALIFIER genType roundEven(genType const & x)
{
GLM_STATIC_ASSERT(detail::type<genType>::is_float, "'roundEven' only accept floating-point inputs");
int Integer = int(x);
genType IntegerPart = genType(Integer);
genType FractionalPart = fract(x);
@@ -163,7 +163,7 @@ namespace detail
{
return IntegerPart;
}
else if(x <= genType(0)) // Work around...
else if(x <= genType(0)) // Work around...
{
return IntegerPart - 1;
}
@@ -176,7 +176,7 @@ namespace detail
// return mix(IntegerPart + genType(-1), IntegerPart + genType(1), x <= genType(0));
//}
}
VECTORIZE_VEC(roundEven)
// ceil
@@ -208,7 +208,7 @@ namespace detail
template <typename genType>
GLM_FUNC_QUALIFIER genType mod
(
genType const & x,
genType const & x,
genType const & y
)
{
@@ -224,7 +224,7 @@ namespace detail
template <typename genType>
GLM_FUNC_QUALIFIER genType modf
(
genType const & x,
genType const & x,
genType & i
)
{
@@ -236,7 +236,7 @@ namespace detail
template <typename valType>
GLM_FUNC_QUALIFIER detail::tvec2<valType> modf
(
detail::tvec2<valType> const & x,
detail::tvec2<valType> const & x,
detail::tvec2<valType> & i
)
{
@@ -248,7 +248,7 @@ namespace detail
template <typename valType>
GLM_FUNC_QUALIFIER detail::tvec3<valType> modf
(
detail::tvec3<valType> const & x,
detail::tvec3<valType> const & x,
detail::tvec3<valType> & i
)
{
@@ -261,7 +261,7 @@ namespace detail
template <typename valType>
GLM_FUNC_QUALIFIER detail::tvec4<valType> modf
(
detail::tvec4<valType> const & x,
detail::tvec4<valType> const & x,
detail::tvec4<valType> & i
)
{
@@ -275,7 +275,7 @@ namespace detail
//// Only valid if (INT_MIN <= x-y <= INT_MAX)
//// min(x,y)
//r = y + ((x - y) & ((x - y) >> (sizeof(int) *
//CHAR_BIT – 1)));
//CHAR_BIT – 1)));
//// max(x,y)
//r = x - ((x - y) & ((x - y) >> (sizeof(int) *
//CHAR_BIT - 1)));
@@ -284,12 +284,12 @@ namespace detail
template <typename genType>
GLM_FUNC_QUALIFIER genType min
(
genType const & x,
genType const & x,
genType const & y
)
{
GLM_STATIC_ASSERT(
detail::type<genType>::is_float ||
detail::type<genType>::is_float ||
detail::type<genType>::is_int ||
detail::type<genType>::is_uint, "'min' only accept numbers");
@@ -303,12 +303,12 @@ namespace detail
template <typename genType>
GLM_FUNC_QUALIFIER genType max
(
genType const & x,
genType const & x,
genType const & y
)
{
GLM_STATIC_ASSERT(
detail::type<genType>::is_float ||
detail::type<genType>::is_float ||
detail::type<genType>::is_int ||
detail::type<genType>::is_uint, "'max' only accept numbers");
@@ -322,18 +322,18 @@ namespace detail
template <typename valType>
GLM_FUNC_QUALIFIER valType clamp
(
valType const & x,
valType const & minVal,
valType const & x,
valType const & minVal,
valType const & maxVal
)
{
GLM_STATIC_ASSERT(
detail::type<valType>::is_float ||
detail::type<valType>::is_float ||
detail::type<valType>::is_int ||
detail::type<valType>::is_uint, "'clamp' only accept numbers");
// Old implementation, less predictable branching
//if(x >= maxVal) return maxVal;
//if(x >= maxVal) return maxVal;
//if(x <= minVal) return minVal;
//return x;
return max(min(x, maxVal), minVal);
@@ -342,8 +342,8 @@ namespace detail
template <typename T>
GLM_FUNC_QUALIFIER detail::tvec2<T> clamp
(
detail::tvec2<T> const & x,
typename detail::tvec2<T>::value_type const & minVal,
detail::tvec2<T> const & x,
typename detail::tvec2<T>::value_type const & minVal,
typename detail::tvec2<T>::value_type const & maxVal
)
{
@@ -355,8 +355,8 @@ namespace detail
template <typename T>
GLM_FUNC_QUALIFIER detail::tvec3<T> clamp
(
detail::tvec3<T> const & x,
typename detail::tvec3<T>::value_type const & minVal,
detail::tvec3<T> const & x,
typename detail::tvec3<T>::value_type const & minVal,
typename detail::tvec3<T>::value_type const & maxVal
)
{
@@ -369,8 +369,8 @@ namespace detail
template <typename T>
GLM_FUNC_QUALIFIER detail::tvec4<T> clamp
(
detail::tvec4<T> const & x,
typename detail::tvec4<T>::value_type const & minVal,
detail::tvec4<T> const & x,
typename detail::tvec4<T>::value_type const & minVal,
typename detail::tvec4<T>::value_type const & maxVal
)
{
@@ -384,8 +384,8 @@ namespace detail
template <typename T>
GLM_FUNC_QUALIFIER detail::tvec2<T> clamp
(
detail::tvec2<T> const & x,
detail::tvec2<T> const & minVal,
detail::tvec2<T> const & x,
detail::tvec2<T> const & minVal,
detail::tvec2<T> const & maxVal
)
{
@@ -397,8 +397,8 @@ namespace detail
template <typename T>
GLM_FUNC_QUALIFIER detail::tvec3<T> clamp
(
detail::tvec3<T> const & x,
detail::tvec3<T> const & minVal,
detail::tvec3<T> const & x,
detail::tvec3<T> const & minVal,
detail::tvec3<T> const & maxVal
)
{
@@ -411,8 +411,8 @@ namespace detail
template <typename T>
GLM_FUNC_QUALIFIER detail::tvec4<T> clamp
(
detail::tvec4<T> const & x,
detail::tvec4<T> const & minVal,
detail::tvec4<T> const & x,
detail::tvec4<T> const & minVal,
detail::tvec4<T> const & maxVal
)
{
@@ -427,14 +427,14 @@ namespace detail
template <typename genTypeT, typename genTypeU>
GLM_FUNC_QUALIFIER genTypeT mix
(
genTypeT const & x,
genTypeT const & y,
genTypeT const & x,
genTypeT const & y,
genTypeU const & a
)
{
// It could be a vector too
//GLM_STATIC_ASSERT(
// detail::type<genTypeT>::is_float &&
// detail::type<genTypeT>::is_float &&
// detail::type<genTypeU>::is_float);
//return x + a * (y - x);
@@ -444,8 +444,8 @@ namespace detail
template <typename valTypeA, typename valTypeB>
GLM_FUNC_QUALIFIER detail::tvec2<valTypeA> mix
(
detail::tvec2<valTypeA> const & x,
detail::tvec2<valTypeA> const & y,
detail::tvec2<valTypeA> const & x,
detail::tvec2<valTypeA> const & y,
valTypeB const & a
)
{
@@ -456,8 +456,8 @@ namespace detail
template <typename valTypeA, typename valTypeB>
GLM_FUNC_QUALIFIER detail::tvec3<valTypeA> mix
(
detail::tvec3<valTypeA> const & x,
detail::tvec3<valTypeA> const & y,
detail::tvec3<valTypeA> const & x,
detail::tvec3<valTypeA> const & y,
valTypeB const & a
)
{
@@ -468,8 +468,8 @@ namespace detail
template <typename valTypeA, typename valTypeB>
GLM_FUNC_QUALIFIER detail::tvec4<valTypeA> mix
(
detail::tvec4<valTypeA> const & x,
detail::tvec4<valTypeA> const & y,
detail::tvec4<valTypeA> const & x,
detail::tvec4<valTypeA> const & y,
valTypeB const & a
)
{
@@ -480,8 +480,8 @@ namespace detail
template <typename valTypeA, typename valTypeB>
GLM_FUNC_QUALIFIER detail::tvec2<valTypeA> mix
(
detail::tvec2<valTypeA> const & x,
detail::tvec2<valTypeA> const & y,
detail::tvec2<valTypeA> const & x,
detail::tvec2<valTypeA> const & y,
detail::tvec2<valTypeB> const & a
)
{
@@ -492,8 +492,8 @@ namespace detail
template <typename valTypeA, typename valTypeB>
GLM_FUNC_QUALIFIER detail::tvec3<valTypeA> mix
(
detail::tvec3<valTypeA> const & x,
detail::tvec3<valTypeA> const & y,
detail::tvec3<valTypeA> const & x,
detail::tvec3<valTypeA> const & y,
detail::tvec3<valTypeB> const & a
)
{
@@ -504,8 +504,8 @@ namespace detail
template <typename valTypeA, typename valTypeB>
GLM_FUNC_QUALIFIER detail::tvec4<valTypeA> mix
(
detail::tvec4<valTypeA> const & x,
detail::tvec4<valTypeA> const & y,
detail::tvec4<valTypeA> const & x,
detail::tvec4<valTypeA> const & y,
detail::tvec4<valTypeB> const & a
)
{
@@ -516,14 +516,14 @@ namespace detail
//template <typename genTypeT>
//GLM_FUNC_QUALIFIER genTypeT mix
//(
// genTypeT const & x,
// genTypeT const & y,
// genTypeT const & x,
// genTypeT const & y,
// float const & a
//)
//{
// // It could be a vector too
// //GLM_STATIC_ASSERT(
// // detail::type<genTypeT>::is_float &&
// // detail::type<genTypeT>::is_float &&
// // detail::type<genTypeU>::is_float);
// return x + a * (y - x);
@@ -532,8 +532,8 @@ namespace detail
template <typename genType>
GLM_FUNC_QUALIFIER genType mix
(
genType const & x,
genType const & y,
genType const & x,
genType const & y,
bool const & a
)
{
@@ -545,8 +545,8 @@ namespace detail
template <typename T>
GLM_FUNC_QUALIFIER detail::tvec2<T> mix
(
detail::tvec2<T> const & x,
detail::tvec2<T> const & y,
detail::tvec2<T> const & x,
detail::tvec2<T> const & y,
typename detail::tvec2<T>::bool_type a
)
{
@@ -555,8 +555,8 @@ namespace detail
detail::tvec2<T> result;
for
(
typename detail::tvec2<T>::size_type i = 0;
i < detail::tvec2<T>::value_size();
typename detail::tvec2<T>::size_type i = 0;
i < detail::tvec2<T>::value_size();
++i
)
{
@@ -568,8 +568,8 @@ namespace detail
template <typename T>
GLM_FUNC_QUALIFIER detail::tvec3<T> mix
(
detail::tvec3<T> const & x,
detail::tvec3<T> const & y,
detail::tvec3<T> const & x,
detail::tvec3<T> const & y,
typename detail::tvec3<T>::bool_type a
)
{
@@ -578,8 +578,8 @@ namespace detail
detail::tvec3<T> result;
for
(
typename detail::tvec3<T>::size_type i = 0;
i < detail::tvec3<T>::value_size();
typename detail::tvec3<T>::size_type i = 0;
i < detail::tvec3<T>::value_size();
++i
)
{
@@ -591,8 +591,8 @@ namespace detail
template <typename T>
GLM_FUNC_QUALIFIER detail::tvec4<T> mix
(
detail::tvec4<T> const & x,
detail::tvec4<T> const & y,
detail::tvec4<T> const & x,
detail::tvec4<T> const & y,
typename detail::tvec4<T>::bool_type a
)
{
@@ -601,8 +601,8 @@ namespace detail
detail::tvec4<T> result;
for
(
typename detail::tvec4<T>::size_type i = 0;
i < detail::tvec4<T>::value_size();
typename detail::tvec4<T>::size_type i = 0;
i < detail::tvec4<T>::value_size();
++i
)
{
@@ -615,7 +615,7 @@ namespace detail
template <typename genType>
GLM_FUNC_QUALIFIER genType step
(
genType const & edge,
genType const & edge,
genType const & x
)
{
@@ -627,7 +627,7 @@ namespace detail
template <typename T>
GLM_FUNC_QUALIFIER detail::tvec2<T> step
(
typename detail::tvec2<T>::value_type const & edge,
typename detail::tvec2<T>::value_type const & edge,
detail::tvec2<T> const & x
)
{
@@ -639,7 +639,7 @@ namespace detail
template <typename T>
GLM_FUNC_QUALIFIER detail::tvec3<T> step
(
typename detail::tvec3<T>::value_type const & edge,
typename detail::tvec3<T>::value_type const & edge,
detail::tvec3<T> const & x
)
{
@@ -652,7 +652,7 @@ namespace detail
template <typename T>
GLM_FUNC_QUALIFIER detail::tvec4<T> step
(
typename detail::tvec4<T>::value_type const & edge,
typename detail::tvec4<T>::value_type const & edge,
detail::tvec4<T> const & x
)
{
@@ -666,7 +666,7 @@ namespace detail
template <typename T>
GLM_FUNC_QUALIFIER detail::tvec2<T> step
(
detail::tvec2<T> const & edge,
detail::tvec2<T> const & edge,
detail::tvec2<T> const & x
)
{
@@ -678,7 +678,7 @@ namespace detail
template <typename T>
GLM_FUNC_QUALIFIER detail::tvec3<T> step
(
detail::tvec3<T> const & edge,
detail::tvec3<T> const & edge,
detail::tvec3<T> const & x
)
{
@@ -691,7 +691,7 @@ namespace detail
template <typename T>
GLM_FUNC_QUALIFIER detail::tvec4<T> step
(
detail::tvec4<T> const & edge,
detail::tvec4<T> const & edge,
detail::tvec4<T> const & x
)
{
@@ -706,8 +706,8 @@ namespace detail
template <typename genType>
GLM_FUNC_QUALIFIER genType smoothstep
(
genType const & edge0,
genType const & edge1,
genType const & edge0,
genType const & edge1,
genType const & x
)
{
@@ -720,8 +720,8 @@ namespace detail
template <typename T>
GLM_FUNC_QUALIFIER detail::tvec2<T> smoothstep
(
typename detail::tvec2<T>::value_type const & edge0,
typename detail::tvec2<T>::value_type const & edge1,
typename detail::tvec2<T>::value_type const & edge0,
typename detail::tvec2<T>::value_type const & edge1,
detail::tvec2<T> const & x
)
{
@@ -733,8 +733,8 @@ namespace detail
template <typename T>
GLM_FUNC_QUALIFIER detail::tvec3<T> smoothstep
(
typename detail::tvec3<T>::value_type const & edge0,
typename detail::tvec3<T>::value_type const & edge1,
typename detail::tvec3<T>::value_type const & edge0,
typename detail::tvec3<T>::value_type const & edge1,
detail::tvec3<T> const & x
)
{
@@ -747,8 +747,8 @@ namespace detail
template <typename T>
GLM_FUNC_QUALIFIER detail::tvec4<T> smoothstep
(
typename detail::tvec4<T>::value_type const & edge0,
typename detail::tvec4<T>::value_type const & edge1,
typename detail::tvec4<T>::value_type const & edge0,
typename detail::tvec4<T>::value_type const & edge1,
detail::tvec4<T> const & x
)
{
@@ -762,8 +762,8 @@ namespace detail
template <typename T>
GLM_FUNC_QUALIFIER detail::tvec2<T> smoothstep
(
detail::tvec2<T> const & edge0,
detail::tvec2<T> const & edge1,
detail::tvec2<T> const & edge0,
detail::tvec2<T> const & edge1,
detail::tvec2<T> const & x
)
{
@@ -775,8 +775,8 @@ namespace detail
template <typename T>
GLM_FUNC_QUALIFIER detail::tvec3<T> smoothstep
(
detail::tvec3<T> const & edge0,
detail::tvec3<T> const & edge1,
detail::tvec3<T> const & edge0,
detail::tvec3<T> const & edge1,
detail::tvec3<T> const & x
)
{
@@ -789,8 +789,8 @@ namespace detail
template <typename T>
GLM_FUNC_QUALIFIER detail::tvec4<T> smoothstep
(
detail::tvec4<T> const & edge0,
detail::tvec4<T> const & edge1,
detail::tvec4<T> const & edge0,
detail::tvec4<T> const & edge1,
detail::tvec4<T> const & x
)
{
@@ -802,7 +802,7 @@ namespace detail
}
// TODO: Not working on MinGW...
template <typename genType>
template <typename genType>
GLM_FUNC_QUALIFIER bool isnan(genType const & x)
{
GLM_STATIC_ASSERT(detail::type<genType>::is_float, "'isnan' only accept floating-point inputs");
@@ -864,7 +864,7 @@ namespace detail
isnan(x.w));
}
template <typename genType>
template <typename genType>
GLM_FUNC_QUALIFIER bool isinf(
genType const & x)
{
@@ -899,7 +899,7 @@ namespace detail
return std::isinf(x);
# endif
# elif(GLM_COMPILER & GLM_COMPILER_INTEL)
return isinf(x) != 0;
return isinf(x) != 0;
# else
return std::isinf(x);
# endif
@@ -1126,8 +1126,8 @@ namespace detail
template <typename genType>
GLM_FUNC_QUALIFIER genType fma
(
genType const & a,
genType const & b,
genType const & a,
genType const & b,
genType const & c
)
{
@@ -1137,7 +1137,7 @@ namespace detail
template <typename genType>
GLM_FUNC_QUALIFIER genType frexp
(
genType const & x,
genType const & x,
int & exp
)
{
@@ -1147,7 +1147,7 @@ namespace detail
template <typename T>
GLM_FUNC_QUALIFIER detail::tvec2<T> frexp
(
detail::tvec2<T> const & x,
detail::tvec2<T> const & x,
detail::tvec2<int> & exp
)
{
@@ -1157,7 +1157,7 @@ namespace detail
template <typename T>
GLM_FUNC_QUALIFIER detail::tvec3<T> frexp
(
detail::tvec3<T> const & x,
detail::tvec3<T> const & x,
detail::tvec3<int> & exp
)
{
@@ -1167,7 +1167,7 @@ namespace detail
template <typename T>
GLM_FUNC_QUALIFIER detail::tvec4<T> frexp
(
detail::tvec4<T> const & x,
detail::tvec4<T> const & x,
detail::tvec4<int> & exp
)
{
@@ -1177,7 +1177,7 @@ namespace detail
template <typename genType>
GLM_FUNC_QUALIFIER genType ldexp
(
genType const & x,
genType const & x,
int const & exp
)
{
@@ -1187,7 +1187,7 @@ namespace detail
template <typename T>
GLM_FUNC_QUALIFIER detail::tvec2<T> ldexp
(
detail::tvec2<T> const & x,
detail::tvec2<T> const & x,
detail::tvec2<int> const & exp
)
{
@@ -1197,7 +1197,7 @@ namespace detail
template <typename T>
GLM_FUNC_QUALIFIER detail::tvec3<T> ldexp
(
detail::tvec3<T> const & x,
detail::tvec3<T> const & x,
detail::tvec3<int> const & exp
)
{
@@ -1207,7 +1207,7 @@ namespace detail
template <typename T>
GLM_FUNC_QUALIFIER detail::tvec4<T> ldexp
(
detail::tvec4<T> const & x,
detail::tvec4<T> const & x,
detail::tvec4<int> const & exp
)
{
src/thirdparty/glm/core/type_half.inl
Vendored
+16 -16
View File
@@ -3,7 +3,7 @@
///
/// Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net)
///
/// This half implementation is based on OpenEXR which is Copyright (c) 2002,
/// This half implementation is based on OpenEXR which is Copyright (c) 2002,
/// Industrial Light & Magic, a division of Lucas Digital Ltd. LLC
///
/// Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -12,10 +12,10 @@
/// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
/// copies of the Software, and to permit persons to whom the Software is
/// furnished to do so, subject to the following conditions:
///
///
/// The above copyright notice and this permission notice shall be included in
/// all copies or substantial portions of the Software.
///
///
/// 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
@@ -39,9 +39,9 @@ namespace detail
{
volatile float f = 1e10;
for(int i = 0; i < 10; ++i)
for(int i = 0; i < 10; ++i)
f *= f; // this will overflow before
// the for­loop terminates
// the for­loop terminates
return f;
}
@@ -163,7 +163,7 @@ namespace detail
// whose magnitude is less than __half_NRM_MIN.
//
// We convert f to a denormalized half.
//
//
m = (m | 0x00800000) >> (1 - e);
@@ -174,9 +174,9 @@ namespace detail
// our number normalized. Because of the way a half's bits
// are laid out, we don't have to treat this case separately;
// the code below will handle it correctly.
//
//
if(m & 0x00001000)
if(m & 0x00001000)
m += 0x00002000;
//
@@ -202,7 +202,7 @@ namespace detail
// F is a NAN; we produce a half NAN that preserves
// the sign bit and the 10 leftmost bits of the
// significand of f, with one exception: If the 10
// leftmost bits are all zero, the NAN would turn
// leftmost bits are all zero, the NAN would turn
// into an infinity, so we have to set at least one
// bit in the significand.
//
@@ -294,7 +294,7 @@ namespace detail
GLM_FUNC_QUALIFIER half& half::operator*=(half const & s)
{
data = toFloat16(toFloat32(data) * toFloat32(s.data));
data = toFloat16(toFloat32(data) * toFloat32(s.data));
return *this;
}
@@ -359,7 +359,7 @@ namespace detail
GLM_FUNC_QUALIFIER bool operator==
(
detail::half const & x,
detail::half const & x,
detail::half const & y
)
{
@@ -368,7 +368,7 @@ namespace detail
GLM_FUNC_QUALIFIER bool operator!=
(
detail::half const & x,
detail::half const & x,
detail::half const & y
)
{
@@ -377,7 +377,7 @@ namespace detail
GLM_FUNC_QUALIFIER bool operator<
(
detail::half const & x,
detail::half const & x,
detail::half const & y
)
{
@@ -386,7 +386,7 @@ namespace detail
GLM_FUNC_QUALIFIER bool operator<=
(
detail::half const & x,
detail::half const & x,
detail::half const & y
)
{
@@ -395,7 +395,7 @@ namespace detail
GLM_FUNC_QUALIFIER bool operator>
(
detail::half const & x,
detail::half const & x,
detail::half const & y
)
{
@@ -404,7 +404,7 @@ namespace detail
GLM_FUNC_QUALIFIER bool operator>=
(
detail::half const & x,
detail::half const & x,
detail::half const & y
)
{