From bc90cdef8b727db99ee8987caa532511f358b17f Mon Sep 17 00:00:00 2001 From: twinaphex Date: Tue, 1 Nov 2016 07:40:33 +0100 Subject: [PATCH] (GLM) Remove GLM_FUNC_DECL --- deps/glm/detail/func_common.hpp | 74 ++++----- deps/glm/detail/func_exponential.hpp | 16 +- deps/glm/detail/func_geometric.hpp | 18 +-- deps/glm/detail/func_integer.hpp | 20 +-- deps/glm/detail/func_matrix.hpp | 10 +- deps/glm/detail/func_noise.hpp | 8 +- deps/glm/detail/func_packing.hpp | 24 +-- deps/glm/detail/func_trigonometric.hpp | 30 ++-- deps/glm/detail/func_vector_relational.hpp | 18 +-- deps/glm/detail/setup.hpp | 3 +- deps/glm/detail/type_half.hpp | 4 +- deps/glm/detail/type_mat2x2.hpp | 110 +++++++------- deps/glm/detail/type_mat2x3.hpp | 94 ++++++------ deps/glm/detail/type_mat2x4.hpp | 94 ++++++------ deps/glm/detail/type_mat3x2.hpp | 94 ++++++------ deps/glm/detail/type_mat3x3.hpp | 110 +++++++------- deps/glm/detail/type_mat3x4.hpp | 94 ++++++------ deps/glm/detail/type_mat4x2.hpp | 94 ++++++------ deps/glm/detail/type_mat4x3.hpp | 94 ++++++------ deps/glm/detail/type_mat4x4.hpp | 110 +++++++------- deps/glm/detail/type_vec1.hpp | 144 +++++++++--------- deps/glm/detail/type_vec2.hpp | 144 +++++++++--------- deps/glm/detail/type_vec3.hpp | 150 +++++++++--------- deps/glm/detail/type_vec4.hpp | 168 ++++++++++----------- deps/glm/gtc/constants.hpp | 50 +++--- deps/glm/gtc/epsilon.hpp | 8 +- deps/glm/gtc/matrix_access.hpp | 8 +- deps/glm/gtc/matrix_inverse.hpp | 4 +- deps/glm/gtc/matrix_transform.hpp | 28 ++-- deps/glm/gtc/noise.hpp | 6 +- deps/glm/gtc/packing.hpp | 60 ++++---- deps/glm/gtc/quaternion.hpp | 102 ++++++------- deps/glm/gtc/random.hpp | 12 +- deps/glm/gtc/reciprocal.hpp | 24 +-- deps/glm/gtc/type_ptr.hpp | 34 ++--- deps/glm/gtc/ulp.hpp | 12 +- deps/glm/gtx/associated_min_max.hpp | 12 +- deps/glm/gtx/bit.hpp | 54 +++---- deps/glm/gtx/bit.inl | 43 +----- deps/glm/gtx/closest_point.hpp | 2 +- deps/glm/gtx/color_space.hpp | 12 +- deps/glm/gtx/color_space_YCoCg.hpp | 8 +- deps/glm/gtx/compatibility.hpp | 8 +- deps/glm/gtx/component_wise.hpp | 8 +- deps/glm/gtx/dual_quaternion.hpp | 56 +++---- deps/glm/gtx/euler_angles.hpp | 30 ++-- deps/glm/gtx/extend.hpp | 2 +- deps/glm/gtx/extented_min_max.hpp | 24 +-- deps/glm/gtx/fast_exponential.hpp | 14 +- deps/glm/gtx/fast_square_root.hpp | 12 +- deps/glm/gtx/fast_trigonometry.hpp | 14 +- deps/glm/gtx/gradient_paint.hpp | 4 +- deps/glm/gtx/handed_coordinate_space.hpp | 4 +- deps/glm/gtx/integer.hpp | 20 +-- deps/glm/gtx/intersect.hpp | 12 +- deps/glm/gtx/io.hpp | 50 +++--- deps/glm/gtx/log_base.hpp | 2 +- deps/glm/gtx/matrix_cross_product.hpp | 4 +- deps/glm/gtx/matrix_interpolation.hpp | 8 +- deps/glm/gtx/matrix_major_storage.hpp | 24 +-- deps/glm/gtx/matrix_operation.hpp | 18 +-- deps/glm/gtx/matrix_query.hpp | 16 +- deps/glm/gtx/mixed_product.hpp | 2 +- deps/glm/gtx/multiple.hpp | 4 +- deps/glm/gtx/norm.hpp | 20 +-- deps/glm/gtx/normal.hpp | 2 +- deps/glm/gtx/normalize_dot.hpp | 4 +- deps/glm/gtx/optimum_pow.hpp | 14 +- deps/glm/gtx/orthonormalize.hpp | 4 +- deps/glm/gtx/perpendicular.hpp | 2 +- deps/glm/gtx/polar_coordinates.hpp | 4 +- deps/glm/gtx/projection.hpp | 2 +- deps/glm/gtx/quaternion.hpp | 36 ++--- deps/glm/gtx/rotate_normalized_axis.hpp | 4 +- deps/glm/gtx/rotate_vector.hpp | 20 +-- deps/glm/gtx/simd_mat4.hpp | 2 +- deps/glm/gtx/spline.hpp | 6 +- deps/glm/gtx/string_cast.hpp | 2 +- deps/glm/gtx/transform.hpp | 6 +- deps/glm/gtx/transform2.hpp | 26 ++-- deps/glm/gtx/vector_angle.hpp | 6 +- deps/glm/gtx/vector_query.hpp | 12 +- deps/glm/gtx/wrap.hpp | 6 +- 83 files changed, 1336 insertions(+), 1382 deletions(-) diff --git a/deps/glm/detail/func_common.hpp b/deps/glm/detail/func_common.hpp index 41fe639d43..40674d9c74 100644 --- a/deps/glm/detail/func_common.hpp +++ b/deps/glm/detail/func_common.hpp @@ -53,7 +53,7 @@ namespace glm /// @see GLSL abs man page /// @see GLSL 4.20.8 specification, section 8.3 Common Functions template - GLM_FUNC_DECL genType abs(genType const & x); + genType abs(genType const & x); /// Returns 1.0 if x > 0, 0.0 if x == 0, or -1.0 if x < 0. /// @@ -62,7 +62,7 @@ namespace glm /// @see GLSL sign man page /// @see GLSL 4.20.8 specification, section 8.3 Common Functions template - GLM_FUNC_DECL genType sign(genType const & x); + genType sign(genType const & x); /// Returns a value equal to the nearest integer that is less then or equal to x. /// @@ -71,7 +71,7 @@ namespace glm /// @see GLSL floor man page /// @see GLSL 4.20.8 specification, section 8.3 Common Functions template - GLM_FUNC_DECL genType floor(genType const & x); + 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. @@ -81,7 +81,7 @@ namespace glm /// @see GLSL trunc man page /// @see GLSL 4.20.8 specification, section 8.3 Common Functions template - GLM_FUNC_DECL genType trunc(genType const & x); + 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 @@ -94,7 +94,7 @@ namespace glm /// @see GLSL round man page /// @see GLSL 4.20.8 specification, section 8.3 Common Functions template - GLM_FUNC_DECL genType round(genType const & x); + 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 @@ -106,7 +106,7 @@ namespace glm /// @see GLSL 4.20.8 specification, section 8.3 Common Functions /// @see New round to even technique template - GLM_FUNC_DECL genType roundEven(genType const & x); + genType roundEven(genType const & x); /// Returns a value equal to the nearest integer /// that is greater than or equal to x. @@ -116,7 +116,7 @@ namespace glm /// @see GLSL ceil man page /// @see GLSL 4.20.8 specification, section 8.3 Common Functions template - GLM_FUNC_DECL genType ceil(genType const & x); + genType ceil(genType const & x); /// Return x - floor(x). /// @@ -125,7 +125,7 @@ namespace glm /// @see GLSL fract man page /// @see GLSL 4.20.8 specification, section 8.3 Common Functions template - GLM_FUNC_DECL genType fract(genType const & x); + genType fract(genType const & x); /// Modulus. Returns x - y * floor(x / y) /// for each component in x using the floating point value y. @@ -135,7 +135,7 @@ namespace glm /// @see GLSL mod man page /// @see GLSL 4.20.8 specification, section 8.3 Common Functions template - GLM_FUNC_DECL genType mod( + genType mod( genType const & x, genType const & y); @@ -147,7 +147,7 @@ namespace glm /// @see GLSL mod man page /// @see GLSL 4.20.8 specification, section 8.3 Common Functions template - GLM_FUNC_DECL genType mod( + genType mod( genType const & x, typename genType::value_type const & y); @@ -161,7 +161,7 @@ namespace glm /// @see GLSL modf man page /// @see GLSL 4.20.8 specification, section 8.3 Common Functions template - GLM_FUNC_DECL genType modf( + genType modf( genType const & x, genType & i); @@ -172,12 +172,12 @@ namespace glm /// @see GLSL min man page /// @see GLSL 4.20.8 specification, section 8.3 Common Functions<<<<<<< HEAD template - GLM_FUNC_DECL genType min( + genType min( genType const & x, genType const & y); template - GLM_FUNC_DECL genType min( + genType min( genType const & x, typename genType::value_type const & y); @@ -188,12 +188,12 @@ namespace glm /// @see GLSL max man page /// @see GLSL 4.20.8 specification, section 8.3 Common Functions template - GLM_FUNC_DECL genType max( + genType max( genType const & x, genType const & y); template - GLM_FUNC_DECL genType max( + genType max( genType const & x, typename genType::value_type const & y); @@ -205,13 +205,13 @@ namespace glm /// @see GLSL clamp man page /// @see GLSL 4.20.8 specification, section 8.3 Common Functions template - GLM_FUNC_DECL genType clamp( + genType clamp( genType const & x, genType const & minVal, genType const & maxVal); template - GLM_FUNC_DECL genType clamp( + genType clamp( genType const & x, typename genType::value_type const & minVal, typename genType::value_type const & maxVal); @@ -259,19 +259,19 @@ namespace glm /// glm::vec4 u = glm::mix(g, h, r); // Interpolations can be perform per component with a vector for the last parameter. /// @endcode template class vecType> - GLM_FUNC_DECL vecType mix( + vecType mix( vecType const & x, vecType const & y, vecType const & a); template class vecType> - GLM_FUNC_DECL vecType mix( + vecType mix( vecType const & x, vecType const & y, U const & a); template - GLM_FUNC_DECL genTypeT mix( + genTypeT mix( genTypeT const & x, genTypeT const & y, genTypeU const & a); @@ -281,7 +281,7 @@ namespace glm /// @see GLSL step man page /// @see GLSL 4.20.8 specification, section 8.3 Common Functions template - GLM_FUNC_DECL genType step( + genType step( genType const & edge, genType const & x); @@ -290,7 +290,7 @@ namespace glm /// @see GLSL step man page /// @see GLSL 4.20.8 specification, section 8.3 Common Functions template