Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-06 18:50:00 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

call Q_INIT_RESOURCE statically from Font constructor

Browse source
This commit is contained in:
Stephen Birarda 2015-02-06 15:17:53 -08:00
parent 6a58d8b0a3
commit 961b5b5346
1 changed files with 11 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
libraries/render-utils/src/TextRenderer.cpp
View file

@ -88,6 +88,9 @@ const float DEFAULT_POINT_SIZE = 12;
class Font { class Font {
public: public:
Font();
using TexturePtr = QSharedPointer < QOpenGLTexture >; using TexturePtr = QSharedPointer < QOpenGLTexture >;
using VertexArrayPtr = QSharedPointer< QOpenGLVertexArrayObject >; using VertexArrayPtr = QSharedPointer< QOpenGLVertexArrayObject >;
using ProgramPtr = QSharedPointer < QOpenGLShaderProgram >; using ProgramPtr = QSharedPointer < QOpenGLShaderProgram >;
@ -183,6 +186,14 @@ Font* loadFont(const QString& family) {
return LOADED_FONTS[family]; return LOADED_FONTS[family];
} }
Font::Font() {
static bool fontResourceInitComplete = false;
if (!fontResourceInitComplete) {
Q_INIT_RESOURCE(font);
fontResourceInitComplete = true;
}
}
// NERD RAGE: why doesn't QHash have a 'const T & operator[] const' member // NERD RAGE: why doesn't QHash have a 'const T & operator[] const' member
const Glyph & Font::getGlyph(const QChar & c) const { const Glyph & Font::getGlyph(const QChar & c) const {
if (!_glyphs.contains(c)) { if (!_glyphs.contains(c)) {