ic
/
magnum
mirror of https://github.com/mosra/magnum.git
6
0
Fork 0
Code Issues Projects Releases Wiki Activity
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
11041 Commits
21 Branches
19 Tags
70 MiB
Tree: 6b31924b0b
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from '6b31924b0b'
${ noResults }
magnum/src/Magnum/Text/Test/CMakeLists.txt

128 lines
5.8 KiB
Raw Normal View History Unescape

Text: reworked AbstractFont plugin interface. Implementation is moved into `do*()` private virtual functions, public interface is doing additional sanity checks around them. Opening files is by default done in base implementation, which loads the files into memory and then calls function for opening raw data. Added interface for opening multi-file fonts from raw data, default implementation just calls single-file implementation. Function for creating glyph cache converts the text from UTF-8 to UTF-32 and then calls the implementation, removing the burden from reimplementing this in each plugin. Added unit test for file and single data opening, bumped plugin version to 0.2.
13 years ago
#
# This file is part of Magnum.
#
Updated copyright year.
6 years ago
# Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019,
It's 2023 already!
3 years ago
# 2020, 2021, 2022, 2023 Vladimír Vondruš <mosra@centrum.cz>
Text: reworked AbstractFont plugin interface. Implementation is moved into `do*()` private virtual functions, public interface is doing additional sanity checks around them. Opening files is by default done in base implementation, which loads the files into memory and then calls function for opening raw data. Added interface for opening multi-file fonts from raw data, default implementation just calls single-file implementation. Function for creating glyph cache converts the text from UTF-8 to UTF-32 and then calls the implementation, removing the burden from reimplementing this in each plugin. Added unit test for file and single data opening, bumped plugin version to 0.2.
13 years ago
#
# 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.
#
CMake: use the CMAKE_FOLDER variable instead of FOLDER property. It limits the support for CMake 3.12+, but it's much less verbose and I don't expect people to use ancient CMake versions with IDEs like Xcode or VS anyway, so this should be fine.
4 years ago
# IDE folder in VS, Xcode etc. CMake 3.12+, older versions have only the FOLDER
# property that would have to be set on each target separately.
set(CMAKE_FOLDER "Magnum/Text/Test")
Bundle test files for both Android and Emscripten.
10 years ago
if(CORRADE_TARGET_EMSCRIPTEN OR CORRADE_TARGET_ANDROID)
set(TEXT_TEST_DIR ".")
set(TEXT_TEST_OUTPUT_DIR "./write")
Text: full test coverage for the GlyphCache classes. About time this got done. This also has an XFAIL for the case where a distance field image is processed with an offset, have to fix the underlying issue in TextureTools first. Also added a range assertion for the distance field image setter to match what the abstract base does, together with a corresponding getter.
3 years ago
set(TEXTURETOOLS_DISTANCEFIELDGLTEST_DIR ".")
Make all non-GL tests building and passing on WebGL/Emscripten. Yay!
10 years ago
else()
set(TEXT_TEST_DIR ${CMAKE_CURRENT_SOURCE_DIR})
set(TEXT_TEST_OUTPUT_DIR ${CMAKE_CURRENT_BINARY_DIR})
Text: full test coverage for the GlyphCache classes. About time this got done. This also has an XFAIL for the case where a distance field image is processed with an offset, have to fix the underlying issue in TextureTools first. Also added a range assertion for the distance field image setter to match what the abstract base does, together with a corresponding getter.
3 years ago
set(TEXTURETOOLS_DISTANCEFIELDGLTEST_DIR ${PROJECT_SOURCE_DIR}/src/Magnum/TextureTools/Test/DistanceFieldGLTestFiles)
Make all non-GL tests building and passing on WebGL/Emscripten. Yay!
10 years ago
endif()
Text: full test coverage for the GlyphCache classes. About time this got done. This also has an XFAIL for the case where a distance field image is processed with an offset, have to fix the underlying issue in TextureTools first. Also added a range assertion for the distance field image setter to match what the abstract base does, together with a corresponding getter.
3 years ago
if(MAGNUM_TARGET_GL AND MAGNUM_BUILD_GL_TESTS)
if(NOT MAGNUM_BUILD_PLUGINS_STATIC)
if(MAGNUM_WITH_ANYIMAGEIMPORTER)
set(ANYIMAGEIMPORTER_PLUGIN_FILENAME $<TARGET_FILE:AnyImageImporter>)
endif()
if(MAGNUM_WITH_TGAIMPORTER)
set(TGAIMPORTER_PLUGIN_FILENAME $<TARGET_FILE:TgaImporter>)
endif()
endif()
endif()
# First replace ${} variables, then $<> generator expressions
Making includes absolute, part 6: better filenames for internal files. As we are now using absolute includes, there is no need to prefix everything with "magnum<Namespace>" etc. All generated configuration files are renamed to configure.h and their path is included _before_ everything else to avoid accidental collisions.
13 years ago
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/configure.h.cmake
Text: full test coverage for the GlyphCache classes. About time this got done. This also has an XFAIL for the case where a distance field image is processed with an offset, have to fix the underlying issue in TextureTools first. Also added a range assertion for the distance field image setter to match what the abstract base does, together with a corresponding getter.
3 years ago
${CMAKE_CURRENT_BINARY_DIR}/configure.h.in)
file(GENERATE OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>/configure.h
INPUT ${CMAKE_CURRENT_BINARY_DIR}/configure.h.in)
Text: reworked AbstractFont plugin interface. Implementation is moved into `do*()` private virtual functions, public interface is doing additional sanity checks around them. Opening files is by default done in base implementation, which loads the files into memory and then calls function for opening raw data. Added interface for opening multi-file fonts from raw data, default implementation just calls single-file implementation. Function for creating glyph cache converts the text from UTF-8 to UTF-32 and then calls the implementation, removing the burden from reimplementing this in each plugin. Added unit test for file and single data opening, bumped plugin version to 0.2.
13 years ago
Bundle test files for both Android and Emscripten.
10 years ago
corrade_add_test(TextAbstractFontTest AbstractFontTest.cpp
Text: API-independent base for glyph caches. Allows the Font and FontConverter plugins be built without TARGET_GL enabled. That was the last piece missing for making the magnum-plugins repo completely GL-free.
7 years ago
LIBRARIES Magnum MagnumTextTestLib
Bundle test files for both Android and Emscripten.
10 years ago
FILES data.bin)
Text: full test coverage for the GlyphCache classes. About time this got done. This also has an XFAIL for the case where a distance field image is processed with an offset, have to fix the underlying issue in TextureTools first. Also added a range assertion for the distance field image setter to match what the abstract base does, together with a corresponding getter.
3 years ago
target_include_directories(TextAbstractFontTest PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>)
Text: added a Script enum. Will be used for the upcoming new AbstractShaper API. It's based on the ISO script codes, matching the HarfBuzz script enum, with the intention of being passed to it as-is.
3 years ago
Bundle test files for both Android and Emscripten.
10 years ago
corrade_add_test(TextAbstractFontConverterTest AbstractFontConverterTest.cpp
Text: explicitly test also converter assertions.
6 years ago
LIBRARIES Magnum MagnumTextTestLib
Bundle test files for both Android and Emscripten.
10 years ago
FILES data.bin)
Text: full test coverage for the GlyphCache classes. About time this got done. This also has an XFAIL for the case where a distance field image is processed with an offset, have to fix the underlying issue in TextureTools first. Also added a range assertion for the distance field image setter to match what the abstract base does, together with a corresponding getter.
3 years ago
target_include_directories(TextAbstractFontConverterTest PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>)
Text: added a Script enum. Will be used for the upcoming new AbstractShaper API. It's based on the ISO script codes, matching the HarfBuzz script enum, with the intention of being passed to it as-is.
3 years ago
Text: rework AbstractGlyphCache for better flexibility and efficiency. The class now supports incremental filling, multiple fonts, texture arrays, removes all reliance on STL containers and is finally properly documented. To avoid complete breakage of every use, as much as possible was kept as deprecated APIs -- in particular the reserve() with the nasty std::vectors, the insert() that assumes a 2D cache and a single font and textureSize() that returns a 2D vector. Those behave the same as before, but will assert if the cache is an array or contains more than one font. On the other hand, begin() / end() access with std::unordered_map iterators (ew!) was removed as the internals simply aren't a hashmap anymore. The image() that returned an Image2D is now used to fill the glyph cache instead of querying its potentially processed contents, and returns a MutableImageView3D. I considered keeping it and adding sourceImage() instead, but such naming turned out to be too inconsistent. For querying processed image data (such as with the distance field cache) there's a new processedImage() query, guarded by new GlyphCacheFeature bits -- if both ImageProcessing and ProcessedImageDownload is set, it can be used to retrieve the processed image (so, similar as ImageDownload was before), and if neither is set, the cache contents are queryable directly through image(), without needing any special support from the GPU API. Existing code is updated only in the minimal way possible to ensure that no serious breakage was introduced by reimplementing the deprecated APIs on top of the new backend. Porting away from deprecated APIs will be done in next commits. The GlyphCache and DistanceFieldGlyphCache have their public API kept intact for now, as a similar rework will be needed for them as well. Additionally, the MagnumFont and MagnumFontConverter plugins aren't compiling yet as they require substantial changes to deal with the new glyph cache features. That is not the case with other plugins in the magnum-plugins repository tho, for those the backwards compatibility "just works". On the other hand, since layout of the AbstractGlyphChange changed, I'm bumping the AbstractFont plugin interface version to force-trigger a rebuild of dependent projects. Because I ran a stale magnum-player binary, it worked without crashing or GL errors but just didn't show ANY text whatsoever due to ABI differences, and I wasted some precious minutes before realizing that a simple rebuild would fix it.
3 years ago
corrade_add_test(TextAbstractGlyphCacheTest AbstractGlyphCacheTest.cpp
LIBRARIES MagnumTextTestLib MagnumDebugTools)
if(CORRADE_TARGET_EMSCRIPTEN)
if(CMAKE_VERSION VERSION_LESS 3.13)
message(FATAL_ERROR "CMake 3.13+ is required in order to specify Emscripten linker options")
endif()
# Some of the glyph caches tested are rather large
target_link_options(TextAbstractGlyphCacheTest PRIVATE "SHELL:-s ALLOW_MEMORY_GROWTH=1")
endif()
Text: added a Script enum. Will be used for the upcoming new AbstractShaper API. It's based on the ISO script codes, matching the HarfBuzz script enum, with the intention of being passed to it as-is.
3 years ago
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
corrade_add_test(TextAbstractShaperTest AbstractShaperTest.cpp
LIBRARIES MagnumTextTestLib)
Text: implicitly add "Not Found" glyph to GlyphCache. Also added test for GlyphCache functionality.
13 years ago
Text: introduce Alignment::*Start and *End. Based on the actual text direction (either explicitly set or detected), these resolve to either *Left or *Right. For the Text::Renderer it's done automatically inside (and there's no way to actually set the direction from outside due to the API being ancient and limited), for the align*() utils the alignment has to be explicitly resolved using a new alignmentForDirection() utility.
2 years ago
corrade_add_test(TextAlignmentTest AlignmentTest.cpp LIBRARIES MagnumTextTestLib)
Text: rename Direction to ShapeDirection, move to a dedicated header. Because there's going to be LayoutDirection as well, for controlling how line progression happens. Because nothing in text rendering is simple.
3 years ago
corrade_add_test(TextDirectionTest DirectionTest.cpp LIBRARIES MagnumText)
Text: added a Feature enum. Like the Script enum, to be used for the new AbstractShaper API.
3 years ago
corrade_add_test(TextFeatureTest FeatureTest.cpp LIBRARIES MagnumTextTestLib)
Text: can now test most Renderer APIs without a GL context. This is the case as of 96d56c6d2f21d811df2702e33bedfacf1eaf4ee0, where the GPU-independent AbstractGlyphCache can be used.
3 years ago
corrade_add_test(TextRendererTest RendererTest.cpp LIBRARIES MagnumTextTestLib)
Text: added a Script enum. Will be used for the upcoming new AbstractShaper API. It's based on the ISO script codes, matching the HarfBuzz script enum, with the intention of being passed to it as-is.
3 years ago
corrade_add_test(TextScriptTest ScriptTest.cpp LIBRARIES MagnumTextTestLib)
Text: add a NoCreate constructor to [DistanceField]GlyphCache. Want to construct them without a GL context present, and Optional is too wasteful. Also adding it to the AbstractGlyphCache base, where it skips also allocating the internal PIMPL state, because it's not going to get used for anything in a NoCreate'd instance anyway.
3 years ago
if(MAGNUM_TARGET_GL)
Text: renamed {DistanceField,}GlyphCache to {DistanceField}GlyphCacheGL. Like with TextureTools::DistanceField, to make room for non-GL implementations. Old names are deprecated aliases, same for headers. The only remaining bit in the Text library is the Renderer class, but for that one I first need to invent a non-shitty API so I can just deprecate the old thing as a whole and create something reasonable from scratch in RendererGL.
2 years ago
corrade_add_test(TextGlyphCacheGL_Test GlyphCacheGL_Test.cpp LIBRARIES MagnumText)
corrade_add_test(TextDistanceFieldGlyphCacheGL_Test DistanceFieldGlyphCacheGL_Test.cpp LIBRARIES MagnumText)
Text: add a NoCreate constructor to [DistanceField]GlyphCache. Want to construct them without a GL context present, and Optional is too wasteful. Also adding it to the AbstractGlyphCache base, where it skips also allocating the internal PIMPL state, because it's not going to get used for anything in a NoCreate'd instance anyway.
3 years ago
if(MAGNUM_BUILD_GL_TESTS)
corrade_add_test(TextDistanceFieldGlyphCacheGLTest DistanceFieldGlyphCacheGLTest.cpp
LIBRARIES
MagnumTextTestLib
MagnumOpenGLTester
MagnumDebugTools
FILES
${PROJECT_SOURCE_DIR}/src/Magnum/TextureTools/Test/DistanceFieldGLTestFiles/input.tga
${PROJECT_SOURCE_DIR}/src/Magnum/TextureTools/Test/DistanceFieldGLTestFiles/output.tga)
target_include_directories(TextDistanceFieldGlyphCacheGLTest PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>)
if(MAGNUM_BUILD_PLUGINS_STATIC)
if(MAGNUM_WITH_ANYIMAGEIMPORTER)
target_link_libraries(TextDistanceFieldGlyphCacheGLTest PRIVATE AnyImageImporter)
endif()
if(MAGNUM_WITH_TGAIMPORTER)
target_link_libraries(TextDistanceFieldGlyphCacheGLTest PRIVATE TgaImporter)
endif()
else()
# So the plugins get properly built when building the test
if(MAGNUM_WITH_ANYIMAGEIMPORTER)
add_dependencies(TextDistanceFieldGlyphCacheGLTest AnyImageImporter)
endif()
if(MAGNUM_WITH_TGAIMPORTER)
add_dependencies(TextDistanceFieldGlyphCacheGLTest TgaImporter)
endif()
Text: full test coverage for the GlyphCache classes. About time this got done. This also has an XFAIL for the case where a distance field image is processed with an offset, have to fix the underlying issue in TextureTools first. Also added a range assertion for the distance field image setter to match what the abstract base does, together with a corresponding getter.
3 years ago
endif()
Text: add a NoCreate constructor to [DistanceField]GlyphCache. Want to construct them without a GL context present, and Optional is too wasteful. Also adding it to the AbstractGlyphCache base, where it skips also allocating the internal PIMPL state, because it's not going to get used for anything in a NoCreate'd instance anyway.
3 years ago
corrade_add_test(TextGlyphCacheGLTest GlyphCacheGLTest.cpp
LIBRARIES
Text: only allow creating processed GlyphCacheGL by subclasses. So the users don't accidentally create an instance with the processed format / size being different only to get greeted by a nasty bounds or format assertion inside flushImage() / doSetImage(). Now it's only allowed to be done by a subclass (such as DistanceFieldGlyphCacheGL, or, ahem, MagnumFont), and doSetImage() additionally has an assert to notify the implementer that a subclass needs to provide its own override. This also feels kind of messy, honestly. It's as if the DistanceFieldGlyphCache should never have been a subclass, maybe?
2 years ago
MagnumTextTestLib
Text: add a NoCreate constructor to [DistanceField]GlyphCache. Want to construct them without a GL context present, and Optional is too wasteful. Also adding it to the AbstractGlyphCache base, where it skips also allocating the internal PIMPL state, because it's not going to get used for anything in a NoCreate'd instance anyway.
3 years ago
MagnumOpenGLTester
MagnumDebugTools)
corrade_add_test(TextRendererGLTest RendererGLTest.cpp
LIBRARIES
MagnumTextTestLib
MagnumOpenGLTester)
endif()
Text: implicitly add "Not Found" glyph to GlyphCache. Also added test for GlyphCache functionality.
13 years ago
endif()