mewin/glm
1
0
Fork 0
Code Releases Activity

Merge branch '0.9.3' into swizzle

Browse Source
This commit is contained in:
Christophe Riccio 2011-10-13 18:36:52 +01:00
commit 0add256545
6 changed files with 69 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
glm/gtx/gradient_paint.hpp
View File

@ -55,18 +55,18 @@ namespace glm
/// @see - gtx_gradient_paint /// @see - gtx_gradient_paint
template <typename valType> template <typename valType>
valType radialGradient( valType radialGradient(
glm::detail::tvec2<valType> const & Center, detail::tvec2<valType> const & Center,
valType const & Radius, valType const & Radius,
glm::detail::tvec2<valType> const & Focal, detail::tvec2<valType> const & Focal,
glm::detail::tvec2<valType> const & Position); detail::tvec2<valType> const & Position);
/// Return a color from a linear gradient. /// Return a color from a linear gradient.
/// @see - gtx_gradient_paint /// @see - gtx_gradient_paint
template <typename valType> template <typename valType>
valType linearGradient( valType linearGradient(
glm::detail::tvec2<valType> const & Point0, detail::tvec2<valType> const & Point0,
glm::detail::tvec2<valType> const & Point1, detail::tvec2<valType> const & Point1,
glm::detail::tvec2<valType> const & Position); detail::tvec2<valType> const & Position);
/// @} /// @}
}// namespace glm }// namespace glm

34
glm/gtx/gradient_paint.inl
View File

@ -10,30 +10,34 @@
namespace glm{ namespace glm{
template <typename valType> template <typename valType>
valType radialGradient( valType radialGradient
glm::detail::tvec2<valType> const & Center, (
detail::tvec2<valType> const & Center,
valType const & Radius, valType const & Radius,
glm::detail::tvec2<valType> const & Focal, detail::tvec2<valType> const & Focal,
glm::detail::tvec2<valType> const & Position) detail::tvec2<valType> const & Position
)
{ {
glm::detail::tvec2<valType> F = Focal - Center; detail::tvec2<valType> F = Focal - Center;
glm::detail::tvec2<valType> D = Position - Focal; detail::tvec2<valType> D = Position - Focal;
valType Radius2 = gtx::pow2(Radius); valType Radius2 = pow2(Radius);
valType Fx2 = gtx::pow2(F.x); valType Fx2 = pow2(F.x);
valType Fy2 = gtx::pow2(F.y); valType Fy2 = pow2(F.y);
valType Numerator = (D.x * F.x + D.y * F.y) + glm::sqrt(Radius2 * (gtx::pow2(D.x) + gtx::pow2(D.y)) - gtx::pow2(D.x * F.y - D.y * F.x)); valType Numerator = (D.x * F.x + D.y * F.y) + sqrt(Radius2 * (pow2(D.x) + pow2(D.y)) - pow2(D.x * F.y - D.y * F.x));
valType Denominator = Radius2 - (Fx2 + Fy2); valType Denominator = Radius2 - (Fx2 + Fy2);
return Numerator / Denominator; return Numerator / Denominator;
} }
template <typename valType> template <typename valType>
valType linearGradient( valType linearGradient
glm::detail::tvec2<valType> const & Point0, (
glm::detail::tvec2<valType> const & Point1, detail::tvec2<valType> const & Point0,
glm::detail::tvec2<valType> const & Position) detail::tvec2<valType> const & Point1,
detail::tvec2<valType> const & Position
)
{ {
glm::detail::tvec2<valType> Dist = Point1 - Point0; detail::tvec2<valType> Dist = Point1 - Point0;
return (Dist.x * (Position.x - Point0.x) + Dist.y * (Position.y - Point0.y)) / glm::dot(Dist, Dist); return (Dist.x * (Position.x - Point0.x) + Dist.y * (Position.y - Point0.y)) / glm::dot(Dist, Dist);
} }

2
glm/gtx/integer.hpp
View File

@ -22,7 +22,7 @@
/// ///
/// @ref gtx_integer /// @ref gtx_integer
/// @file glm/gtx/integer.hpp /// @file glm/gtx/integer.hpp
/// @date 2005-12-24 / 2011-06-07 /// @date 2005-12-24 / 2011-10-13
/// @author Christophe Riccio /// @author Christophe Riccio
/// ///
/// @see core (dependence) /// @see core (dependence)

2
glm/gtx/integer.inl
View File

@ -2,7 +2,7 @@
// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) // OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net)
/////////////////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////////////////
// Created : 2005-12-24 // Created : 2005-12-24
// Updated : 2006-12-06 // Updated : 2011-10-13
// Licence : This source is under MIT License // Licence : This source is under MIT License
// File : glm/gtx/integer.inl // File : glm/gtx/integer.inl
/////////////////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////////////////

1
test/gtx/CMakeLists.txt
View File

@ -1,4 +1,5 @@
glmCreateTestGTC(gtx_bit) glmCreateTestGTC(gtx_bit)
glmCreateTestGTC(gtx_gradient_paint)
glmCreateTestGTC(gtx_integer) glmCreateTestGTC(gtx_integer)
glmCreateTestGTC(gtx_noise) glmCreateTestGTC(gtx_noise)
glmCreateTestGTC(gtx_quaternion) glmCreateTestGTC(gtx_quaternion)

41
test/gtx/gtx_gradient_paint.cpp Normal file
View File

@ -0,0 +1,41 @@
///////////////////////////////////////////////////////////////////////////////////////////////////
// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net)
///////////////////////////////////////////////////////////////////////////////////////////////////
// Created : 2011-10-13
// Updated : 2011-10-13
// Licence : This source is under MIT licence
// File : test/gtx/gradient_paint.cpp
///////////////////////////////////////////////////////////////////////////////////////////////////
#include <glm/glm.hpp>
#include <glm/gtx/gradient_paint.hpp>
int test_radialGradient()
{
int Error = 0;
float Gradient = glm::radialGradient(glm::vec2(0), 1.0f, glm::vec2(1), glm::vec2(0.5));
return Error;
}
int test_linearGradient()
{
int Error = 0;
float Gradient = glm::linearGradient(glm::vec2(0), glm::vec2(1), glm::vec2(0.5));
return Error;
}
int main()
{
int Error = 0;
Error += test_radialGradient();
Error += test_linearGradient();
return Error;
}