Huge renderer update (WIP). Still plenty to do, especially pertaining to UI.

-Nametag bubble visbility is oddly inconsistent. May vanish with future planned UI merges...
-VBOs are PAINFULLY slow on ATI hardware. This repos self-compiled davep/shining-fixes branch, so I'll leave the ball in LL's court for now regarding that.
This commit is contained in:
Shyotl
2011-12-09 14:02:29 -06:00
parent 8e7733b2ce
commit ffb285c6ff
499 changed files with 22321 additions and 12356 deletions

View File

@@ -59,10 +59,12 @@
#include "llinventorydefines.h"
#include "llinventorymodel.h"
#include "lllandmarklist.h"
#include "llprogressview.h"
#include "llsky.h"
#include "llui.h"
#include "llviewercamera.h"
#include "llviewerinventory.h"
#include "llviewerwindow.h"
#include "llworld.h"
#include "llworldmapview.h"
#include "llviewercontrol.h"
@@ -119,6 +121,7 @@ void LLTracker::stopTracking(void* userdata)
// static virtual
void LLTracker::drawHUDArrow()
{
if (gViewerWindow->getProgressView()->getVisible()) return;
/* tracking autopilot destination has been disabled
-- 2004.01.09, Leviathan
// Draw dot for autopilot target
@@ -313,6 +316,7 @@ void LLTracker::trackAvatar( const LLUUID& avatar_id, const std::string& name )
LLAvatarTracker::instance().track( avatar_id, name );
instance()->mTrackingStatus = TRACKING_AVATAR;
instance()->mLabel = name;
instance()->mToolTip = "";
}
@@ -328,6 +332,7 @@ void LLTracker::trackLandmark( const LLUUID& asset_id, const LLUUID& item_id, co
instance()->cacheLandmarkPosition();
instance()->mTrackingStatus = TRACKING_LANDMARK;
instance()->mLabel = name;
instance()->mToolTip = "";
}
@@ -581,16 +586,16 @@ void LLTracker::renderBeacon(LLVector3d pos_global,
std::string text;
text = llformat( "%.0f m", to_vec.magVec());
LLWString wstr;
wstr += utf8str_to_wstring(label);
wstr += '\n';
wstr += utf8str_to_wstring(text);
std::string str;
str += label;
str += '\n';
str += text;
hud_textp->setFont(LLFontGL::getFontSansSerif());
hud_textp->setZCompare(FALSE);
hud_textp->setColor(LLColor4(1.f, 1.f, 1.f, llmax(0.2f, llmin(1.f,(dist-FADE_DIST)/FADE_DIST))));
hud_textp->setString(wstr);
hud_textp->setString(str);
hud_textp->setVertAlignment(LLHUDText::ALIGN_VERT_CENTER);
hud_textp->setPositionAgent(pos_agent);
}