mirror of https://github.com/mosra/magnum.git
Browse Source
The virtual method is moved to doRenderGlyph(), for plugin implementers it means that the function only needs to be renamed (and moved to private section) and plugin version interface needs to be updated. The common layouting code allows to remove many redundant code from Renderer and also ability to test cursor position/bounding rectangle updated properly. Rectangle updating now treats rectangle with zero size as invalid and replaces it with glyph quad instead of merging the two. It means that the returned rectangle now wraps the text more tightly and does not always contain origin.pull/34/head
Vladimír Vondruš
13 years ago
9 changed files with 182 additions and 88 deletions
@ -0,0 +1,85 @@ |
|||||||
|
/*
|
||||||
|
This file is part of Magnum. |
||||||
|
|
||||||
|
Copyright © 2010, 2011, 2012, 2013 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 <TestSuite/Tester.h> |
||||||
|
|
||||||
|
#include "Math/Geometry/Rectangle.h" |
||||||
|
#include "Text/AbstractFont.h" |
||||||
|
|
||||||
|
namespace Magnum { namespace Text { namespace Test { |
||||||
|
|
||||||
|
class AbstractLayouterTest: public TestSuite::Tester { |
||||||
|
public: |
||||||
|
explicit AbstractLayouterTest(); |
||||||
|
|
||||||
|
void renderGlyph(); |
||||||
|
}; |
||||||
|
|
||||||
|
AbstractLayouterTest::AbstractLayouterTest() { |
||||||
|
addTests({&AbstractLayouterTest::renderGlyph}); |
||||||
|
} |
||||||
|
|
||||||
|
void AbstractLayouterTest::renderGlyph() { |
||||||
|
class Layouter: public AbstractLayouter { |
||||||
|
public: |
||||||
|
explicit Layouter(): AbstractLayouter(3) {} |
||||||
|
|
||||||
|
private: |
||||||
|
std::tuple<Rectangle, Rectangle, Vector2> doRenderGlyph(UnsignedInt) override { |
||||||
|
return std::make_tuple(Rectangle({1.0f, 0.5f}, {1.1f, 1.0f}), |
||||||
|
Rectangle({0.3f, 1.1f}, {-0.5f, 0.7f}), |
||||||
|
Vector2(2.0f, -1.0f)); |
||||||
|
} |
||||||
|
}; |
||||||
|
|
||||||
|
/* Rectangle of zero size shouldn't be merged, but replaced */ |
||||||
|
Rectangle rectangle({-1.0f, -1.0f}, {-1.0f, -1.0f}); |
||||||
|
Vector2 cursorPosition(1.0f, 2.0f); |
||||||
|
|
||||||
|
Layouter l; |
||||||
|
Rectangle quadPosition; |
||||||
|
Rectangle textureCoords; |
||||||
|
|
||||||
|
std::tie(quadPosition, textureCoords) = l.renderGlyph(0, cursorPosition, rectangle); |
||||||
|
CORRADE_COMPARE(quadPosition, Rectangle({2.0f, 2.5f}, {2.1f, 3.0f})); |
||||||
|
CORRADE_COMPARE(textureCoords, Rectangle({0.3f, 1.1f}, {-0.5f, 0.7f})); |
||||||
|
CORRADE_COMPARE(cursorPosition, Vector2(3.0f, 1.0f)); |
||||||
|
CORRADE_COMPARE(rectangle, Rectangle({2.0f, 2.5f}, {2.1f, 3.0f})); |
||||||
|
|
||||||
|
std::tie(quadPosition, textureCoords) = l.renderGlyph(1, cursorPosition, rectangle); |
||||||
|
CORRADE_COMPARE(quadPosition, Rectangle({4.0f, 1.5f}, {4.1f, 2.0f})); |
||||||
|
CORRADE_COMPARE(textureCoords, Rectangle({0.3f, 1.1f}, {-0.5f, 0.7f})); |
||||||
|
CORRADE_COMPARE(cursorPosition, Vector2(5.0f, 0.0f)); |
||||||
|
CORRADE_COMPARE(rectangle, Rectangle({2.0f, 1.5f}, {4.1f, 3.0f})); |
||||||
|
|
||||||
|
std::tie(quadPosition, textureCoords) = l.renderGlyph(2, cursorPosition, rectangle); |
||||||
|
CORRADE_COMPARE(quadPosition, Rectangle({6.0f, 0.5f}, {6.1f, 1.0f})); |
||||||
|
CORRADE_COMPARE(textureCoords, Rectangle({0.3f, 1.1f}, {-0.5f, 0.7f})); |
||||||
|
CORRADE_COMPARE(cursorPosition, Vector2(7.0f, -1.0f)); |
||||||
|
CORRADE_COMPARE(rectangle, Rectangle({2.0f, 0.5f}, {6.1f, 3.0f})); |
||||||
|
} |
||||||
|
|
||||||
|
}}} |
||||||
|
|
||||||
|
CORRADE_TEST_MAIN(Magnum::Text::Test::AbstractLayouterTest) |
||||||
Loading…
Reference in new issue