From 39794a7a407744de90ff1c34ebc0f70b4e1282e4 Mon Sep 17 00:00:00 2001 From: Brad Davis Date: Thu, 5 Feb 2015 21:00:34 -0800 Subject: [PATCH] Getting rid of some warnings --- libraries/render-utils/src/TextRenderer.cpp | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/libraries/render-utils/src/TextRenderer.cpp b/libraries/render-utils/src/TextRenderer.cpp index ef4e713982..c1f9413554 100644 --- a/libraries/render-utils/src/TextRenderer.cpp +++ b/libraries/render-utils/src/TextRenderer.cpp @@ -57,13 +57,9 @@ void fillBuffer(QBuffer & buffer, T (&t)[N]) { buffer.setData((const char*) t, N); } - // FIXME support the shadow effect, or remove it from the API - // FIXME figure out how to improve the anti-aliasing on the // interior of the outline fonts -const char SHADER_TEXT_FS[] = - R"XXXX()XXXX"; // stores the font metrics for a single character struct Glyph { @@ -288,7 +284,7 @@ void Font::setupGL() { if (!_program->addShaderFromSourceCode(QOpenGLShader::Vertex, sdf_text_vert) || // !_program->addShaderFromSourceCode(QOpenGLShader::Fragment, sdf_text_frag) || // !_program->link()) { - qFatal(_program->log().toLocal8Bit().constData()); + qFatal("%s", _program->log().toLocal8Bit().constData()); } std::vector vertexData; @@ -314,7 +310,6 @@ void Font::setupGL() { indexData.push_back(index + 3); }); - //_vao = VertexArrayPtr(new VertexArray()); _vao = VertexArrayPtr(new QOpenGLVertexArrayObject()); _vao->create(); _vao->bind(); @@ -489,9 +484,13 @@ TextRenderer* TextRenderer::getInstance(const char* family, float pointSize, TextRenderer::TextRenderer(const char* family, float pointSize, int weight, bool italic, EffectType effect, int effectThickness, const QColor& color) : - _effectType(effect), _pointSize(pointSize), _effectThickness( - effectThickness), _color(color), _font(loadFont(family)) { - + _effectType(effect), _effectThickness(effectThickness), _pointSize(pointSize), _color(color), _font(loadFont(family)) { + if (1 != _effectThickness) { + qWarning() << "Effect thickness not current supported"; + } + if (NO_EFFECT != _effectType && OUTLINE_EFFECT != _effectType) { + qWarning() << "Effect thickness not current supported"; + } } TextRenderer::~TextRenderer() {