From 0fab50a38853fffcb18b582a58f2bd472ff29eef Mon Sep 17 00:00:00 2001 From: Brad Davis Date: Tue, 3 Feb 2015 00:27:58 -0800 Subject: [PATCH] Updating example text --- tests/render-utils/CMakeLists.txt | 3 ++- tests/render-utils/src/main.cpp | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/tests/render-utils/CMakeLists.txt b/tests/render-utils/CMakeLists.txt index bb3e4e1aa6..3a542734f1 100644 --- a/tests/render-utils/CMakeLists.txt +++ b/tests/render-utils/CMakeLists.txt @@ -3,7 +3,8 @@ set(TARGET_NAME render-utils-tests) setup_hifi_project(Quick) include_glm() -include_oglplus() + +#include_oglplus() # link in the shared libraries link_hifi_libraries(render-utils gpu shared) diff --git a/tests/render-utils/src/main.cpp b/tests/render-utils/src/main.cpp index 9c71dd50ea..4fad426ed1 100644 --- a/tests/render-utils/src/main.cpp +++ b/tests/render-utils/src/main.cpp @@ -139,7 +139,7 @@ void QTestWindow::makeCurrent() { m_context->makeCurrent(this); } -static const char * EXAMPLE_TEXT = "Hello 1.0\nline 2"; +static const wchar_t * EXAMPLE_TEXT = L"Hello 1.0\nline 2\ndescent ggg\nascent มมม"; static const glm::uvec2 QUAD_OFFSET(10, 20); static const glm::vec3 COLORS[4] = { { 1, 1, 1 }, @@ -181,8 +181,9 @@ void QTestWindow::draw() { glVertex2f(size.x, _size.height()); glEnd(); } + QString str = QString::fromWCharArray(EXAMPLE_TEXT); for (int i = 0; i < 4; ++i) { - _textRenderer[i]->draw(offsets[i].x, offsets[i].y, EXAMPLE_TEXT, glm::vec4(COLORS[i], 1.0f)); + _textRenderer[i]->draw(offsets[i].x, offsets[i].y, str.toLocal8Bit().constData(), glm::vec4(COLORS[i], 1.0f)); } m_context->swapBuffers(this); }