From 2877f4eda3d1b0c7431039e3142ecf1a282a34b1 Mon Sep 17 00:00:00 2001 From: LaG1924 <12997935+LaG1924@users.noreply.github.com> Date: Tue, 21 Aug 2018 20:40:38 +0500 Subject: Update glm to 0.9.9.0 --- external/include/glm/gtx/gradient_paint.inl | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'external/include/glm/gtx/gradient_paint.inl') diff --git a/external/include/glm/gtx/gradient_paint.inl b/external/include/glm/gtx/gradient_paint.inl index aaa5ce1..e2e92b5 100644 --- a/external/include/glm/gtx/gradient_paint.inl +++ b/external/include/glm/gtx/gradient_paint.inl @@ -3,17 +3,17 @@ namespace glm { - template + template GLM_FUNC_QUALIFIER T radialGradient ( - tvec2 const & Center, - T const & Radius, - tvec2 const & Focal, - tvec2 const & Position + vec<2, T, Q> const& Center, + T const& Radius, + vec<2, T, Q> const& Focal, + vec<2, T, Q> const& Position ) { - tvec2 F = Focal - Center; - tvec2 D = Position - Focal; + vec<2, T, Q> F = Focal - Center; + vec<2, T, Q> D = Position - Focal; T Radius2 = pow2(Radius); T Fx2 = pow2(F.x); T Fy2 = pow2(F.y); @@ -23,15 +23,15 @@ namespace glm return Numerator / Denominator; } - template + template GLM_FUNC_QUALIFIER T linearGradient ( - tvec2 const & Point0, - tvec2 const & Point1, - tvec2 const & Position + vec<2, T, Q> const& Point0, + vec<2, T, Q> const& Point1, + vec<2, T, Q> const& Position ) { - tvec2 Dist = Point1 - Point0; + vec<2, T, Q> Dist = Point1 - Point0; return (Dist.x * (Position.x - Point0.x) + Dist.y * (Position.y - Point0.y)) / glm::dot(Dist, Dist); } }//namespace glm -- cgit v1.2.3