|
|
|
|
/*
|
|
|
|
|
This file is part of Magnum.
|
|
|
|
|
|
|
|
|
|
Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019,
|
|
|
|
|
2020, 2021, 2022, 2023 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 <sstream>
|
|
|
|
|
#include <Corrade/Containers/Optional.h>
|
|
|
|
|
#include <Corrade/Containers/StridedArrayView.h>
|
|
|
|
|
#include <Corrade/Containers/String.h>
|
|
|
|
|
#include <Corrade/Containers/StringStl.h> /** @todo remove once AbstractFontConverter is STL-free */
|
|
|
|
|
#include <Corrade/TestSuite/Tester.h>
|
|
|
|
|
#include <Corrade/TestSuite/Compare/File.h>
|
|
|
|
|
#include <Corrade/Utility/Algorithms.h>
|
|
|
|
|
#include <Corrade/Utility/DebugStl.h>
|
|
|
|
|
#include <Corrade/Utility/Path.h>
|
|
|
|
|
|
|
|
|
|
#include "Magnum/Image.h"
|
|
|
|
|
#include "Magnum/ImageView.h"
|
Pixel storage support, part 2: renamed ColorFormat to PixelFormat etc.
Yeah, sorry, I know, the enums are renamed for second or third time in a
row, first they were Image::Format, then ImageFormat, then ColorFormat
and now PixelFormat. But this time it's final and last time they are
renamed and now everything is finally consistent:
* ColorFormat::DepthComponent -- depth is not a color, thus
PixelFormat::DepthComponent makes a lot more sense.
* There will be PixelStorage classes, which will be stored in images
alonside PixelFormat/PixelType enums, making everything nicely
aligned.
* The GL documentation about glTexImage2D() etc. denotes the <format>
and <type> parameters as format and type of *pixel* data, so now we
are _finally_ consistent with the official naming.
I wonder why did I not choose PixelFormat originally. Anyway, the old
<Magnum/ColorFormat.h> header, ColorFormat, ColorType and
CompressedColorFormat types are now aliases to the new ones, are marked
as deprecated and will be removed in some future release (as always, I'm
waiting at least six months before removing the deprecated
functionality).
11 years ago
|
|
|
#include "Magnum/PixelFormat.h"
|
|
|
|
|
#include "Magnum/DebugTools/CompareImage.h"
|
|
|
|
|
#include "Magnum/Math/Range.h"
|
|
|
|
|
#include "Magnum/Text/AbstractGlyphCache.h"
|
|
|
|
|
#include "Magnum/Text/AbstractFont.h"
|
plugins: new testing workflow.
The current testing workflow had quite a few major flaws and it was no
longer possible after the move of Any* plugins to core. Among the flaws
is:
* Every plugin was basically built twice, once as the real plugin and
once as a static testing library. Most of the build shared common
object files, but nevertheless it inflated build times and made the
buildsystem extremely complex.
* Because the actual plugin binary was never actually loaded during the
test, it couldn't spot problems like:
- undefined references
- errors in metadata files
- mismatched plugin interface/version, missing entry points
- broken static plugin import files
* Tests that made use of independent plugins (such as TgaImageConverter
test using TgaImporter to verify the output) had a hardcoded
dependency on such plugins, making a minimal setup very hard.
* Dynamic loading of plugins from the Any* proxies was always directed
to the install location on the filesystem with no possibility to
load these directly from the build tree. That caused random ABI
mismatch crashes, or, on the other hand, if no plugins were
installed, particular portions of the codebase weren't tested at all.
Now the workflow is the following:
* Every plugin is built exactly once, either as dynamic or as static.
* The test always loads it via the plugin manager. If it's dynamic,
it's loaded straight from the build directory; if it's static, it
gets linked to the test executable directly.
* Plugins used indirectly are always served from the build directory
(if enabled) to ensure reproducibility and independence on what's
installed on the filesystem. Missing presence of these plugins causes
particular tests to be simply skipped.
* Plugins that have extensive tests for internal functionality that's
not exposed through the plugin interface are still built in two
parts, but the internal tests are simply consuming the OBJECT files
directly instead of linking to a static library.
8 years ago
|
|
|
#include "Magnum/Text/AbstractFontConverter.h"
|
Text: new AbstractShaper interface for shaping.
Replaces the previous, grossly inefficient AbstractLayouter which was
performing one virtual call per glyph (!). It's now also reusable,
meaning it doesn't need to be allocated anew for every new shaped text,
and it no longer requires each and every font plugin to implement the
same redundant glyph data fetching from the glyph cache, scaling etc. --
all that is meant to be done by the users of AbstractShaper, i.e.
Renderer. The independency on a glyph cache theorerically also means it
can be used for a completely different, non-texture-based way to render
text (such as direct path drawing directly on the GPU), although I won't
be exploring that path now.
It also exposes an interface for specifying script, language,
direction and typographic features. Such interface will be currently
only implemented in HarfBuzz, but that's the intent -- to provide a
flexible enough interface to support all possible use cases that a font
or a font plugin may support, instead of exposing a least common
denominator and then having no easy way to shape a text in a non-Latin
script or use a fancy OpenType feature the chosen font has.
The old public interface is preserved for backwards compatibility,
marked as deprecated, however the virtual APIs are not, as supporting
that would be too nasty. I don't think any user code ever implemented a
font plugin so this should be okay.
To ensure smooth transition with no regressions, the Renderer class and
MagnumFont tests still use the old API in this commit, and their test
pass the same way as they did before (except for two removed MagnumFont
test cases which tested errors that are now an assertion in the
deprecated layout() API and thus cannot be tested from the plugin
anymore). Porting them away from the deprecated API will be done in
separate commits.
3 years ago
|
|
|
#include "Magnum/Text/AbstractShaper.h"
|
plugins: new testing workflow.
The current testing workflow had quite a few major flaws and it was no
longer possible after the move of Any* plugins to core. Among the flaws
is:
* Every plugin was basically built twice, once as the real plugin and
once as a static testing library. Most of the build shared common
object files, but nevertheless it inflated build times and made the
buildsystem extremely complex.
* Because the actual plugin binary was never actually loaded during the
test, it couldn't spot problems like:
- undefined references
- errors in metadata files
- mismatched plugin interface/version, missing entry points
- broken static plugin import files
* Tests that made use of independent plugins (such as TgaImageConverter
test using TgaImporter to verify the output) had a hardcoded
dependency on such plugins, making a minimal setup very hard.
* Dynamic loading of plugins from the Any* proxies was always directed
to the install location on the filesystem with no possibility to
load these directly from the build tree. That caused random ABI
mismatch crashes, or, on the other hand, if no plugins were
installed, particular portions of the codebase weren't tested at all.
Now the workflow is the following:
* Every plugin is built exactly once, either as dynamic or as static.
* The test always loads it via the plugin manager. If it's dynamic,
it's loaded straight from the build directory; if it's static, it
gets linked to the test executable directly.
* Plugins used indirectly are always served from the build directory
(if enabled) to ensure reproducibility and independence on what's
installed on the filesystem. Missing presence of these plugins causes
particular tests to be simply skipped.
* Plugins that have extensive tests for internal functionality that's
not exposed through the plugin interface are still built in two
parts, but the internal tests are simply consuming the OBJECT files
directly instead of linking to a static library.
8 years ago
|
|
|
#include "Magnum/Trade/AbstractImageConverter.h"
|
|
|
|
|
#include "Magnum/Trade/AbstractImporter.h"
|
|
|
|
|
#include "Magnum/Trade/ImageData.h"
|
|
|
|
|
|
|
|
|
|
#include "configure.h"
|
|
|
|
|
|
|
|
|
|
namespace Magnum { namespace Text { namespace Test { namespace {
|
|
|
|
|
|
|
|
|
|
struct MagnumFontConverterTest: TestSuite::Tester {
|
|
|
|
|
explicit MagnumFontConverterTest();
|
|
|
|
|
|
|
|
|
|
void exportFont();
|
|
|
|
|
#ifdef MAGNUM_BUILD_DEPRECATED
|
|
|
|
|
void exportFontOldStyleCache();
|
|
|
|
|
#endif
|
|
|
|
|
void exportFontEmptyCache();
|
|
|
|
|
void exportFontImageProcessingGlyphCache();
|
|
|
|
|
void exportFontImageProcessingGlyphCacheNoDownload();
|
|
|
|
|
|
|
|
|
|
void exportFontArrayCache();
|
|
|
|
|
void exportFontNotFoundInCache();
|
|
|
|
|
void exportFontImageConversionFailed();
|
plugins: new testing workflow.
The current testing workflow had quite a few major flaws and it was no
longer possible after the move of Any* plugins to core. Among the flaws
is:
* Every plugin was basically built twice, once as the real plugin and
once as a static testing library. Most of the build shared common
object files, but nevertheless it inflated build times and made the
buildsystem extremely complex.
* Because the actual plugin binary was never actually loaded during the
test, it couldn't spot problems like:
- undefined references
- errors in metadata files
- mismatched plugin interface/version, missing entry points
- broken static plugin import files
* Tests that made use of independent plugins (such as TgaImageConverter
test using TgaImporter to verify the output) had a hardcoded
dependency on such plugins, making a minimal setup very hard.
* Dynamic loading of plugins from the Any* proxies was always directed
to the install location on the filesystem with no possibility to
load these directly from the build tree. That caused random ABI
mismatch crashes, or, on the other hand, if no plugins were
installed, particular portions of the codebase weren't tested at all.
Now the workflow is the following:
* Every plugin is built exactly once, either as dynamic or as static.
* The test always loads it via the plugin manager. If it's dynamic,
it's loaded straight from the build directory; if it's static, it
gets linked to the test executable directly.
* Plugins used indirectly are always served from the build directory
(if enabled) to ensure reproducibility and independence on what's
installed on the filesystem. Missing presence of these plugins causes
particular tests to be simply skipped.
* Plugins that have extensive tests for internal functionality that's
not exposed through the plugin interface are still built in two
parts, but the internal tests are simply consuming the OBJECT files
directly instead of linking to a static library.
8 years ago
|
|
|
|
|
|
|
|
/* Explicitly forbid system-wide plugin dependencies */
|
|
|
|
|
PluginManager::Manager<Trade::AbstractImageConverter> _imageConverterManager{"nonexistent"};
|
|
|
|
|
PluginManager::Manager<AbstractFontConverter> _fontConverterManager{"nonexistent"};
|
|
|
|
|
PluginManager::Manager<Trade::AbstractImporter> _importerManager{"nonexistent"};
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
MagnumFontConverterTest::MagnumFontConverterTest() {
|
|
|
|
|
addTests({&MagnumFontConverterTest::exportFont,
|
|
|
|
|
#ifdef MAGNUM_BUILD_DEPRECATED
|
|
|
|
|
&MagnumFontConverterTest::exportFontOldStyleCache,
|
|
|
|
|
#endif
|
|
|
|
|
&MagnumFontConverterTest::exportFontEmptyCache,
|
|
|
|
|
&MagnumFontConverterTest::exportFontImageProcessingGlyphCache,
|
|
|
|
|
&MagnumFontConverterTest::exportFontImageProcessingGlyphCacheNoDownload,
|
|
|
|
|
|
|
|
|
|
&MagnumFontConverterTest::exportFontArrayCache,
|
|
|
|
|
&MagnumFontConverterTest::exportFontNotFoundInCache,
|
|
|
|
|
&MagnumFontConverterTest::exportFontImageConversionFailed});
|
plugins: new testing workflow.
The current testing workflow had quite a few major flaws and it was no
longer possible after the move of Any* plugins to core. Among the flaws
is:
* Every plugin was basically built twice, once as the real plugin and
once as a static testing library. Most of the build shared common
object files, but nevertheless it inflated build times and made the
buildsystem extremely complex.
* Because the actual plugin binary was never actually loaded during the
test, it couldn't spot problems like:
- undefined references
- errors in metadata files
- mismatched plugin interface/version, missing entry points
- broken static plugin import files
* Tests that made use of independent plugins (such as TgaImageConverter
test using TgaImporter to verify the output) had a hardcoded
dependency on such plugins, making a minimal setup very hard.
* Dynamic loading of plugins from the Any* proxies was always directed
to the install location on the filesystem with no possibility to
load these directly from the build tree. That caused random ABI
mismatch crashes, or, on the other hand, if no plugins were
installed, particular portions of the codebase weren't tested at all.
Now the workflow is the following:
* Every plugin is built exactly once, either as dynamic or as static.
* The test always loads it via the plugin manager. If it's dynamic,
it's loaded straight from the build directory; if it's static, it
gets linked to the test executable directly.
* Plugins used indirectly are always served from the build directory
(if enabled) to ensure reproducibility and independence on what's
installed on the filesystem. Missing presence of these plugins causes
particular tests to be simply skipped.
* Plugins that have extensive tests for internal functionality that's
not exposed through the plugin interface are still built in two
parts, but the internal tests are simply consuming the OBJECT files
directly instead of linking to a static library.
8 years ago
|
|
|
|
|
|
|
|
/* Load the plugins directly from the build tree. Otherwise they're either
|
|
|
|
|
static and already loaded or not present in the build tree. */
|
|
|
|
|
_fontConverterManager.registerExternalManager(_imageConverterManager);
|
plugins: new testing workflow.
The current testing workflow had quite a few major flaws and it was no
longer possible after the move of Any* plugins to core. Among the flaws
is:
* Every plugin was basically built twice, once as the real plugin and
once as a static testing library. Most of the build shared common
object files, but nevertheless it inflated build times and made the
buildsystem extremely complex.
* Because the actual plugin binary was never actually loaded during the
test, it couldn't spot problems like:
- undefined references
- errors in metadata files
- mismatched plugin interface/version, missing entry points
- broken static plugin import files
* Tests that made use of independent plugins (such as TgaImageConverter
test using TgaImporter to verify the output) had a hardcoded
dependency on such plugins, making a minimal setup very hard.
* Dynamic loading of plugins from the Any* proxies was always directed
to the install location on the filesystem with no possibility to
load these directly from the build tree. That caused random ABI
mismatch crashes, or, on the other hand, if no plugins were
installed, particular portions of the codebase weren't tested at all.
Now the workflow is the following:
* Every plugin is built exactly once, either as dynamic or as static.
* The test always loads it via the plugin manager. If it's dynamic,
it's loaded straight from the build directory; if it's static, it
gets linked to the test executable directly.
* Plugins used indirectly are always served from the build directory
(if enabled) to ensure reproducibility and independence on what's
installed on the filesystem. Missing presence of these plugins causes
particular tests to be simply skipped.
* Plugins that have extensive tests for internal functionality that's
not exposed through the plugin interface are still built in two
parts, but the internal tests are simply consuming the OBJECT files
directly instead of linking to a static library.
8 years ago
|
|
|
#if defined(TGAIMAGECONVERTER_PLUGIN_FILENAME) && defined(MAGNUMFONTCONVERTER_PLUGIN_FILENAME)
|
|
|
|
|
CORRADE_INTERNAL_ASSERT_OUTPUT(_imageConverterManager.load(TGAIMAGECONVERTER_PLUGIN_FILENAME) & PluginManager::LoadState::Loaded);
|
|
|
|
|
CORRADE_INTERNAL_ASSERT_OUTPUT(_fontConverterManager.load(MAGNUMFONTCONVERTER_PLUGIN_FILENAME) & PluginManager::LoadState::Loaded);
|
plugins: new testing workflow.
The current testing workflow had quite a few major flaws and it was no
longer possible after the move of Any* plugins to core. Among the flaws
is:
* Every plugin was basically built twice, once as the real plugin and
once as a static testing library. Most of the build shared common
object files, but nevertheless it inflated build times and made the
buildsystem extremely complex.
* Because the actual plugin binary was never actually loaded during the
test, it couldn't spot problems like:
- undefined references
- errors in metadata files
- mismatched plugin interface/version, missing entry points
- broken static plugin import files
* Tests that made use of independent plugins (such as TgaImageConverter
test using TgaImporter to verify the output) had a hardcoded
dependency on such plugins, making a minimal setup very hard.
* Dynamic loading of plugins from the Any* proxies was always directed
to the install location on the filesystem with no possibility to
load these directly from the build tree. That caused random ABI
mismatch crashes, or, on the other hand, if no plugins were
installed, particular portions of the codebase weren't tested at all.
Now the workflow is the following:
* Every plugin is built exactly once, either as dynamic or as static.
* The test always loads it via the plugin manager. If it's dynamic,
it's loaded straight from the build directory; if it's static, it
gets linked to the test executable directly.
* Plugins used indirectly are always served from the build directory
(if enabled) to ensure reproducibility and independence on what's
installed on the filesystem. Missing presence of these plugins causes
particular tests to be simply skipped.
* Plugins that have extensive tests for internal functionality that's
not exposed through the plugin interface are still built in two
parts, but the internal tests are simply consuming the OBJECT files
directly instead of linking to a static library.
8 years ago
|
|
|
#endif
|
|
|
|
|
/* Optional plugins that don't have to be here */
|
|
|
|
|
#ifdef ANYIMAGEIMPORTER_PLUGIN_FILENAME
|
|
|
|
|
CORRADE_INTERNAL_ASSERT_OUTPUT(_importerManager.load(ANYIMAGEIMPORTER_PLUGIN_FILENAME) & PluginManager::LoadState::Loaded);
|
|
|
|
|
#endif
|
plugins: new testing workflow.
The current testing workflow had quite a few major flaws and it was no
longer possible after the move of Any* plugins to core. Among the flaws
is:
* Every plugin was basically built twice, once as the real plugin and
once as a static testing library. Most of the build shared common
object files, but nevertheless it inflated build times and made the
buildsystem extremely complex.
* Because the actual plugin binary was never actually loaded during the
test, it couldn't spot problems like:
- undefined references
- errors in metadata files
- mismatched plugin interface/version, missing entry points
- broken static plugin import files
* Tests that made use of independent plugins (such as TgaImageConverter
test using TgaImporter to verify the output) had a hardcoded
dependency on such plugins, making a minimal setup very hard.
* Dynamic loading of plugins from the Any* proxies was always directed
to the install location on the filesystem with no possibility to
load these directly from the build tree. That caused random ABI
mismatch crashes, or, on the other hand, if no plugins were
installed, particular portions of the codebase weren't tested at all.
Now the workflow is the following:
* Every plugin is built exactly once, either as dynamic or as static.
* The test always loads it via the plugin manager. If it's dynamic,
it's loaded straight from the build directory; if it's static, it
gets linked to the test executable directly.
* Plugins used indirectly are always served from the build directory
(if enabled) to ensure reproducibility and independence on what's
installed on the filesystem. Missing presence of these plugins causes
particular tests to be simply skipped.
* Plugins that have extensive tests for internal functionality that's
not exposed through the plugin interface are still built in two
parts, but the internal tests are simply consuming the OBJECT files
directly instead of linking to a static library.
8 years ago
|
|
|
#ifdef TGAIMPORTER_PLUGIN_FILENAME
|
|
|
|
|
CORRADE_INTERNAL_ASSERT_OUTPUT(_importerManager.load(TGAIMPORTER_PLUGIN_FILENAME) & PluginManager::LoadState::Loaded);
|
plugins: new testing workflow.
The current testing workflow had quite a few major flaws and it was no
longer possible after the move of Any* plugins to core. Among the flaws
is:
* Every plugin was basically built twice, once as the real plugin and
once as a static testing library. Most of the build shared common
object files, but nevertheless it inflated build times and made the
buildsystem extremely complex.
* Because the actual plugin binary was never actually loaded during the
test, it couldn't spot problems like:
- undefined references
- errors in metadata files
- mismatched plugin interface/version, missing entry points
- broken static plugin import files
* Tests that made use of independent plugins (such as TgaImageConverter
test using TgaImporter to verify the output) had a hardcoded
dependency on such plugins, making a minimal setup very hard.
* Dynamic loading of plugins from the Any* proxies was always directed
to the install location on the filesystem with no possibility to
load these directly from the build tree. That caused random ABI
mismatch crashes, or, on the other hand, if no plugins were
installed, particular portions of the codebase weren't tested at all.
Now the workflow is the following:
* Every plugin is built exactly once, either as dynamic or as static.
* The test always loads it via the plugin manager. If it's dynamic,
it's loaded straight from the build directory; if it's static, it
gets linked to the test executable directly.
* Plugins used indirectly are always served from the build directory
(if enabled) to ensure reproducibility and independence on what's
installed on the filesystem. Missing presence of these plugins causes
particular tests to be simply skipped.
* Plugins that have extensive tests for internal functionality that's
not exposed through the plugin interface are still built in two
parts, but the internal tests are simply consuming the OBJECT files
directly instead of linking to a static library.
8 years ago
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
/* Create the output directory if it doesn't exist yet */
|
|
|
|
|
CORRADE_INTERNAL_ASSERT_OUTPUT(Utility::Path::make(MAGNUMFONTCONVERTER_TEST_WRITE_DIR));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
class MyFont: public Text::AbstractFont {
|
|
|
|
|
private:
|
|
|
|
|
void doClose() override { _opened = false; }
|
|
|
|
|
bool doIsOpened() const override { return _opened; }
|
|
|
|
|
Properties doOpenFile(Containers::StringView, Float) override {
|
|
|
|
|
_opened = true;
|
|
|
|
|
return {16.0f, 25.0f, -10.0f, 39.7333f, 4};
|
|
|
|
|
}
|
|
|
|
|
FontFeatures doFeatures() const override { return {}; }
|
Text: new AbstractShaper interface for shaping.
Replaces the previous, grossly inefficient AbstractLayouter which was
performing one virtual call per glyph (!). It's now also reusable,
meaning it doesn't need to be allocated anew for every new shaped text,
and it no longer requires each and every font plugin to implement the
same redundant glyph data fetching from the glyph cache, scaling etc. --
all that is meant to be done by the users of AbstractShaper, i.e.
Renderer. The independency on a glyph cache theorerically also means it
can be used for a completely different, non-texture-based way to render
text (such as direct path drawing directly on the GPU), although I won't
be exploring that path now.
It also exposes an interface for specifying script, language,
direction and typographic features. Such interface will be currently
only implemented in HarfBuzz, but that's the intent -- to provide a
flexible enough interface to support all possible use cases that a font
or a font plugin may support, instead of exposing a least common
denominator and then having no easy way to shape a text in a non-Latin
script or use a fancy OpenType feature the chosen font has.
The old public interface is preserved for backwards compatibility,
marked as deprecated, however the virtual APIs are not, as supporting
that would be too nasty. I don't think any user code ever implemented a
font plugin so this should be okay.
To ensure smooth transition with no regressions, the Renderer class and
MagnumFont tests still use the old API in this commit, and their test
pass the same way as they did before (except for two removed MagnumFont
test cases which tested errors that are now an assertion in the
deprecated layout() API and thus cannot be tested from the plugin
anymore). Porting them away from the deprecated API will be done in
separate commits.
3 years ago
|
|
|
Containers::Pointer<AbstractShaper> doCreateShaper() override { return nullptr; }
|
|
|
|
|
|
|
|
|
|
UnsignedInt doGlyphId(const char32_t character) override {
|
|
|
|
|
switch(character) {
|
|
|
|
|
case U'W': return 2;
|
|
|
|
|
case U'e': return 1;
|
|
|
|
|
/* MSVC (but not clang-cl) doesn't support UTF-8 in char32_t
|
|
|
|
|
literals but it does it regular strings. Still a problem in
|
|
|
|
|
MSVC 2022, what a trash fire, can't you just give up on
|
|
|
|
|
those codepage insanities already, ffs?! */
|
|
|
|
|
#if defined(CORRADE_TARGET_MSVC) && !defined(CORRADE_TARGET_CLANG)
|
|
|
|
|
case U'\u011B':
|
|
|
|
|
#else
|
|
|
|
|
case U'ě':
|
|
|
|
|
#endif
|
|
|
|
|
return 3;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
Vector2 doGlyphSize(UnsignedInt) override { return {}; }
|
|
|
|
|
|
|
|
|
|
Vector2 doGlyphAdvance(const UnsignedInt glyph) override {
|
|
|
|
|
switch(glyph) {
|
|
|
|
|
case 0: return {8, 0};
|
|
|
|
|
case 1:
|
|
|
|
|
case 3: /* e and ě have the same advance */
|
|
|
|
|
return {12, 0};
|
|
|
|
|
case 2: return {23, 0};
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
CORRADE_INTERNAL_ASSERT_UNREACHABLE(); /* LCOV_EXCL_LINE */
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
bool _opened = false;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
void MagnumFontConverterTest::exportFont() {
|
|
|
|
|
Containers::String confFilename = Utility::Path::join(MAGNUMFONTCONVERTER_TEST_WRITE_DIR, "font.conf");
|
|
|
|
|
Containers::String tgaFilename = Utility::Path::join(MAGNUMFONTCONVERTER_TEST_WRITE_DIR, "font.tga");
|
|
|
|
|
/* Remove previously created files */
|
|
|
|
|
if(Utility::Path::exists(confFilename))
|
|
|
|
|
CORRADE_VERIFY(Utility::Path::remove(confFilename));
|
|
|
|
|
if(Utility::Path::exists(tgaFilename))
|
|
|
|
|
CORRADE_VERIFY(Utility::Path::remove(tgaFilename));
|
|
|
|
|
|
|
|
|
|
MyFont font;
|
|
|
|
|
font.openFile({}, {});
|
|
|
|
|
|
|
|
|
|
/* Create a cache. Two fonts, only the second one should be added. */
|
|
|
|
|
struct: AbstractGlyphCache {
|
|
|
|
|
using AbstractGlyphCache::AbstractGlyphCache;
|
|
|
|
|
|
|
|
|
|
GlyphCacheFeatures doFeatures() const override { return {}; }
|
|
|
|
|
void doSetImage(const Vector2i&, const ImageView2D&) override {}
|
|
|
|
|
} cache{PixelFormat::R8Unorm, {128, 64}, {16, 8}};
|
|
|
|
|
|
|
|
|
|
/* Override the not found glyph to be in bounds as well */
|
|
|
|
|
cache.setInvalidGlyph({}, {{16, 8}, {16, 8}});
|
|
|
|
|
|
|
|
|
|
/* This font and all its glyphs should be skipped */
|
|
|
|
|
UnsignedInt unusedFontId = cache.addFont(56);
|
|
|
|
|
cache.addGlyph(unusedFontId, 33, {16, 20}, {{60, 40}, {80, 50}});
|
|
|
|
|
|
|
|
|
|
UnsignedInt fontId = cache.addFont(25, &font);
|
|
|
|
|
cache.addGlyph(fontId, font.glyphId(U'W'), {25, 34}, {{16, 12}, {24, 56}});
|
|
|
|
|
cache.addGlyph(fontId, font.glyphId(U'e'), {25, 12}, {{36, 8}, {112, 40}});
|
|
|
|
|
/* ě has deliberately the same glyph data as e */
|
|
|
|
|
cache.addGlyph(fontId, font.glyphId(
|
|
|
|
|
/* MSVC (but not clang-cl) doesn't support UTF-8 in char32_t literals
|
|
|
|
|
but it does it regular strings. Still a problem in MSVC 2022, what a
|
|
|
|
|
trash fire, can't you just give up on those codepage insanities
|
|
|
|
|
already, ffs?! */
|
|
|
|
|
#if defined(CORRADE_TARGET_MSVC) && !defined(CORRADE_TARGET_CLANG)
|
|
|
|
|
U'\u011B'
|
|
|
|
|
#else
|
|
|
|
|
U'ě'
|
|
|
|
|
#endif
|
|
|
|
|
), {25, 12}, {{36, 8}, {112, 40}});
|
|
|
|
|
|
|
|
|
|
/* Set the cache image to some non-trivial contents. Compared to the
|
|
|
|
|
exportFontImageProcessingGlyphCache() test the image is 16x bigger, so
|
|
|
|
|
do some fancy expansion there. */
|
|
|
|
|
const char pixels[]{
|
|
|
|
|
'0', '1', '2', '3', '4', '5', '6', '7',
|
|
|
|
|
'8', '9', 'a', 'b', 'c', 'd', 'e', 'f',
|
|
|
|
|
'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n',
|
|
|
|
|
'o', 'p', 'q', 'r', 's', 't', 'u', 'v'
|
|
|
|
|
};
|
|
|
|
|
for(std::size_t y = 0; y != 16; ++y)
|
|
|
|
|
for(std::size_t x = 0; x != 16; ++x)
|
|
|
|
|
Utility::copy(
|
|
|
|
|
Containers::StridedArrayView2D<const char>{pixels, {4, 8}},
|
|
|
|
|
cache.image().pixels<char>()[0].exceptPrefix({y, x}).every({16, 16}));
|
|
|
|
|
|
|
|
|
|
/* Convert the file */
|
|
|
|
|
Containers::Pointer<AbstractFontConverter> converter = _fontConverterManager.instantiate("MagnumFontConverter");
|
|
|
|
|
CORRADE_VERIFY(converter->exportFontToFile(font, cache, Utility::Path::join(MAGNUMFONTCONVERTER_TEST_WRITE_DIR, "font"), "Waveě"));
|
|
|
|
|
|
|
|
|
|
/* Verify font parameters */
|
|
|
|
|
CORRADE_COMPARE_AS(confFilename,
|
|
|
|
|
Utility::Path::join(MAGNUMFONT_TEST_DIR, "font.conf"),
|
|
|
|
|
TestSuite::Compare::File);
|
|
|
|
|
|
|
|
|
|
if(!(_importerManager.loadState("AnyImageImporter") & PluginManager::LoadState::Loaded) ||
|
|
|
|
|
!(_importerManager.loadState("TgaImporter") & PluginManager::LoadState::Loaded))
|
|
|
|
|
CORRADE_SKIP("AnyImageImporter / TgaImporter plugins not found, not testing glyph cache contents");
|
|
|
|
|
|
|
|
|
|
/* Verify font image */
|
|
|
|
|
CORRADE_COMPARE_WITH(tgaFilename,
|
|
|
|
|
Utility::Path::join(MAGNUMFONT_TEST_DIR, "font.tga"),
|
|
|
|
|
DebugTools::CompareImageFile{_importerManager});
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#ifdef MAGNUM_BUILD_DEPRECATED
|
|
|
|
|
void MagnumFontConverterTest::exportFontOldStyleCache() {
|
|
|
|
|
/* Like exportFont(), but using the deprecated cache APIs to verify that
|
|
|
|
|
the cache contents are still copied the same */
|
|
|
|
|
|
|
|
|
|
Containers::String confFilename = Utility::Path::join(MAGNUMFONTCONVERTER_TEST_WRITE_DIR, "font.conf");
|
|
|
|
|
Containers::String tgaFilename = Utility::Path::join(MAGNUMFONTCONVERTER_TEST_WRITE_DIR, "font.tga");
|
|
|
|
|
/* Remove previously created files */
|
|
|
|
|
if(Utility::Path::exists(confFilename))
|
|
|
|
|
CORRADE_VERIFY(Utility::Path::remove(confFilename));
|
|
|
|
|
if(Utility::Path::exists(tgaFilename))
|
|
|
|
|
CORRADE_VERIFY(Utility::Path::remove(tgaFilename));
|
|
|
|
|
|
|
|
|
|
MyFont font;
|
|
|
|
|
font.openFile({}, {});
|
|
|
|
|
|
|
|
|
|
/* Create a cache the old way, i.e. insert() which results in exactly one
|
|
|
|
|
font added and no association with a pointer */
|
|
|
|
|
CORRADE_IGNORE_DEPRECATED_PUSH
|
|
|
|
|
struct: AbstractGlyphCache {
|
|
|
|
|
using AbstractGlyphCache::AbstractGlyphCache;
|
|
|
|
|
|
|
|
|
|
GlyphCacheFeatures doFeatures() const override { return {}; }
|
|
|
|
|
void doSetImage(const Vector2i&, const ImageView2D&) override {}
|
|
|
|
|
} cache{{128, 64}, {16, 8}};
|
|
|
|
|
/* Override the not found glyph to be in bounds as well */
|
|
|
|
|
cache.insert(0, {}, {{16, 8}, {16, 8}});
|
|
|
|
|
cache.insert(font.glyphId(U'W'), {25, 34}, {{16, 12}, {24, 56}});
|
|
|
|
|
cache.insert(font.glyphId(U'e'), {25, 12}, {{36, 8}, {112, 40}});
|
|
|
|
|
/* ě has deliberately the same glyph data as e */
|
|
|
|
|
cache.insert(font.glyphId(
|
|
|
|
|
/* MSVC (but not clang-cl) doesn't support UTF-8 in char32_t literals
|
|
|
|
|
but it does it regular strings. Still a problem in MSVC 2022, what a
|
|
|
|
|
trash fire, can't you just give up on those codepage insanities
|
|
|
|
|
already, ffs?! */
|
|
|
|
|
#if defined(CORRADE_TARGET_MSVC) && !defined(CORRADE_TARGET_CLANG)
|
|
|
|
|
U'\u011B'
|
|
|
|
|
#else
|
|
|
|
|
U'ě'
|
|
|
|
|
#endif
|
|
|
|
|
), {25, 12}, {{36, 8}, {112, 40}});
|
|
|
|
|
CORRADE_IGNORE_DEPRECATED_POP
|
|
|
|
|
|
|
|
|
|
/* Set the cache image to some non-trivial contents. There's no "old way"
|
|
|
|
|
to do this, also compared to the exportFontImageProcessingGlyphCache()
|
|
|
|
|
test the image is 16x bigger, so do some fancy expansion there. */
|
|
|
|
|
const char pixels[]{
|
|
|
|
|
'0', '1', '2', '3', '4', '5', '6', '7',
|
|
|
|
|
'8', '9', 'a', 'b', 'c', 'd', 'e', 'f',
|
|
|
|
|
'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n',
|
|
|
|
|
'o', 'p', 'q', 'r', 's', 't', 'u', 'v'
|
|
|
|
|
};
|
|
|
|
|
for(std::size_t y = 0; y != 16; ++y)
|
|
|
|
|
for(std::size_t x = 0; x != 16; ++x)
|
|
|
|
|
Utility::copy(
|
|
|
|
|
Containers::StridedArrayView2D<const char>{pixels, {4, 8}},
|
|
|
|
|
cache.image().pixels<char>()[0].exceptPrefix({y, x}).every({16, 16}));
|
|
|
|
|
|
|
|
|
|
/* Convert the file */
|
|
|
|
|
Containers::Pointer<AbstractFontConverter> converter = _fontConverterManager.instantiate("MagnumFontConverter");
|
|
|
|
|
CORRADE_VERIFY(converter->exportFontToFile(font, cache, Utility::Path::join(MAGNUMFONTCONVERTER_TEST_WRITE_DIR, "font"), "Waveě"));
|
|
|
|
|
|
|
|
|
|
/* Verify font parameters */
|
|
|
|
|
CORRADE_COMPARE_AS(confFilename,
|
|
|
|
|
Utility::Path::join(MAGNUMFONT_TEST_DIR, "font.conf"),
|
|
|
|
|
TestSuite::Compare::File);
|
|
|
|
|
|
|
|
|
|
if(!(_importerManager.loadState("AnyImageImporter") & PluginManager::LoadState::Loaded) ||
|
|
|
|
|
!(_importerManager.loadState("TgaImporter") & PluginManager::LoadState::Loaded))
|
|
|
|
|
CORRADE_SKIP("AnyImageImporter / TgaImporter plugins not found, not testing glyph cache contents");
|
|
|
|
|
|
|
|
|
|
/* Verify font image */
|
|
|
|
|
CORRADE_COMPARE_WITH(tgaFilename,
|
|
|
|
|
Utility::Path::join(MAGNUMFONT_TEST_DIR, "font.tga"),
|
|
|
|
|
DebugTools::CompareImageFile{_importerManager});
|
|
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
void MagnumFontConverterTest::exportFontEmptyCache() {
|
|
|
|
|
Containers::String confFilename = Utility::Path::join(MAGNUMFONTCONVERTER_TEST_WRITE_DIR, "font-empty-cache.conf");
|
|
|
|
|
Containers::String tgaFilename = Utility::Path::join(MAGNUMFONTCONVERTER_TEST_WRITE_DIR, "font-empty-cache.tga");
|
|
|
|
|
/* Remove previously created files */
|
|
|
|
|
if(Utility::Path::exists(confFilename))
|
|
|
|
|
CORRADE_VERIFY(Utility::Path::remove(confFilename));
|
|
|
|
|
if(Utility::Path::exists(tgaFilename))
|
|
|
|
|
CORRADE_VERIFY(Utility::Path::remove(tgaFilename));
|
|
|
|
|
|
|
|
|
|
MyFont font;
|
|
|
|
|
font.openFile({}, {});
|
|
|
|
|
|
|
|
|
|
struct: AbstractGlyphCache {
|
|
|
|
|
using AbstractGlyphCache::AbstractGlyphCache;
|
|
|
|
|
|
|
|
|
|
GlyphCacheFeatures doFeatures() const override { return {}; }
|
|
|
|
|
void doSetImage(const Vector2i&, const ImageView2D&) override {}
|
Text: make glyph caches pad by one pixel by default to avoid artifacts.
Took me quite a while to realize what was going on, but in retrospect
it's obvious -- the rasterizer just *rounds* the sub-pixel-positioned
glyph quads to nearest pixels. Which then can cause the neighboring
glyph data to leak to it (because the texture is then sampled not
directly on the edge pixel, but slightly outside of it), or it can also
cut away the edge, when it gets rounded in the other direction.
This was a problem with the original -- laughably inefficient -- atlas
packer as well, but because that packer had excessive padding around
everything, only the second edge-cutting artifact manifested, and that
one is rather subtle unless you know what to look for.
This means the packing is now slightly worse than before and sizes that
previously worked may no longer fit anymore. But since the new atlas
packer is relatively new (well, from September, time sure flies
different here), and the improvement compared to the original packer is
still quite massive, I don't think this is a problem.
2 years ago
|
|
|
/* Default padding is 1 to avoid artifacts, set that to 0 to simplify */
|
|
|
|
|
} cache{PixelFormat::R8Unorm, {8, 4}, {}};
|
|
|
|
|
|
|
|
|
|
/* Associate the font with the cache. The case where it's not even that is
|
|
|
|
|
tested in exportFontNotFoundInCache() below. */
|
|
|
|
|
cache.addFont(0, &font);
|
|
|
|
|
|
|
|
|
|
/* Convert the file */
|
|
|
|
|
Containers::Pointer<AbstractFontConverter> converter = _fontConverterManager.instantiate("MagnumFontConverter");
|
|
|
|
|
CORRADE_VERIFY(converter->exportFontToFile(font, cache, Utility::Path::join(MAGNUMFONTCONVERTER_TEST_WRITE_DIR, "font-empty-cache"), "Wave"));
|
|
|
|
|
|
|
|
|
|
/* Verify font parameters */
|
|
|
|
|
CORRADE_COMPARE_AS(confFilename,
|
|
|
|
|
Utility::Path::join(MAGNUMFONTCONVERTER_TEST_DIR, "font-empty-cache.conf"),
|
|
|
|
|
TestSuite::Compare::File);
|
|
|
|
|
|
|
|
|
|
if(!(_importerManager.loadState("AnyImageImporter") & PluginManager::LoadState::Loaded) ||
|
|
|
|
|
!(_importerManager.loadState("TgaImporter") & PluginManager::LoadState::Loaded))
|
|
|
|
|
CORRADE_SKIP("AnyImageImporter / TgaImporter plugins not found, not testing glyph cache contents");
|
|
|
|
|
|
|
|
|
|
/* Verify font image */
|
|
|
|
|
CORRADE_COMPARE_WITH(tgaFilename,
|
|
|
|
|
Utility::Path::join(MAGNUMFONTCONVERTER_TEST_DIR, "font-empty-cache.tga"),
|
|
|
|
|
DebugTools::CompareImageFile{_importerManager});
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void MagnumFontConverterTest::exportFontImageProcessingGlyphCache() {
|
|
|
|
|
/* Like exportFont(), but the image is processed to a 16x smaller one. The
|
|
|
|
|
rest stays the same, i.e. the offsets and sizes are still relative to
|
|
|
|
|
the original 128x64 image. */
|
|
|
|
|
|
|
|
|
|
Containers::String confFilename = Utility::Path::join(MAGNUMFONTCONVERTER_TEST_WRITE_DIR, "font-processed.conf");
|
|
|
|
|
Containers::String tgaFilename = Utility::Path::join(MAGNUMFONTCONVERTER_TEST_WRITE_DIR, "font-processed.tga");
|
|
|
|
|
/* Remove previously created files */
|
|
|
|
|
if(Utility::Path::exists(confFilename))
|
|
|
|
|
CORRADE_VERIFY(Utility::Path::remove(confFilename));
|
|
|
|
|
if(Utility::Path::exists(tgaFilename))
|
|
|
|
|
CORRADE_VERIFY(Utility::Path::remove(tgaFilename));
|
|
|
|
|
|
|
|
|
|
MyFont font;
|
|
|
|
|
font.openFile({}, {});
|
|
|
|
|
|
|
|
|
|
struct: AbstractGlyphCache {
|
|
|
|
|
using AbstractGlyphCache::AbstractGlyphCache;
|
|
|
|
|
|
|
|
|
|
GlyphCacheFeatures doFeatures() const override { return GlyphCacheFeature::ProcessedImageDownload; }
|
|
|
|
|
void doSetImage(const Vector2i&, const ImageView2D&) override {}
|
|
|
|
|
Image3D doProcessedImage() override {
|
|
|
|
|
return Image3D{PixelFormat::R8Unorm, {8, 4, 1}, Containers::Array<char>{InPlaceInit, {
|
|
|
|
|
'0', '1', '2', '3', '4', '5', '6', '7',
|
|
|
|
|
'8', '9', 'a', 'b', 'c', 'd', 'e', 'f',
|
|
|
|
|
'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n',
|
|
|
|
|
'o', 'p', 'q', 'r', 's', 't', 'u', 'v'
|
|
|
|
|
}}};
|
|
|
|
|
}
|
|
|
|
|
} cache{PixelFormat::R8Unorm, {128, 64}, {16, 8}};
|
|
|
|
|
/* Override the not found glyph to be in bounds as well */
|
|
|
|
|
cache.setInvalidGlyph({}, {{16, 8}, {16, 8}});
|
|
|
|
|
UnsignedInt fontId = cache.addFont(25, &font);
|
|
|
|
|
cache.addGlyph(fontId, font.glyphId(U'W'), {25, 34}, {{16, 12}, {24, 56}});
|
|
|
|
|
cache.addGlyph(fontId, font.glyphId(U'e'), {25, 12}, {{36, 8}, {112, 40}});
|
|
|
|
|
/* ě has deliberately the same glyph data as e */
|
|
|
|
|
cache.addGlyph(fontId, font.glyphId(
|
|
|
|
|
/* MSVC (but not clang-cl) doesn't support UTF-8 in char32_t literals
|
|
|
|
|
but it does it regular strings. Still a problem in MSVC 2022, what a
|
|
|
|
|
trash fire, can't you just give up on those codepage insanities
|
|
|
|
|
already, ffs?! */
|
|
|
|
|
#if defined(CORRADE_TARGET_MSVC) && !defined(CORRADE_TARGET_CLANG)
|
|
|
|
|
U'\u011B'
|
|
|
|
|
#else
|
|
|
|
|
U'ě'
|
|
|
|
|
#endif
|
|
|
|
|
), {25, 12}, {{36, 8}, {112, 40}});
|
|
|
|
|
|
|
|
|
|
/* Convert the file */
|
|
|
|
|
Containers::Pointer<AbstractFontConverter> converter = _fontConverterManager.instantiate("MagnumFontConverter");
|
|
|
|
|
CORRADE_VERIFY(converter->exportFontToFile(font, cache, Utility::Path::join(MAGNUMFONTCONVERTER_TEST_WRITE_DIR, "font-processed"), "Waveě"));
|
|
|
|
|
|
|
|
|
|
/* Verify font parameters */
|
|
|
|
|
CORRADE_COMPARE_AS(confFilename,
|
|
|
|
|
Utility::Path::join(MAGNUMFONT_TEST_DIR, "font-processed.conf"),
|
|
|
|
|
TestSuite::Compare::File);
|
|
|
|
|
|
|
|
|
|
if(!(_importerManager.loadState("AnyImageImporter") & PluginManager::LoadState::Loaded) ||
|
|
|
|
|
!(_importerManager.loadState("TgaImporter") & PluginManager::LoadState::Loaded))
|
|
|
|
|
CORRADE_SKIP("AnyImageImporter / TgaImporter plugins not found, not testing glyph cache contents");
|
|
|
|
|
|
|
|
|
|
/* Verify font image */
|
|
|
|
|
CORRADE_COMPARE_WITH(tgaFilename,
|
|
|
|
|
Utility::Path::join(MAGNUMFONT_TEST_DIR, "font-processed.tga"),
|
|
|
|
|
DebugTools::CompareImageFile{_importerManager});
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void MagnumFontConverterTest::exportFontImageProcessingGlyphCacheNoDownload() {
|
|
|
|
|
struct: AbstractFont {
|
|
|
|
|
/* Supports neither file nor data opening */
|
|
|
|
|
FontFeatures doFeatures() const override { return {}; }
|
|
|
|
|
bool doIsOpened() const override { return false; }
|
|
|
|
|
void doClose() override {}
|
|
|
|
|
|
|
|
|
|
UnsignedInt doGlyphId(char32_t) override { return {}; }
|
|
|
|
|
Vector2 doGlyphSize(UnsignedInt) override { return {}; }
|
|
|
|
|
Vector2 doGlyphAdvance(UnsignedInt) override { return {}; }
|
Text: new AbstractShaper interface for shaping.
Replaces the previous, grossly inefficient AbstractLayouter which was
performing one virtual call per glyph (!). It's now also reusable,
meaning it doesn't need to be allocated anew for every new shaped text,
and it no longer requires each and every font plugin to implement the
same redundant glyph data fetching from the glyph cache, scaling etc. --
all that is meant to be done by the users of AbstractShaper, i.e.
Renderer. The independency on a glyph cache theorerically also means it
can be used for a completely different, non-texture-based way to render
text (such as direct path drawing directly on the GPU), although I won't
be exploring that path now.
It also exposes an interface for specifying script, language,
direction and typographic features. Such interface will be currently
only implemented in HarfBuzz, but that's the intent -- to provide a
flexible enough interface to support all possible use cases that a font
or a font plugin may support, instead of exposing a least common
denominator and then having no easy way to shape a text in a non-Latin
script or use a fancy OpenType feature the chosen font has.
The old public interface is preserved for backwards compatibility,
marked as deprecated, however the virtual APIs are not, as supporting
that would be too nasty. I don't think any user code ever implemented a
font plugin so this should be okay.
To ensure smooth transition with no regressions, the Renderer class and
MagnumFont tests still use the old API in this commit, and their test
pass the same way as they did before (except for two removed MagnumFont
test cases which tested errors that are now an assertion in the
deprecated layout() API and thus cannot be tested from the plugin
anymore). Porting them away from the deprecated API will be done in
separate commits.
3 years ago
|
|
|
Containers::Pointer<AbstractShaper> doCreateShaper() override { return nullptr; }
|
|
|
|
|
} font;
|
|
|
|
|
|
|
|
|
|
struct: AbstractGlyphCache {
|
|
|
|
|
using AbstractGlyphCache::AbstractGlyphCache;
|
|
|
|
|
|
|
|
|
|
GlyphCacheFeatures doFeatures() const override { return GlyphCacheFeature::ImageProcessing; }
|
|
|
|
|
void doSetImage(const Vector2i&, const ImageView2D&) override {}
|
|
|
|
|
} cache{PixelFormat::R8Unorm, {100, 100}};
|
|
|
|
|
|
|
|
|
|
Containers::Pointer<AbstractFontConverter> converter = _fontConverterManager.instantiate("MagnumFontConverter");
|
|
|
|
|
|
|
|
|
|
std::ostringstream out;
|
|
|
|
|
Error redirectError{&out};
|
|
|
|
|
converter->exportFontToFile(font, cache, Utility::Path::join(MAGNUMFONTCONVERTER_TEST_WRITE_DIR, "font"), "Wave");
|
|
|
|
|
CORRADE_COMPARE(out.str(), "Text::MagnumFontConverter::exportFontToData(): glyph cache has image processing but doesn't support image download\n");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void MagnumFontConverterTest::exportFontArrayCache() {
|
|
|
|
|
struct: AbstractFont {
|
|
|
|
|
/* Supports neither file nor data opening */
|
|
|
|
|
FontFeatures doFeatures() const override { return {}; }
|
|
|
|
|
bool doIsOpened() const override { return false; }
|
|
|
|
|
void doClose() override {}
|
|
|
|
|
|
|
|
|
|
UnsignedInt doGlyphId(char32_t) override { return {}; }
|
|
|
|
|
Vector2 doGlyphSize(UnsignedInt) override { return {}; }
|
|
|
|
|
Vector2 doGlyphAdvance(UnsignedInt) override { return {}; }
|
Text: new AbstractShaper interface for shaping.
Replaces the previous, grossly inefficient AbstractLayouter which was
performing one virtual call per glyph (!). It's now also reusable,
meaning it doesn't need to be allocated anew for every new shaped text,
and it no longer requires each and every font plugin to implement the
same redundant glyph data fetching from the glyph cache, scaling etc. --
all that is meant to be done by the users of AbstractShaper, i.e.
Renderer. The independency on a glyph cache theorerically also means it
can be used for a completely different, non-texture-based way to render
text (such as direct path drawing directly on the GPU), although I won't
be exploring that path now.
It also exposes an interface for specifying script, language,
direction and typographic features. Such interface will be currently
only implemented in HarfBuzz, but that's the intent -- to provide a
flexible enough interface to support all possible use cases that a font
or a font plugin may support, instead of exposing a least common
denominator and then having no easy way to shape a text in a non-Latin
script or use a fancy OpenType feature the chosen font has.
The old public interface is preserved for backwards compatibility,
marked as deprecated, however the virtual APIs are not, as supporting
that would be too nasty. I don't think any user code ever implemented a
font plugin so this should be okay.
To ensure smooth transition with no regressions, the Renderer class and
MagnumFont tests still use the old API in this commit, and their test
pass the same way as they did before (except for two removed MagnumFont
test cases which tested errors that are now an assertion in the
deprecated layout() API and thus cannot be tested from the plugin
anymore). Porting them away from the deprecated API will be done in
separate commits.
3 years ago
|
|
|
Containers::Pointer<AbstractShaper> doCreateShaper() override { return nullptr; }
|
|
|
|
|
} font;
|
|
|
|
|
|
|
|
|
|
struct: AbstractGlyphCache {
|
|
|
|
|
using AbstractGlyphCache::AbstractGlyphCache;
|
|
|
|
|
|
|
|
|
|
GlyphCacheFeatures doFeatures() const override { return {}; }
|
|
|
|
|
void doSetImage(const Vector2i&, const ImageView2D&) override {}
|
|
|
|
|
} cache{PixelFormat::R8Unorm, {100, 100, 2}};
|
|
|
|
|
|
|
|
|
|
cache.addFont(15, &font);
|
|
|
|
|
|
|
|
|
|
Containers::Pointer<AbstractFontConverter> converter = _fontConverterManager.instantiate("MagnumFontConverter");
|
|
|
|
|
|
|
|
|
|
std::ostringstream out;
|
|
|
|
|
Error redirectError{&out};
|
|
|
|
|
converter->exportFontToFile(font, cache, Utility::Path::join(MAGNUMFONTCONVERTER_TEST_WRITE_DIR, "font"), "Wave");
|
|
|
|
|
CORRADE_COMPARE(out.str(), "Text::MagnumFontConverter::exportFontToData(): exporting array glyph caches is not supported\n");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void MagnumFontConverterTest::exportFontNotFoundInCache() {
|
|
|
|
|
struct: AbstractFont {
|
|
|
|
|
/* Supports neither file nor data opening */
|
|
|
|
|
FontFeatures doFeatures() const override { return {}; }
|
|
|
|
|
bool doIsOpened() const override { return false; }
|
|
|
|
|
void doClose() override {}
|
|
|
|
|
|
|
|
|
|
UnsignedInt doGlyphId(char32_t) override { return {}; }
|
|
|
|
|
Vector2 doGlyphSize(UnsignedInt) override { return {}; }
|
|
|
|
|
Vector2 doGlyphAdvance(UnsignedInt) override { return {}; }
|
Text: new AbstractShaper interface for shaping.
Replaces the previous, grossly inefficient AbstractLayouter which was
performing one virtual call per glyph (!). It's now also reusable,
meaning it doesn't need to be allocated anew for every new shaped text,
and it no longer requires each and every font plugin to implement the
same redundant glyph data fetching from the glyph cache, scaling etc. --
all that is meant to be done by the users of AbstractShaper, i.e.
Renderer. The independency on a glyph cache theorerically also means it
can be used for a completely different, non-texture-based way to render
text (such as direct path drawing directly on the GPU), although I won't
be exploring that path now.
It also exposes an interface for specifying script, language,
direction and typographic features. Such interface will be currently
only implemented in HarfBuzz, but that's the intent -- to provide a
flexible enough interface to support all possible use cases that a font
or a font plugin may support, instead of exposing a least common
denominator and then having no easy way to shape a text in a non-Latin
script or use a fancy OpenType feature the chosen font has.
The old public interface is preserved for backwards compatibility,
marked as deprecated, however the virtual APIs are not, as supporting
that would be too nasty. I don't think any user code ever implemented a
font plugin so this should be okay.
To ensure smooth transition with no regressions, the Renderer class and
MagnumFont tests still use the old API in this commit, and their test
pass the same way as they did before (except for two removed MagnumFont
test cases which tested errors that are now an assertion in the
deprecated layout() API and thus cannot be tested from the plugin
anymore). Porting them away from the deprecated API will be done in
separate commits.
3 years ago
|
|
|
Containers::Pointer<AbstractShaper> doCreateShaper() override { return nullptr; }
|
|
|
|
|
} font1, font2;
|
|
|
|
|
|
|
|
|
|
struct: AbstractGlyphCache {
|
|
|
|
|
using AbstractGlyphCache::AbstractGlyphCache;
|
|
|
|
|
|
|
|
|
|
GlyphCacheFeatures doFeatures() const override { return {}; }
|
|
|
|
|
void doSetImage(const Vector2i&, const ImageView2D&) override {}
|
|
|
|
|
} cache{PixelFormat::R8Unorm, {100, 100}};
|
|
|
|
|
|
|
|
|
|
cache.addFont(15, &font2);
|
|
|
|
|
cache.addFont(33);
|
|
|
|
|
|
|
|
|
|
Containers::Pointer<AbstractFontConverter> converter = _fontConverterManager.instantiate("MagnumFontConverter");
|
|
|
|
|
|
|
|
|
|
std::ostringstream out;
|
|
|
|
|
Error redirectError{&out};
|
|
|
|
|
converter->exportFontToFile(font1, cache, Utility::Path::join(MAGNUMFONTCONVERTER_TEST_WRITE_DIR, "font"), "Wave");
|
|
|
|
|
CORRADE_COMPARE(out.str(), "Text::MagnumFontConverter::exportFontToData(): font not found among 2 fonts in passed glyph cache\n");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void MagnumFontConverterTest::exportFontImageConversionFailed() {
|
|
|
|
|
struct: AbstractFont {
|
|
|
|
|
FontFeatures doFeatures() const override { return {}; }
|
|
|
|
|
void doClose() override { _opened = false; }
|
|
|
|
|
bool doIsOpened() const override { return _opened; }
|
|
|
|
|
Properties doOpenFile(Containers::StringView, Float) override {
|
|
|
|
|
_opened = true;
|
|
|
|
|
return {16.0f, 25.0f, -10.0f, 39.7333f, 3};
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
UnsignedInt doGlyphId(char32_t) override { return {}; }
|
|
|
|
|
Vector2 doGlyphSize(UnsignedInt) override { return {}; }
|
|
|
|
|
Vector2 doGlyphAdvance(UnsignedInt) override { return {}; }
|
Text: new AbstractShaper interface for shaping.
Replaces the previous, grossly inefficient AbstractLayouter which was
performing one virtual call per glyph (!). It's now also reusable,
meaning it doesn't need to be allocated anew for every new shaped text,
and it no longer requires each and every font plugin to implement the
same redundant glyph data fetching from the glyph cache, scaling etc. --
all that is meant to be done by the users of AbstractShaper, i.e.
Renderer. The independency on a glyph cache theorerically also means it
can be used for a completely different, non-texture-based way to render
text (such as direct path drawing directly on the GPU), although I won't
be exploring that path now.
It also exposes an interface for specifying script, language,
direction and typographic features. Such interface will be currently
only implemented in HarfBuzz, but that's the intent -- to provide a
flexible enough interface to support all possible use cases that a font
or a font plugin may support, instead of exposing a least common
denominator and then having no easy way to shape a text in a non-Latin
script or use a fancy OpenType feature the chosen font has.
The old public interface is preserved for backwards compatibility,
marked as deprecated, however the virtual APIs are not, as supporting
that would be too nasty. I don't think any user code ever implemented a
font plugin so this should be okay.
To ensure smooth transition with no regressions, the Renderer class and
MagnumFont tests still use the old API in this commit, and their test
pass the same way as they did before (except for two removed MagnumFont
test cases which tested errors that are now an assertion in the
deprecated layout() API and thus cannot be tested from the plugin
anymore). Porting them away from the deprecated API will be done in
separate commits.
3 years ago
|
|
|
Containers::Pointer<AbstractShaper> doCreateShaper() override { return nullptr; }
|
|
|
|
|
|
|
|
|
|
private:
|
|
|
|
|
bool _opened;
|
|
|
|
|
} font;
|
|
|
|
|
|
|
|
|
|
struct: AbstractGlyphCache {
|
|
|
|
|
using AbstractGlyphCache::AbstractGlyphCache;
|
|
|
|
|
|
|
|
|
|
GlyphCacheFeatures doFeatures() const override { return {}; }
|
|
|
|
|
void doSetImage(const Vector2i&, const ImageView2D&) override {}
|
|
|
|
|
} cache{PixelFormat::R32F, {100, 100}};
|
|
|
|
|
|
|
|
|
|
font.openFile({}, 0.0f);
|
|
|
|
|
|
|
|
|
|
cache.addFont(15, &font);
|
|
|
|
|
|
|
|
|
|
Containers::Pointer<AbstractFontConverter> converter = _fontConverterManager.instantiate("MagnumFontConverter");
|
|
|
|
|
|
|
|
|
|
std::ostringstream out;
|
|
|
|
|
Error redirectError{&out};
|
|
|
|
|
converter->exportFontToFile(font, cache, Utility::Path::join(MAGNUMFONTCONVERTER_TEST_WRITE_DIR, "font"), "Wave");
|
|
|
|
|
CORRADE_COMPARE(out.str(),
|
|
|
|
|
"Trade::TgaImageConverter::convertToData(): unsupported pixel format PixelFormat::R32F\n"
|
|
|
|
|
"Text::MagnumFontConverter::exportFontToData(): cannot create a TGA image\n");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
}}}}
|
|
|
|
|
|
|
|
|
|
CORRADE_TEST_MAIN(Magnum::Text::Test::MagnumFontConverterTest)
|