mirror of https://github.com/mosra/magnum.git
16 changed files with 505 additions and 3 deletions
|
After Width: | Height: | Size: 24 KiB |
|
After Width: | Height: | Size: 27 KiB |
|
After Width: | Height: | Size: 23 KiB |
|
After Width: | Height: | Size: 18 KiB |
|
After Width: | Height: | Size: 18 KiB |
|
After Width: | Height: | Size: 18 KiB |
@ -0,0 +1,99 @@
|
||||
/*
|
||||
This file is part of Magnum. |
||||
|
||||
Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 |
||||
Vladimír Vondruš <mosra@centrum.cz> |
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a |
||||
copy of this software and associated documentation files (the "Software"), |
||||
to deal in the Software without restriction, including without limitation |
||||
the rights 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 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER |
||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING |
||||
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER |
||||
DEALINGS IN THE SOFTWARE. |
||||
*/ |
||||
|
||||
#include "Gradient.h" |
||||
|
||||
#include "Magnum/Mesh.h" |
||||
#include "Magnum/Math/Color.h" |
||||
#include "Magnum/Math/Intersection.h" |
||||
#include "Magnum/Trade/MeshData2D.h" |
||||
#include "Magnum/Trade/MeshData3D.h" |
||||
|
||||
namespace Magnum { namespace Primitives { |
||||
|
||||
Trade::MeshData2D gradient2D(const Vector2& a, const Color4& colorA, const Vector2& b, const Color4& colorB) { |
||||
std::vector<Vector2> positions{Vector2{ 1.0f, -1.0f}, |
||||
Vector2{ 1.0f, 1.0f}, |
||||
Vector2{-1.0f, -1.0f}, |
||||
Vector2{-1.0f, 1.0f}}; |
||||
std::vector<Color4> colors{4}; |
||||
|
||||
/* For every corner, take a line perpendicular to the gradient direction
|
||||
and passing through the corner. The calculated intersection position |
||||
with the gradient line segment is the blend factor for the two colors |
||||
for given corner. */ |
||||
const Vector2 direction = b - a; |
||||
const Vector2 perpendicular = direction.perpendicular(); |
||||
for(std::size_t i = 0; i != 4; ++i) { |
||||
const Float t = Math::Intersection::lineSegmentLine(a, direction, positions[i], perpendicular); |
||||
colors[i] = Math::lerp(colorA, colorB, t); |
||||
} |
||||
|
||||
return Trade::MeshData2D{MeshPrimitive::TriangleStrip, {}, {std::move(positions)}, {}, {std::move(colors)}, nullptr}; |
||||
} |
||||
|
||||
Trade::MeshData2D gradient2DHorizontal(const Color4& colorA, const Color4& colorB) { |
||||
return Primitives::gradient2D({-1.0f, 0.0f}, colorA, {1.0f, 0.0f}, colorB); |
||||
} |
||||
|
||||
Trade::MeshData2D gradient2DVertical(const Color4& colorA, const Color4& colorB) { |
||||
return Primitives::gradient2D({0.0f, -1.0f}, colorA, {0.0f, 1.0f}, colorB); |
||||
} |
||||
|
||||
Trade::MeshData3D gradient3D(const Vector3& a, const Color4& colorA, const Vector3& b, const Color4& colorB) { |
||||
std::vector<Vector3> positions{Vector3{ 1.0f, -1.0f, 0.0f}, |
||||
Vector3{ 1.0f, 1.0f, 0.0f}, |
||||
Vector3{-1.0f, -1.0f, 0.0f}, |
||||
Vector3{-1.0f, 1.0f, 0.0f}}; |
||||
std::vector<Color4> colors{4}; |
||||
|
||||
/* For every corner, take a plane perpendicular to the gradient direction
|
||||
and passing through the corner. The calculated intersection position |
||||
with the gradient line segment is the blend factor for the two colors |
||||
for given corner. */ |
||||
const Vector3 direction = b - a; |
||||
for(std::size_t i = 0; i != 4; ++i) { |
||||
const Vector4 plane = Math::planeEquation(direction, positions[i]); |
||||
const Float t = Math::Intersection::planeLine(plane, a, direction); |
||||
colors[i] = Math::lerp(colorA, colorB, t); |
||||
} |
||||
|
||||
return Trade::MeshData3D{MeshPrimitive::TriangleStrip, {}, {std::move(positions)}, {{ |
||||
{0.0f, 0.0f, 1.0f}, |
||||
{0.0f, 0.0f, 1.0f}, |
||||
{0.0f, 0.0f, 1.0f}, |
||||
{0.0f, 0.0f, 1.0f} |
||||
}}, {}, {std::move(colors)}, nullptr}; |
||||
} |
||||
|
||||
Trade::MeshData3D gradient3DHorizontal(const Color4& colorA, const Color4& colorB) { |
||||
return Primitives::gradient3D({-1.0f, 0.0f, 0.0f}, colorA, {1.0f, 0.0f, 0.0f}, colorB); |
||||
} |
||||
|
||||
Trade::MeshData3D gradient3DVertical(const Color4& colorA, const Color4& colorB) { |
||||
return Primitives::gradient3D({0.0f, -1.0f, 0.0f}, colorA, {0.0f, 1.0f, 0.0f}, colorB); |
||||
} |
||||
|
||||
}} |
||||
@ -0,0 +1,121 @@
|
||||
#ifndef Magnum_Primitives_Gradient_h |
||||
#define Magnum_Primitives_Gradient_h |
||||
/*
|
||||
This file is part of Magnum. |
||||
|
||||
Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 |
||||
Vladimír Vondruš <mosra@centrum.cz> |
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a |
||||
copy of this software and associated documentation files (the "Software"), |
||||
to deal in the Software without restriction, including without limitation |
||||
the rights 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 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER |
||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING |
||||
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER |
||||
DEALINGS IN THE SOFTWARE. |
||||
*/ |
||||
|
||||
/** @file
|
||||
* @brief Function @ref Magnum::Primitives::gradient2D(), @ref Magnum::Primitives::gradient2DHorizontal(), @ref Magnum::Primitives::gradient2DVertical(), @ref Magnum::Primitives::gradient3D(), @ref Magnum::Primitives::gradient3DHorizontal(), @ref Magnum::Primitives::gradient3DVertical() |
||||
*/ |
||||
|
||||
#include "Magnum/Magnum.h" |
||||
#include "Magnum/Primitives/visibility.h" |
||||
#include "Magnum/Trade/Trade.h" |
||||
|
||||
namespace Magnum { namespace Primitives { |
||||
|
||||
/**
|
||||
@brief 2D square with a gradient |
||||
|
||||
2x2 square with vertex colors. Non-indexed @ref MeshPrimitive::TriangleStrip. |
||||
Vertex colors correspond to the gradient defined by the endpoints @p a and |
||||
@p b, linearly interpolated from @p colorA to @p colorB. |
||||
|
||||
@image html primitives-gradient2d.png width=256px |
||||
|
||||
@see @ref gradient2DHorizontal(), @ref gradient2DVertical(), @ref gradient3D(), |
||||
@ref squareSolid() |
||||
*/ |
||||
MAGNUM_PRIMITIVES_EXPORT Trade::MeshData2D gradient2D(const Vector2& a, const Color4& colorA, const Vector2& b, const Color4& colorB); |
||||
|
||||
/**
|
||||
@brief 2D square with a horizontal gradient |
||||
|
||||
Equivalent to calling @ref gradient2D() like this: |
||||
|
||||
@snippet MagnumPrimitives.cpp gradient2DHorizontal |
||||
|
||||
@image html primitives-gradient2dhorizontal.png width=256px |
||||
|
||||
@see @ref gradient2DVertical(), @ref gradient3DHorizontal(), @ref squareSolid() |
||||
*/ |
||||
MAGNUM_PRIMITIVES_EXPORT Trade::MeshData2D gradient2DHorizontal(const Color4& colorLeft, const Color4& color); |
||||
|
||||
/**
|
||||
@brief 2D square with a vertical gradient |
||||
|
||||
Equivalent to calling @ref gradient2D() like this: |
||||
|
||||
@snippet MagnumPrimitives.cpp gradient2DVertical |
||||
|
||||
@image html primitives-gradient2dvertical.png width=256px |
||||
|
||||
@see @ref gradient2DHorizontal(), @ref gradient3DVertical(), @ref squareSolid() |
||||
*/ |
||||
MAGNUM_PRIMITIVES_EXPORT Trade::MeshData2D gradient2DVertical(const Color4& colorBottom, const Color4& colorTop); |
||||
|
||||
/**
|
||||
@brief 3D plane with a gradient |
||||
|
||||
2x2 plane with vertex colors. Non-indexed @ref MeshPrimitive::TriangleStrip on |
||||
the XY plane with normals in positive Z direction. Vertex colors correspond to |
||||
the gradient defined by the endpoints @p a and @p b, linearly interpolated from |
||||
@p colorA to @p colorB. |
||||
|
||||
@image html primitives-gradient3d.png width=256px |
||||
|
||||
@see @ref gradient3DHorizontal(), @ref gradient3DVertical(), @ref gradient2D(), |
||||
@ref planeSolid() |
||||
*/ |
||||
MAGNUM_PRIMITIVES_EXPORT Trade::MeshData3D gradient3D(const Vector3& a, const Color4& colorA, const Vector3& b, const Color4& colorB); |
||||
|
||||
/**
|
||||
@brief 3D plane with a horizontal gradient |
||||
|
||||
Equivalent to calling @ref gradient3D() like this: |
||||
|
||||
@snippet MagnumPrimitives.cpp gradient3DHorizontal |
||||
|
||||
@image html primitives-gradient3dhorizontal.png width=256px |
||||
|
||||
@see @ref gradient3DVertical(), @ref gradient2DHorizontal(), @ref planeSolid() |
||||
*/ |
||||
MAGNUM_PRIMITIVES_EXPORT Trade::MeshData3D gradient3DHorizontal(const Color4& colorLeft, const Color4& color); |
||||
|
||||
/**
|
||||
@brief 3D plane with a vertical gradient |
||||
|
||||
Equivalent to calling @ref gradient3D() like this: |
||||
|
||||
@snippet MagnumPrimitives.cpp gradient3DVertical |
||||
|
||||
@image html primitives-gradient3dvertical.png width=256px |
||||
|
||||
@see @ref gradient3DHorizontal(), @ref gradient2DVertical(), @ref planeSolid() |
||||
*/ |
||||
MAGNUM_PRIMITIVES_EXPORT Trade::MeshData3D gradient3DVertical(const Color4& colorBottom, const Color4& colorTop); |
||||
|
||||
}} |
||||
|
||||
#endif |
||||
@ -0,0 +1,167 @@
|
||||
/*
|
||||
This file is part of Magnum. |
||||
|
||||
Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 |
||||
Vladimír Vondruš <mosra@centrum.cz> |
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a |
||||
copy of this software and associated documentation files (the "Software"), |
||||
to deal in the Software without restriction, including without limitation |
||||
the rights 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 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER |
||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING |
||||
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER |
||||
DEALINGS IN THE SOFTWARE. |
||||
*/ |
||||
|
||||
#include <Corrade/TestSuite/Tester.h> |
||||
#include <Corrade/TestSuite/Compare/Container.h> |
||||
|
||||
#include "Magnum/Mesh.h" |
||||
#include "Magnum/Math/Color.h" |
||||
#include "Magnum/Primitives/Gradient.h" |
||||
#include "Magnum/Trade/MeshData2D.h" |
||||
#include "Magnum/Trade/MeshData3D.h" |
||||
#include "Magnum/Primitives/Square.h" |
||||
#include "Magnum/Primitives/Plane.h" |
||||
|
||||
namespace Magnum { namespace Primitives { namespace Test { |
||||
|
||||
struct GradientTest: TestSuite::Tester { |
||||
explicit GradientTest(); |
||||
|
||||
void gradient2D(); |
||||
void gradient2DHorizontal(); |
||||
void gradient2DVertical(); |
||||
|
||||
void gradient3D(); |
||||
void gradient3DHorizontal(); |
||||
void gradient3DVertical(); |
||||
}; |
||||
|
||||
GradientTest::GradientTest() { |
||||
addTests({&GradientTest::gradient2D, |
||||
&GradientTest::gradient2DHorizontal, |
||||
&GradientTest::gradient2DVertical, |
||||
|
||||
&GradientTest::gradient3D, |
||||
&GradientTest::gradient3DHorizontal, |
||||
&GradientTest::gradient3DVertical}); |
||||
} |
||||
|
||||
using namespace Magnum::Math::Literals; |
||||
|
||||
void GradientTest::gradient2D() { |
||||
/* The corners sould have 0.2, 0.4, 0.6, 0.8 blends */ |
||||
Trade::MeshData2D gradient = Primitives::gradient2D( |
||||
{-1.0f, 2.0f}, {0.2f, 0.6f, 1.0f}, |
||||
{1.0f, -2.0f}, {0.4f, 1.0f, 0.0f}); |
||||
|
||||
/* Positions should be the same as for a square */ |
||||
Trade::MeshData2D square = Primitives::squareSolid(); |
||||
CORRADE_COMPARE(gradient.primitive(), square.primitive()); |
||||
CORRADE_COMPARE_AS(gradient.positions(0), square.positions(0), TestSuite::Compare::Container); |
||||
CORRADE_COMPARE_AS(gradient.positions(0), (std::vector<Vector2>{ |
||||
{ 1.0f, -1.0f}, /* Bottom right */ |
||||
{ 1.0f, 1.0f}, /* Top right */ |
||||
{-1.0f, -1.0f}, /* Bottom left */ |
||||
{-1.0f, 1.0f} /* Top left */ |
||||
}), TestSuite::Compare::Container); |
||||
|
||||
CORRADE_COMPARE(gradient.colorArrayCount(), 1); |
||||
CORRADE_COMPARE_AS(gradient.colors(0), (std::vector<Color4>{ |
||||
{0.36f, 0.92f, 0.2f}, /* 80% */ |
||||
{0.28f, 0.76f, 0.6f}, /* 40% */ |
||||
{0.32f, 0.84f, 0.4f}, /* 60% */ |
||||
{0.24f, 0.68f, 0.8f} /* 20% */ |
||||
}), TestSuite::Compare::Container); |
||||
} |
||||
|
||||
void GradientTest::gradient2DHorizontal() { |
||||
Trade::MeshData2D gradient = Primitives::gradient2DHorizontal(0xfabcde_srgbf, 0xdeab09_srgbf); |
||||
|
||||
CORRADE_COMPARE(gradient.colorArrayCount(), 1); |
||||
CORRADE_COMPARE_AS(gradient.colors(0), (std::vector<Color4>{ |
||||
0xdeab09_srgbf, |
||||
0xdeab09_srgbf, |
||||
0xfabcde_srgbf, |
||||
0xfabcde_srgbf |
||||
}), TestSuite::Compare::Container); |
||||
} |
||||
|
||||
void GradientTest::gradient2DVertical() { |
||||
Trade::MeshData2D gradient = Primitives::gradient2DVertical(0xfabcde_srgbf, 0xdeab09_srgbf); |
||||
|
||||
CORRADE_COMPARE(gradient.colorArrayCount(), 1); |
||||
CORRADE_COMPARE_AS(gradient.colors(0), (std::vector<Color4>{ |
||||
0xfabcde_srgbf, |
||||
0xdeab09_srgbf, |
||||
0xfabcde_srgbf, |
||||
0xdeab09_srgbf |
||||
}), TestSuite::Compare::Container); |
||||
} |
||||
|
||||
void GradientTest::gradient3D() { |
||||
/* The corners sould have 0.2, 0.4, 0.6, 0.8 blends */ |
||||
Trade::MeshData3D gradient = Primitives::gradient3D( |
||||
{-1.0f, 2.0f, -1.5f}, {0.2f, 0.6f, 1.0f}, |
||||
{1.0f, -2.0f, -1.5f}, {0.4f, 1.0f, 0.0f}); |
||||
|
||||
/* Positions should be the same as for a plane */ |
||||
Trade::MeshData3D plane = Primitives::planeSolid(); |
||||
CORRADE_COMPARE(gradient.primitive(), plane.primitive()); |
||||
CORRADE_COMPARE_AS(gradient.positions(0), plane.positions(0), TestSuite::Compare::Container); |
||||
CORRADE_COMPARE_AS(gradient.positions(0), (std::vector<Vector3>{ |
||||
{ 1.0f, -1.0f, 0.0f}, /* Bottom right */ |
||||
{ 1.0f, 1.0f, 0.0f}, /* Top right */ |
||||
{-1.0f, -1.0f, 0.0f}, /* Bottom left */ |
||||
{-1.0f, 1.0f, 0.0f} /* Top left */ |
||||
}), TestSuite::Compare::Container); |
||||
|
||||
CORRADE_COMPARE(gradient.normalArrayCount(), 1); |
||||
|
||||
CORRADE_COMPARE(gradient.colorArrayCount(), 1); |
||||
CORRADE_COMPARE_AS(gradient.colors(0), (std::vector<Color4>{ |
||||
{0.36f, 0.92f, 0.2f}, /* 80% */ |
||||
{0.28f, 0.76f, 0.6f}, /* 40% */ |
||||
{0.32f, 0.84f, 0.4f}, /* 60% */ |
||||
{0.24f, 0.68f, 0.8f} /* 20% */ |
||||
}), TestSuite::Compare::Container); |
||||
} |
||||
|
||||
void GradientTest::gradient3DHorizontal() { |
||||
Trade::MeshData3D gradient = Primitives::gradient3DHorizontal(0xfabcde_srgbf, 0xdeab09_srgbf); |
||||
|
||||
CORRADE_COMPARE(gradient.colorArrayCount(), 1); |
||||
CORRADE_COMPARE_AS(gradient.colors(0), (std::vector<Color4>{ |
||||
0xdeab09_srgbf, |
||||
0xdeab09_srgbf, |
||||
0xfabcde_srgbf, |
||||
0xfabcde_srgbf |
||||
}), TestSuite::Compare::Container); |
||||
} |
||||
|
||||
void GradientTest::gradient3DVertical() { |
||||
Trade::MeshData3D gradient = Primitives::gradient3DVertical(0xfabcde_srgbf, 0xdeab09_srgbf); |
||||
|
||||
CORRADE_COMPARE(gradient.colorArrayCount(), 1); |
||||
CORRADE_COMPARE_AS(gradient.colors(0), (std::vector<Color4>{ |
||||
0xfabcde_srgbf, |
||||
0xdeab09_srgbf, |
||||
0xfabcde_srgbf, |
||||
0xdeab09_srgbf |
||||
}), TestSuite::Compare::Container); |
||||
} |
||||
|
||||
}}} |
||||
|
||||
CORRADE_TEST_MAIN(Magnum::Primitives::Test::GradientTest) |
||||
Loading…
Reference in new issue