Merge pull request #2856 from secondlife/marchcat/c-develop

Develop → Maint C sync

1 files changed, 22 insertions, 25 deletions

diff --git a/indra/newview/llhudrender.cpp b/indra/newview/llhudrender.cpp
index e862fc7bc1..2255eb236f 100644
--- a/indra/newview/llhudrender.cpp
+++ b/indra/newview/llhudrender.cpp
@@ -38,26 +38,32 @@
 #include "llviewerwindow.h"
 #include "llui.h"
 
+#include <glm/gtc/matrix_transform.hpp>
+#include <glm/gtc/type_ptr.hpp>
+
 void hud_render_utf8text(const std::string &str, const LLVector3 &pos_agent,
+                     LLFontVertexBuffer *font_buffer,
                      const LLFontGL &font,
                      const U8 style,
                      const LLFontGL::ShadowType shadow,
                      const F32 x_offset, const F32 y_offset,
                      const LLColor4& color,
-                     const BOOL orthographic)
+                     const bool orthographic)
 {
     LLWString wstr(utf8str_to_wstring(str));
-    hud_render_text(wstr, pos_agent, font, style, shadow, x_offset, y_offset, color, orthographic);
+    hud_render_text(wstr, pos_agent, font_buffer, font, style, shadow, x_offset, y_offset, color, orthographic);
 }
 
 void hud_render_text(const LLWString &wstr, const LLVector3 &pos_agent,
+                    LLFontVertexBuffer *font_buffer,
                     const LLFontGL &font,
                     const U8 style,
                     const LLFontGL::ShadowType shadow,
                     const F32 x_offset, const F32 y_offset,
                     const LLColor4& color,
-                    const BOOL orthographic)
+                    const bool orthographic)
 {
+    LL_PROFILE_ZONE_SCOPED_CATEGORY_UI;
     LLViewerCamera* camera = LLViewerCamera::getInstance();
     // Do cheap plane culling
     LLVector3 dir_vec = pos_agent - camera->getOrigin();
@@ -100,26 +106,10 @@ void hud_render_text(const LLWString &wstr, const LLVector3 &pos_agent,
 
     //get the render_pos in screen space
 
-    F64 winX, winY, winZ;
     LLRect world_view_rect = gViewerWindow->getWorldViewRectRaw();
-    S32 viewport[4];
-    viewport[0] = world_view_rect.mLeft;
-    viewport[1] = world_view_rect.mBottom;
-    viewport[2] = world_view_rect.getWidth();
-    viewport[3] = world_view_rect.getHeight();
-
-    F64 mdlv[16];
-    F64 proj[16];
-
-    for (U32 i = 0; i < 16; i++)
-    {
-        mdlv[i] = (F64) gGLModelView[i];
-        proj[i] = (F64) gGLProjection[i];
-    }
+    glm::ivec4 viewport(world_view_rect.mLeft, world_view_rect.mBottom, world_view_rect.getWidth(), world_view_rect.getHeight());
 
-    gluProject(render_pos.mV[0], render_pos.mV[1], render_pos.mV[2],
-                mdlv, proj, (GLint*) viewport,
-                &winX, &winY, &winZ);
+    glm::vec3 win_coord = glm::project(glm::make_vec3(LLVector4(render_pos).mV), get_current_modelview(), get_current_projection(), viewport);
 
     //fonts all render orthographically, set up projection``
     gGL.matrixMode(LLRender::MM_PROJECTION);
@@ -131,14 +121,21 @@ void hud_render_text(const LLWString &wstr, const LLVector3 &pos_agent,
     gl_state_for_2d(world_view_rect.getWidth(), world_view_rect.getHeight());
     gViewerWindow->setup3DViewport();
 
-    winX -= world_view_rect.mLeft;
-    winY -= world_view_rect.mBottom;
+    win_coord.x -= world_view_rect.mLeft;
+    win_coord.y -= world_view_rect.mBottom;
     LLUI::loadIdentity();
     gGL.loadIdentity();
-    LLUI::translate((F32) winX*1.0f/LLFontGL::sScaleX, (F32) winY*1.0f/(LLFontGL::sScaleY), -(((F32) winZ*2.f)-1.f));
+    LLUI::translate((F32) win_coord.x*1.0f/LLFontGL::sScaleX, (F32) win_coord.y*1.0f/(LLFontGL::sScaleY), -(((F32) win_coord.z*2.f)-1.f));
     F32 right_x;
 
-    font.render(wstr, 0, 0, 1, color, LLFontGL::LEFT, LLFontGL::BASELINE, style, shadow, wstr.length(), 1000, &right_x, /*use_ellipses*/false, /*use_color*/true);
+    if (font_buffer)
+    {
+        font_buffer->render(&font, wstr, 0, 0, 1, color, LLFontGL::LEFT, LLFontGL::BASELINE, style, shadow, static_cast<S32>(wstr.length()), 1000, &right_x, /*use_ellipses*/false, /*use_color*/true);
+    }
+    else
+    {
+        font.render(wstr, 0, 0, 1, color, LLFontGL::LEFT, LLFontGL::BASELINE, style, shadow, static_cast<S32>(wstr.length()), 1000, &right_x, /*use_ellipses*/false, /*use_color*/true);
+    }
 
     LLUI::popMatrix();
     gGL.popMatrix();