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

Pick up "AlchemyMouselookInstructions setting and make mouselook instructions useful" from Alchemy

Browse Source
This commit is contained in:
Inusaito Sayori
2015-03-19 03:59:27 -04:00
parent 6cd7941fd2
commit 02c629a0b0
2 changed files with 55 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
indra/newview/app_settings/settings_ascent.xml
View File

@@ -157,6 +157,17 @@
<key>Value</key>
<real>380.0</real>
</map>
<key>AlchemyMouselookInstructions</key>
<map>
<key>Comment</key>
<string>Draw Mouselook Instructions</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>1</integer>
</map>
<key>AlchemyRainbowEffects</key>
<map>
<key>Comment</key>

79
indra/newview/llviewerwindow.cpp
View File

@@ -2601,7 +2601,8 @@ void LLViewerWindow::draw()
// Draw tool specific overlay on world
LLToolMgr::getInstance()->getCurrentTool()->draw();
if( gAgentCamera.cameraMouselook() )
static LLCachedControl<bool> drawMouselookInst(gSavedSettings, "AlchemyMouselookInstructions", true);
if (drawMouselookInst && (gAgentCamera.cameraMouselook()))
{
drawMouselookInstructions();
stop_glerror();
@@ -5051,44 +5052,52 @@ void LLViewerWindow::destroyWindow()
void LLViewerWindow::drawMouselookInstructions()
{
static const F32 INSTRUCTIONS_OPAQUE_TIME = 10.f;
static const F32 INSTRUCTIONS_FADE_TIME = 5.f;
F32 mouselook_duration = gAgentCamera.getMouseLookDuration();
if( mouselook_duration >= (INSTRUCTIONS_OPAQUE_TIME+INSTRUCTIONS_OPAQUE_TIME) )
return;
F32 alpha = 1.f;
if( mouselook_duration > INSTRUCTIONS_OPAQUE_TIME) //instructions are fading
{
alpha = (F32) sqrt(1.f-pow(((mouselook_duration-INSTRUCTIONS_OPAQUE_TIME)/INSTRUCTIONS_FADE_TIME),2.f));
}
// <alchemy>
// Draw instructions for mouselook ("Press ESC to leave Mouselook" in a box at the top of the screen.)
const std::string instructions = LLTrans::getString("LeaveMouselook");
const LLFontGL* font = LLResMgr::getInstance()->getRes( LLFONT_SANSSERIF );
const S32 INSTRUCTIONS_PAD = 5;
LLRect instructions_rect;
instructions_rect.setLeftTopAndSize(
INSTRUCTIONS_PAD,
getWindowHeight() - INSTRUCTIONS_PAD,
font->getWidth( instructions ) + 2 * INSTRUCTIONS_PAD,
llmath::llround(font->getLineHeight() + 2 * INSTRUCTIONS_PAD));
const LLFontGL* font = LLFontGL::getFontSansSerifBig();
//to be on top of Bottom bar when it is opened
const S32 INSTRUCTIONS_PAD = getWorldViewRectScaled().mTop - 15;
const S32 text_pos_start = getWorldViewRectScaled().getCenterX() - 150;
if (!gRlvHandler.hasBehaviour(RLV_BHVR_SHOWLOC))
{
gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
gGL.color4f( 0.9f, 0.9f, 0.9f, alpha );
gl_rect_2d( instructions_rect );
const LLVector3& vec = gAgent.getPositionAgent();
font->renderUTF8(
llformat("X: %.2f", vec.mV[VX]), 0,
text_pos_start,
INSTRUCTIONS_PAD,
LLColor4(1.0f, 0.5f, 0.5f, 0.5),
LLFontGL::HCENTER, LLFontGL::TOP,
LLFontGL::BOLD, LLFontGL::DROP_SHADOW_SOFT);
font->renderUTF8(
llformat("Y: %.2f", vec.mV[VX]), 0,
text_pos_start + 100,
INSTRUCTIONS_PAD,
LLColor4(0.5f, 1.0f, 0.5f, 0.5),
LLFontGL::HCENTER, LLFontGL::TOP,
LLFontGL::BOLD, LLFontGL::DROP_SHADOW_SOFT);
font->renderUTF8(
llformat("Z: %.2f", vec.mV[VX]), 0,
text_pos_start + 200,
INSTRUCTIONS_PAD,
LLColor4(0.5f, 0.5f, 1.0f, 0.5),
LLFontGL::HCENTER, LLFontGL::TOP,
LLFontGL::BOLD, LLFontGL::DROP_SHADOW_SOFT);
}
font->renderUTF8(
instructions, 0,
instructions_rect.mLeft + INSTRUCTIONS_PAD,
instructions_rect.mTop - INSTRUCTIONS_PAD,
LLColor4( 0.0f, 0.0f, 0.0f, alpha ),
LLFontGL::LEFT, LLFontGL::TOP);
const LLViewerParcelMgr& vpm = LLViewerParcelMgr::instance();
const bool allow_damage = vpm.allowAgentDamage(gAgent.getRegion(), vpm.getAgentParcel());
if (allow_damage)
{
const S32 health = gStatusBar ? gStatusBar->getHealth() : -1;
font->renderUTF8(
llformat("HP: %d%%", health), 0,
text_pos_start + 300,
INSTRUCTIONS_PAD,
LLColor4(1.0f, 1.0f, 1.0f, 0.5),
LLFontGL::HCENTER, LLFontGL::TOP,
LLFontGL::BOLD, LLFontGL::DROP_SHADOW_SOFT);
}
// </alchemy>
}
void* LLViewerWindow::getPlatformWindow() const