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

CR feedback

Browse source
This commit is contained in:
ZappoMan 2014-10-21 12:28:44 -07:00
parent 1b9565e575
commit 228de963ab
2 changed files with 0 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
interface/src/ui/overlays/Text3DOverlay.cpp
View file

@ -11,9 +11,6 @@
// include this before QGLWidget, which includes an earlier version of OpenGL // include this before QGLWidget, which includes an earlier version of OpenGL
#include "InterfaceConfig.h" #include "InterfaceConfig.h"
#include <QGLWidget>
#include <SharedUtil.h>
#include "Application.h" #include "Application.h"
#include "Text3DOverlay.h" #include "Text3DOverlay.h"
#include "ui/TextRenderer.h" #include "ui/TextRenderer.h"
@ -90,9 +87,6 @@ void Text3DOverlay::render() {
glVertex3f(-halfDimensions.x, halfDimensions.y, SLIGHTLY_BEHIND); glVertex3f(-halfDimensions.x, halfDimensions.y, SLIGHTLY_BEHIND);
glEnd(); glEnd();
//TextRenderer(const char* family, int pointSize = -1, int weight = -1, bool italic = false,
// EffectType effect = NO_EFFECT, int effectThickness = 1);
const int FIXED_FONT_POINT_SIZE = 40; const int FIXED_FONT_POINT_SIZE = 40;
const int FIXED_FONT_SCALING_RATIO = FIXED_FONT_POINT_SIZE * 40.0f; // this is a ratio determined through experimentation const int FIXED_FONT_SCALING_RATIO = FIXED_FONT_POINT_SIZE * 40.0f; // this is a ratio determined through experimentation

11
interface/src/ui/overlays/Text3DOverlay.h
View file

@ -14,18 +14,7 @@
// include this before QGLWidget, which includes an earlier version of OpenGL // include this before QGLWidget, which includes an earlier version of OpenGL
#include "InterfaceConfig.h" #include "InterfaceConfig.h"
#include <QGLWidget>
#include <QImage>
#include <QNetworkReply>
#include <QRect>
#include <QScriptValue>
#include <QString> #include <QString>
#include <QUrl>
#include <SharedUtil.h>
//#include "Overlay.h"
//#include "Overlay3D.h"
#include "Planar3DOverlay.h" #include "Planar3DOverlay.h"
class Text3DOverlay : public Planar3DOverlay { class Text3DOverlay : public Planar3DOverlay {