Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Resolved nametag bubble image failing to load promptly. Also updated texture to that used in v3, as it looks cleaner.

Browse Source
This commit is contained in:
Shyotl
2011-12-10 22:50:26 -06:00
parent 5919c9a788
commit 918d527b14
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
indra/newview/llhudnametag.cpp
View File

@@ -112,6 +112,7 @@ LLHUDNameTag::LLHUDNameTag(const U8 type)
{ {
LLPointer<LLHUDNameTag> ptr(this); LLPointer<LLHUDNameTag> ptr(this);
sTextObjects.insert(ptr); sTextObjects.insert(ptr);
mBubbleImage = LLUI::getUIImage("Rounded_Rect.png");
} }
LLHUDNameTag::~LLHUDNameTag() LLHUDNameTag::~LLHUDNameTag()
@@ -296,9 +297,6 @@ void LLHUDNameTag::renderText(BOOL for_select)
mOffsetY = lltrunc(mHeight * ((mVertAlignment == ALIGN_VERT_CENTER) ? 0.5f : 1.f)); mOffsetY = lltrunc(mHeight * ((mVertAlignment == ALIGN_VERT_CENTER) ? 0.5f : 1.f));
// *TODO: cache this image
LLUIImagePtr imagep = LLUI::getUIImage("rounded_square.tga");
// *TODO: make this a per-text setting // *TODO: make this a per-text setting
static const LLCachedControl<LLColor4> background_chat_color("BackgroundChatColor", LLColor4(0,0,0,1.f)); static const LLCachedControl<LLColor4> background_chat_color("BackgroundChatColor", LLColor4(0,0,0,1.f));
static const LLCachedControl<F32> chat_bubble_opacity("ChatBubbleOpacity", .5); static const LLCachedControl<F32> chat_bubble_opacity("ChatBubbleOpacity", .5);
@@ -331,7 +329,7 @@ void LLHUDNameTag::renderText(BOOL for_select)
LLViewerCamera::getInstance()->getPixelVectors(mPositionAgent, y_pixel_vec, x_pixel_vec); LLViewerCamera::getInstance()->getPixelVectors(mPositionAgent, y_pixel_vec, x_pixel_vec);
LLVector2 border_scale_vec((F32)border_width / (F32)imagep->getTextureWidth(), (F32)border_height / (F32)imagep->getTextureHeight()); LLVector2 border_scale_vec((F32)border_width / (F32)mBubbleImage->getTextureWidth(), (F32)border_height / (F32)mBubbleImage->getTextureHeight());
LLVector3 width_vec = mWidth * x_pixel_vec; LLVector3 width_vec = mWidth * x_pixel_vec;
LLVector3 height_vec = mHeight * y_pixel_vec; LLVector3 height_vec = mHeight * y_pixel_vec;
LLVector3 scaled_border_width = (F32)llfloor(border_scale * (F32)border_width) * x_pixel_vec; LLVector3 scaled_border_width = (F32)llfloor(border_scale * (F32)border_width) * x_pixel_vec;
@@ -379,11 +377,11 @@ void LLHUDNameTag::renderText(BOOL for_select)
} }
else else
{ {
gGL.getTexUnit(0)->bind(imagep->getImage()); gGL.getTexUnit(0)->bind(mBubbleImage->getImage());
gGL.color4fv(bg_color.mV); gGL.color4fv(bg_color.mV);
gl_segmented_rect_3d_tex(border_scale_vec, scaled_border_width, scaled_border_height, width_vec, height_vec); gl_segmented_rect_3d_tex(border_scale_vec, scaled_border_width, scaled_border_height, width_vec, height_vec);
if ( mLabelSegments.size()) if ( mLabelSegments.size())
{ {
LLUI::pushMatrix(); LLUI::pushMatrix();

3
indra/newview/llhudnametag.h
View File

@@ -37,6 +37,7 @@
#include "llrect.h" #include "llrect.h"
//#include "llframetimer.h" //#include "llframetimer.h"
#include "llfontgl.h" #include "llfontgl.h"
#include "lluiimage.h"
#include <set> #include <set>
#include <vector> #include <vector>
@@ -173,6 +174,8 @@ private:
EVertAlignment mVertAlignment; EVertAlignment mVertAlignment;
S32 mLOD; S32 mLOD;
BOOL mHidden; BOOL mHidden;
LLPointer<LLUIImage> mBubbleImage;
static BOOL sDisplayText ; static BOOL sDisplayText ;
static std::set<LLPointer<LLHUDNameTag> > sTextObjects; static std::set<LLPointer<LLHUDNameTag> > sTextObjects;

BIN
indra/newview/skins/default/textures/Rounded_Rect.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 338 B