Merge pull request #3393 from ey6es/master

shared TextRenderer instances; hostname for Faceshift connection
2025-04-20 18:44:01 +02:00 · 2014-09-11 09:20:47 -07:00 · 2014-09-11 09:20:47 -07:00 · 49af620665
commit 49af620665
parent d3d4717a92 b1cfafdbe7
13 changed files with 151 additions and 41 deletions
--- a/interface/src/Menu.cpp
+++ b/interface/src/Menu.cpp
@ -70,6 +70,7 @@ Menu* Menu::getInstance() {

 const ViewFrustumOffset DEFAULT_FRUSTUM_OFFSET = {-135.0f, 0.0f, 0.0f, 25.0f, 0.0f};
 const float DEFAULT_FACESHIFT_EYE_DEFLECTION = 0.25f;
+const QString DEFAULT_FACESHIFT_HOSTNAME = "localhost";
 const float DEFAULT_AVATAR_LOD_DISTANCE_MULTIPLIER = 1.0f;
 const int ONE_SECOND_OF_FRAMES = 60;
 const int FIVE_SECONDS_OF_FRAMES = 5 * ONE_SECOND_OF_FRAMES;
@ -87,6 +88,7 @@ Menu::Menu() :
    _fieldOfView(DEFAULT_FIELD_OF_VIEW_DEGREES),
    _realWorldFieldOfView(DEFAULT_REAL_WORLD_FIELD_OF_VIEW_DEGREES),
    _faceshiftEyeDeflection(DEFAULT_FACESHIFT_EYE_DEFLECTION),
+    _faceshiftHostname(DEFAULT_FACESHIFT_HOSTNAME),
    _frustumDrawMode(FRUSTUM_DRAW_MODE_ALL),
    _viewFrustumOffset(DEFAULT_FRUSTUM_OFFSET),
    _jsConsole(NULL),
@ -713,6 +715,7 @@ void Menu::loadSettings(QSettings* settings) {
    _fieldOfView = loadSetting(settings, "fieldOfView", DEFAULT_FIELD_OF_VIEW_DEGREES);
    _realWorldFieldOfView = loadSetting(settings, "realWorldFieldOfView", DEFAULT_REAL_WORLD_FIELD_OF_VIEW_DEGREES);
    _faceshiftEyeDeflection = loadSetting(settings, "faceshiftEyeDeflection", DEFAULT_FACESHIFT_EYE_DEFLECTION);
+    _faceshiftHostname = settings->value("faceshiftHostname", DEFAULT_FACESHIFT_HOSTNAME).toString();
    _maxVoxels = loadSetting(settings, "maxVoxels", DEFAULT_MAX_VOXELS_PER_SYSTEM);
    _maxVoxelPacketsPerSecond = loadSetting(settings, "maxVoxelsPPS", DEFAULT_MAX_VOXEL_PPS);
    _voxelSizeScale = loadSetting(settings, "voxelSizeScale", DEFAULT_OCTREE_SIZE_SCALE);
@ -777,6 +780,7 @@ void Menu::saveSettings(QSettings* settings) {

    settings->setValue("fieldOfView", _fieldOfView);
    settings->setValue("faceshiftEyeDeflection", _faceshiftEyeDeflection);
+    settings->setValue("faceshiftHostname", _faceshiftHostname);
    settings->setValue("maxVoxels", _maxVoxels);
    settings->setValue("maxVoxelsPPS", _maxVoxelPacketsPerSecond);
    settings->setValue("voxelSizeScale", _voxelSizeScale);
--- a/interface/src/Menu.h
+++ b/interface/src/Menu.h
@ -104,6 +104,8 @@ public:

    float getFaceshiftEyeDeflection() const { return _faceshiftEyeDeflection; }
    void setFaceshiftEyeDeflection(float faceshiftEyeDeflection) { _faceshiftEyeDeflection = faceshiftEyeDeflection; bumpSettings(); }
+    const QString& getFaceshiftHostname() const { return _faceshiftHostname; }
+    void setFaceshiftHostname(const QString& hostname) { _faceshiftHostname = hostname; bumpSettings(); }
    QString getSnapshotsLocation() const;
    void setSnapshotsLocation(QString snapshotsLocation) { _snapshotsLocation = snapshotsLocation; bumpSettings(); }

@ -271,6 +273,7 @@ private:
    float _fieldOfView; /// in Degrees, doesn't apply to HMD like Oculus
    float _realWorldFieldOfView;   //  The actual FOV set by the user's monitor size and view distance
    float _faceshiftEyeDeflection;
+    QString _faceshiftHostname;
    FrustumDrawMode _frustumDrawMode;
    ViewFrustumOffset _viewFrustumOffset;
    QPointer<MetavoxelEditor> _MetavoxelEditor;
--- a/interface/src/Util.cpp
+++ b/interface/src/Util.cpp
@ -181,9 +181,10 @@ const glm::vec3 randVector() {
 }

 static TextRenderer* textRenderer(int mono) {
-    static TextRenderer* monoRenderer = new TextRenderer(MONO_FONT_FAMILY); 
-    static TextRenderer* proportionalRenderer = new TextRenderer(SANS_FONT_FAMILY, -1, -1, false, TextRenderer::SHADOW_EFFECT); 
-    static TextRenderer* inconsolataRenderer = new TextRenderer(INCONSOLATA_FONT_FAMILY, -1, QFont::Bold, false);
+    static TextRenderer* monoRenderer = TextRenderer::getInstance(MONO_FONT_FAMILY); 
+    static TextRenderer* proportionalRenderer = TextRenderer::getInstance(SANS_FONT_FAMILY,
+        -1, -1, false, TextRenderer::SHADOW_EFFECT);
+    static TextRenderer* inconsolataRenderer = TextRenderer::getInstance(INCONSOLATA_FONT_FAMILY, -1, QFont::Bold, false);
    switch (mono) {
        case 1:
            return monoRenderer;
--- a/interface/src/avatar/Avatar.cpp
+++ b/interface/src/avatar/Avatar.cpp
@ -239,8 +239,9 @@ enum TextRendererType {
 };

 static TextRenderer* textRenderer(TextRendererType type) {
-    static TextRenderer* chatRenderer = new TextRenderer(SANS_FONT_FAMILY, 24, -1, false, TextRenderer::SHADOW_EFFECT);
-    static TextRenderer* displayNameRenderer = new TextRenderer(SANS_FONT_FAMILY, 12, -1, false, TextRenderer::NO_EFFECT);
+    static TextRenderer* chatRenderer = TextRenderer::getInstance(SANS_FONT_FAMILY, 24, -1,
+        false, TextRenderer::SHADOW_EFFECT);
+    static TextRenderer* displayNameRenderer = TextRenderer::getInstance(SANS_FONT_FAMILY, 12);

    switch(type) {
    case CHAT:
--- a/interface/src/devices/Faceshift.cpp
+++ b/interface/src/devices/Faceshift.cpp
@ -151,7 +151,7 @@ void Faceshift::connectSocket() {
            qDebug("Faceshift: Connecting...");
        }

-        _tcpSocket.connectToHost("localhost", FACESHIFT_PORT);
+        _tcpSocket.connectToHost(Menu::getInstance()->getFaceshiftHostname(), FACESHIFT_PORT);
        _tracking = false;
    }
 }
--- a/interface/src/devices/PrioVR.cpp
+++ b/interface/src/devices/PrioVR.cpp
@ -207,10 +207,11 @@ void PrioVR::renderCalibrationCountdown() {
        Application::getInstance()->disconnect(this);
        return;
    }
-    static TextRenderer textRenderer(MONO_FONT_FAMILY, 18, QFont::Bold, false, TextRenderer::OUTLINE_EFFECT, 2);
+    static TextRenderer* textRenderer = TextRenderer::getInstance(MONO_FONT_FAMILY, 18, QFont::Bold,
+        false, TextRenderer::OUTLINE_EFFECT, 2);
    QByteArray text = "Assume T-Pose in " + QByteArray::number(secondsRemaining) + "...";
-    textRenderer.draw((Application::getInstance()->getGLWidget()->width() -
-        textRenderer.computeWidth(text.constData())) / 2, Application::getInstance()->getGLWidget()->height() / 2,
+    textRenderer->draw((Application::getInstance()->getGLWidget()->width() -
+        textRenderer->computeWidth(text.constData())) / 2, Application::getInstance()->getGLWidget()->height() / 2,
            text);
 #endif  
 }
--- a/interface/src/ui/BandwidthMeter.cpp
+++ b/interface/src/ui/BandwidthMeter.cpp
@ -50,7 +50,7 @@ BandwidthMeter::ChannelInfo BandwidthMeter::_CHANNELS[] = {
 };

 BandwidthMeter::BandwidthMeter() :
-    _textRenderer(INCONSOLATA_FONT_FAMILY, -1, QFont::Bold, false),
+    _textRenderer(TextRenderer::getInstance(INCONSOLATA_FONT_FAMILY, -1, QFont::Bold, false)),
    _scaleMaxIndex(INITIAL_SCALE_MAXIMUM_INDEX) {

    _channels = static_cast<ChannelInfo*>( malloc(sizeof(_CHANNELS)) );
@ -140,7 +140,7 @@ void BandwidthMeter::render(int screenWidth, int screenHeight) {
    float totalMax = glm::max(totalIn, totalOut);

    // Get font / caption metrics
-    QFontMetrics const& fontMetrics = _textRenderer.metrics();
+    QFontMetrics const& fontMetrics = _textRenderer->metrics();
    int fontDescent = fontMetrics.descent(); 
    int labelWidthIn = fontMetrics.width(CAPTION_IN);
    int labelWidthOut = fontMetrics.width(CAPTION_OUT);
@ -163,9 +163,9 @@ void BandwidthMeter::render(int screenWidth, int screenHeight) {

    // Render captions
    setColorRGBA(COLOR_TEXT);
-    _textRenderer.draw(barWidth + SPACING_LEFT_CAPTION_UNIT, textYcenteredLine, CAPTION_UNIT);
-    _textRenderer.draw(-labelWidthIn - SPACING_RIGHT_CAPTION_IN_OUT, textYupperLine, CAPTION_IN);
-    _textRenderer.draw(-labelWidthOut - SPACING_RIGHT_CAPTION_IN_OUT, textYlowerLine, CAPTION_OUT);
+    _textRenderer->draw(barWidth + SPACING_LEFT_CAPTION_UNIT, textYcenteredLine, CAPTION_UNIT);
+    _textRenderer->draw(-labelWidthIn - SPACING_RIGHT_CAPTION_IN_OUT, textYupperLine, CAPTION_IN);
+    _textRenderer->draw(-labelWidthOut - SPACING_RIGHT_CAPTION_IN_OUT, textYlowerLine, CAPTION_OUT);

    // Render vertical lines for the frame
    setColorRGBA(COLOR_FRAME);
@ -229,11 +229,11 @@ void BandwidthMeter::render(int screenWidth, int screenHeight) {
    char fmtBuf[8];
    setColorRGBA(COLOR_TEXT);
    sprintf(fmtBuf, "%0.1f", totalIn);
-    _textRenderer.draw(glm::max(xIn - fontMetrics.width(fmtBuf) - PADDING_HORIZ_VALUE,
+    _textRenderer->draw(glm::max(xIn - fontMetrics.width(fmtBuf) - PADDING_HORIZ_VALUE,
                                PADDING_HORIZ_VALUE),
                       textYupperLine, fmtBuf);
    sprintf(fmtBuf, "%0.1f", totalOut);
-    _textRenderer.draw(glm::max(xOut - fontMetrics.width(fmtBuf) - PADDING_HORIZ_VALUE,
+    _textRenderer->draw(glm::max(xOut - fontMetrics.width(fmtBuf) - PADDING_HORIZ_VALUE,
                                PADDING_HORIZ_VALUE),
                       textYlowerLine, fmtBuf);

--- a/interface/src/ui/BandwidthMeter.h
+++ b/interface/src/ui/BandwidthMeter.h
@ -78,7 +78,7 @@ private:

    static ChannelInfo _CHANNELS[];

-    TextRenderer _textRenderer;
+    TextRenderer* _textRenderer;
    ChannelInfo* _channels;
    Stream _streams[N_STREAMS];
    int _scaleMaxIndex;
--- a/interface/src/ui/PreferencesDialog.cpp
+++ b/interface/src/ui/PreferencesDialog.cpp
@ -121,6 +121,8 @@ void PreferencesDialog::loadPreferences() {
    ui.faceshiftEyeDeflectionSider->setValue(menuInstance->getFaceshiftEyeDeflection() *
                                             ui.faceshiftEyeDeflectionSider->maximum());
    
+    ui.faceshiftHostnameEdit->setText(menuInstance->getFaceshiftHostname());
+    
    const InboundAudioStream::Settings& streamSettings = menuInstance->getReceivedAudioStreamSettings();

    ui.dynamicJitterBuffersCheckBox->setChecked(streamSettings._dynamicJitterBuffers);
@ -221,6 +223,9 @@ void PreferencesDialog::savePreferences() {

    Menu::getInstance()->setFaceshiftEyeDeflection(ui.faceshiftEyeDeflectionSider->value() /
                                                     (float)ui.faceshiftEyeDeflectionSider->maximum());
+    
+    Menu::getInstance()->setFaceshiftHostname(ui.faceshiftHostnameEdit->text());    
+    
    Menu::getInstance()->setMaxVoxelPacketsPerSecond(ui.maxVoxelsPPSSpin->value());

    Menu::getInstance()->setOculusUIAngularSize(ui.oculusUIAngularSizeSpin->value());
--- a/interface/src/ui/TextRenderer.cpp
+++ b/interface/src/ui/TextRenderer.cpp
@ -24,22 +24,23 @@
 // the width/height of the cached glyph textures
 const int IMAGE_SIZE = 256;

-Glyph::Glyph(int textureID, const QPoint& location, const QRect& bounds, int width) :
-    _textureID(textureID), _location(location), _bounds(bounds), _width(width) {
+static uint qHash(const TextRenderer::Properties& key, uint seed = 0) {
+    // can be switched to qHash(key.font, seed) when we require Qt 5.3+
+    return qHash(key.font.family(), qHash(key.font.pointSize(), seed));
 }

-TextRenderer::TextRenderer(const char* family, int pointSize, int weight, bool italic,
-        EffectType effectType, int effectThickness, QColor color) :
-    _font(family, pointSize, weight, italic),
-    _metrics(_font),
-    _effectType(effectType),
-    _effectThickness(effectThickness),
-    _x(IMAGE_SIZE),
-    _y(IMAGE_SIZE),
-    _rowHeight(0),
-    _color(color) {
-    
-    _font.setKerning(false);
+static bool operator==(const TextRenderer::Properties& p1, const TextRenderer::Properties& p2) {
+    return p1.font == p2.font && p1.effect == p2.effect && p1.effectThickness == p2.effectThickness && p1.color == p2.color;
+}
+
+TextRenderer* TextRenderer::getInstance(const char* family, int pointSize, int weight, bool italic,
+        EffectType effect, int effectThickness, const QColor& color) {
+    Properties properties = { QFont(family, pointSize, weight, italic), effect, effectThickness, color };
+    TextRenderer*& instance = _instances[properties];
+    if (!instance) {
+        instance = new TextRenderer(properties);
+    }
+    return instance;
 }

 TextRenderer::~TextRenderer() {
@ -122,6 +123,19 @@ int TextRenderer::computeWidth(const char* str)
    return width;
 }

+TextRenderer::TextRenderer(const Properties& properties) :
+    _font(properties.font),
+    _metrics(_font),
+    _effectType(properties.effect),
+    _effectThickness(properties.effectThickness),
+    _x(IMAGE_SIZE),
+    _y(IMAGE_SIZE),
+    _rowHeight(0),
+    _color(properties.color) {
+    
+    _font.setKerning(false);
+}
+
 const Glyph& TextRenderer::getGlyph(char c) {
    Glyph& glyph = _glyphs[c];
    if (glyph.isValid()) {
@ -213,3 +227,10 @@ const Glyph& TextRenderer::getGlyph(char c) {
    glBindTexture(GL_TEXTURE_2D, 0);
    return glyph;
 }
+
+QHash<TextRenderer::Properties, TextRenderer*> TextRenderer::_instances;
+
+Glyph::Glyph(int textureID, const QPoint& location, const QRect& bounds, int width) :
+    _textureID(textureID), _location(location), _bounds(bounds), _width(width) {
+}
+
--- a/interface/src/ui/TextRenderer.h
+++ b/interface/src/ui/TextRenderer.h
@ -33,7 +33,6 @@ const char SOLID_BLOCK_CHAR = 127;
 // the Inconsolata font family
 #define INCONSOLATA_FONT_FAMILY "Inconsolata"

-
 class Glyph;

 class TextRenderer {
@ -41,9 +40,17 @@ public:

    enum EffectType { NO_EFFECT, SHADOW_EFFECT, OUTLINE_EFFECT };

-    TextRenderer(const char* family, int pointSize = -1, int weight = -1, bool italic = false,
-                 EffectType effect = NO_EFFECT, int effectThickness = 1,
-                 QColor color = QColor(255, 255, 255));
+    class Properties {
+    public:
+        QFont font;
+        EffectType effect;
+        int effectThickness;
+        QColor color;
+    };
+
+    static TextRenderer* getInstance(const char* family, int pointSize = -1, int weight = -1, bool italic = false,
+        EffectType effect = NO_EFFECT, int effectThickness = 1, const QColor& color = QColor(255, 255, 255));
+
    ~TextRenderer();

    const QFontMetrics& metrics() const { return _metrics; }
@ -59,7 +66,9 @@ public:
    
 private:

-    const Glyph& getGlyph (char c);
+    TextRenderer(const Properties& properties);
+
+    const Glyph& getGlyph(char c);

    // the font to render
    QFont _font;
@ -90,6 +99,8 @@ private:
    
    // text color
    QColor _color;
+    
+    static QHash<Properties, TextRenderer*> _instances;
 };

 class Glyph {
--- a/interface/src/ui/overlays/TextOverlay.cpp
+++ b/interface/src/ui/overlays/TextOverlay.cpp
@ -45,22 +45,21 @@ void TextOverlay::render() {

    //TextRenderer(const char* family, int pointSize = -1, int weight = -1, bool italic = false,
    //             EffectType effect = NO_EFFECT, int effectThickness = 1);
-    TextRenderer textRenderer(SANS_FONT_FAMILY, _fontSize, 50, false, TextRenderer::NO_EFFECT, 1,
-                              QColor(_color.red, _color.green, _color.blue));
+    TextRenderer* textRenderer = TextRenderer::getInstance(SANS_FONT_FAMILY, _fontSize, 50);
    
    const int leftAdjust = -1; // required to make text render relative to left edge of bounds
    const int topAdjust = -2; // required to make text render relative to top edge of bounds
    int x = _bounds.left() + _leftMargin + leftAdjust;
    int y = _bounds.top() + _topMargin + topAdjust;
    
-    glColor3f(1.0f, 1.0f, 1.0f);
+    glColor3f(_color.red / MAX_COLOR, _color.green / MAX_COLOR, _color.blue / MAX_COLOR);
    QStringList lines = _text.split("\n");
    int lineOffset = 0;
    foreach(QString thisLine, lines) {
        if (lineOffset == 0) {
-            lineOffset = textRenderer.calculateHeight(qPrintable(thisLine));
+            lineOffset = textRenderer->calculateHeight(qPrintable(thisLine));
        }
-        lineOffset += textRenderer.draw(x, y + lineOffset, qPrintable(thisLine));
+        lineOffset += textRenderer->draw(x, y + lineOffset, qPrintable(thisLine));

        const int lineGap = 2;
        lineOffset += lineGap;
--- a/interface/ui/preferencesDialog.ui
+++ b/interface/ui/preferencesDialog.ui
@ -1726,6 +1726,70 @@
       </item>
      </layout>
     </item>
+     <item>
+      <layout class="QHBoxLayout" name="horizontalLayout_999">
+       <property name="spacing">
+        <number>0</number>
+       </property>
+       <property name="topMargin">
+        <number>7</number>
+       </property>
+       <property name="rightMargin">
+        <number>0</number>
+       </property>
+       <property name="bottomMargin">
+        <number>7</number>
+       </property>
+       <item>
+        <widget class="QLabel" name="label_999">
+         <property name="font">
+          <font>
+           <family>Arial</family>
+          </font>
+         </property>
+         <property name="text">
+          <string>Faceshift hostname</string>
+         </property>
+         <property name="indent">
+          <number>0</number>
+         </property>
+         <property name="buddy">
+          <cstring>faceshiftHostnameEdit</cstring>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <spacer name="horizontalSpacer_999">
+         <property name="font">
+          <font>
+           <family>Arial</family>
+          </font>
+         </property>
+         <property name="orientation">
+          <enum>Qt::Horizontal</enum>
+         </property>
+        </spacer>
+       </item>
+       <item>
+        <widget class="QLineEdit" name="faceshiftHostnameEdit">
+           <property name="font">
+            <font>
+             <family>Arial</family>
+            </font>
+           </property>
+           <property name="layoutDirection">
+            <enum>Qt::LeftToRight</enum>
+           </property>
+           <property name="styleSheet">
+            <string notr="true"/>
+           </property>
+           <property name="placeholderText">
+            <string>localhost</string>
+           </property>
+          </widget>
+       </item>
+      </layout>
+     </item>   
     <item>
      <widget class="QLabel" name="voxelsTitleLabel">
       <property name="sizePolicy">