From e6e9f017c0d848c4c0a244f29a3a1d07544579c1 Mon Sep 17 00:00:00 2001
From: Brad Davis <bdavis@saintandreas.org>
Date: Thu, 16 Jul 2015 17:23:25 -0700
Subject: [PATCH] Fixing test code

---
 tests/render-utils/src/main.cpp | 61 +++++----------------------------
 1 file changed, 9 insertions(+), 52 deletions(-)

diff --git a/tests/render-utils/src/main.cpp b/tests/render-utils/src/main.cpp
index 87338e414b..350db8c879 100644
--- a/tests/render-utils/src/main.cpp
+++ b/tests/render-utils/src/main.cpp
@@ -8,7 +8,7 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-#include "TextRenderer.h"
+#include <gpu/GPUConfig.h>
 
 #include <QWindow>
 #include <QFile>
@@ -29,6 +29,7 @@
 #include <unordered_map>
 #include <memory>
 #include <glm/glm.hpp>
+
 #include <PathUtils.h>
 #include <QDir>
 
@@ -86,7 +87,7 @@ class QTestWindow : public QWindow {
 
     QOpenGLContext* _context{ nullptr };
     QSize _size;
-    TextRenderer* _textRenderer[4];
+    //TextRenderer* _textRenderer[4];
     RateCounter fps;
 
 protected:
@@ -146,12 +147,12 @@ public:
         glGetError();
 #endif
 
-        _textRenderer[0] = TextRenderer::getInstance(SANS_FONT_FAMILY, 12, false);
-        _textRenderer[1] = TextRenderer::getInstance(SERIF_FONT_FAMILY, 12, false,
-            TextRenderer::SHADOW_EFFECT);
-        _textRenderer[2] = TextRenderer::getInstance(MONO_FONT_FAMILY, 48, -1,
-            false, TextRenderer::OUTLINE_EFFECT);
-        _textRenderer[3] = TextRenderer::getInstance(INCONSOLATA_FONT_FAMILY, 24);
+        //_textRenderer[0] = TextRenderer::getInstance(SANS_FONT_FAMILY, 12, false);
+        //_textRenderer[1] = TextRenderer::getInstance(SERIF_FONT_FAMILY, 12, false,
+        //    TextRenderer::SHADOW_EFFECT);
+        //_textRenderer[2] = TextRenderer::getInstance(MONO_FONT_FAMILY, 48, -1,
+        //    false, TextRenderer::OUTLINE_EFFECT);
+        //_textRenderer[3] = TextRenderer::getInstance(INCONSOLATA_FONT_FAMILY, 24);
 
         glEnable(GL_BLEND);
         glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
@@ -190,48 +191,6 @@ static const glm::uvec2 QUAD_OFFSET(10, 10);
 static const glm::vec3 COLORS[4] = { { 1.0, 1.0, 1.0 }, { 0.5, 1.0, 0.5 }, {
         1.0, 0.5, 0.5 }, { 0.5, 0.5, 1.0 } };
 
-void QTestWindow::renderText() {
-    glMatrixMode(GL_PROJECTION);
-    glLoadIdentity();
-    glOrtho(0, _size.width(), _size.height(), 0, 1, -1);
-    glMatrixMode(GL_MODELVIEW);
-    glLoadIdentity();
-
-    const glm::uvec2 size = glm::uvec2(_size.width() / 2, _size.height() / 2);
-
-    const glm::uvec2 offsets[4] = {
-        { QUAD_OFFSET.x, QUAD_OFFSET.y },
-        { size.x + QUAD_OFFSET.x, QUAD_OFFSET.y },
-        { size.x + QUAD_OFFSET.x, size.y + QUAD_OFFSET.y },
-        { QUAD_OFFSET.x, size.y + QUAD_OFFSET.y },
-    };	
-
-    QString str = QString::fromWCharArray(EXAMPLE_TEXT);
-    for (int i = 0; i < 4; ++i) {
-        glm::vec2 bounds = _textRenderer[i]->computeExtent(str);
-        glPushMatrix();
-        {
-            glTranslatef(offsets[i].x, offsets[i].y, 0);
-            glColor3f(0, 0, 0);
-            glBegin(GL_QUADS);
-            {
-                glVertex2f(0, 0);
-                glVertex2f(0, bounds.y);
-                glVertex2f(bounds.x, bounds.y);
-                glVertex2f(bounds.x, 0);
-            }
-            glEnd();
-        }
-        glPopMatrix();
-        const int testCount = 100;
-        for (int j = 0; j < testCount; ++j) {
-            // Draw backgrounds around where the text will appear
-            // Draw the text itself
-            _textRenderer[i]->draw(offsets[i].x, offsets[i].y, str.toLocal8Bit().constData(),
-                glm::vec4(COLORS[i], 1.0f));
-        }
-    }
-}
 
 void QTestWindow::draw() {
     if (!isVisible()) {
@@ -242,8 +201,6 @@ void QTestWindow::draw() {
     glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
     glViewport(0, 0, _size.width() * devicePixelRatio(), _size.height() * devicePixelRatio());
 
-    renderText();
-
     _context->swapBuffers(this);
     glFinish();