From 69b732185ea7176d6ca0e8c1f239cd6fa0e426c2 Mon Sep 17 00:00:00 2001 From: Todd Stinson Date: Tue, 14 Feb 2012 17:41:35 -0800 Subject: PATH-198: Hooking up the path status indicator to some existing state information. --- indra/newview/llfloaterpathfindingconsole.cpp | 42 +++++++++++++++++++++++++-- 1 file changed, 40 insertions(+), 2 deletions(-) (limited to 'indra/newview/llfloaterpathfindingconsole.cpp') diff --git a/indra/newview/llfloaterpathfindingconsole.cpp b/indra/newview/llfloaterpathfindingconsole.cpp index 62f7b9c85c..eccea867c7 100644 --- a/indra/newview/llfloaterpathfindingconsole.cpp +++ b/indra/newview/llfloaterpathfindingconsole.cpp @@ -97,9 +97,13 @@ BOOL LLFloaterPathfindingConsole::postBuild() mCharacterWidthSlider->setCommitCallback(boost::bind(&LLFloaterPathfindingConsole::onCharacterWidthSet, this)); mCharacterTypeRadioGroup = findChild("character_type"); - llassert(mCharacterTypeRadioGroup != NULL); + llassert(mCharacterTypeRadioGroup != NULL); mCharacterTypeRadioGroup->setCommitCallback(boost::bind(&LLFloaterPathfindingConsole::onCharacterTypeSwitch, this)); + mPathTestingStatus = findChild("path_test_status"); + llassert(mPathTestingStatus != NULL); + updatePathTestStatus(); + return LLFloater::postBuild(); } @@ -125,6 +129,7 @@ BOOL LLFloaterPathfindingConsole::handleAnyMouseClick(S32 x, S32 y, MASK mask, E mHasEndPoint = true; } generatePath(); + updatePathTestStatus(); return TRUE; } @@ -316,6 +321,7 @@ LLFloaterPathfindingConsole::LLFloaterPathfindingConsole(const LLSD& pSeed) mEditTestTabContainer(NULL), mCharacterWidthSlider(NULL), mCharacterTypeRadioGroup(NULL), + mPathTestingStatus(NULL), mNavMeshCnt(0), mHasStartPoint(false), mHasEndPoint(false) @@ -421,6 +427,7 @@ void LLFloaterPathfindingConsole::onShowWorldToggle() void LLFloaterPathfindingConsole::onCharacterWidthSet() { generatePath(); + updatePathTestStatus(); } void LLFloaterPathfindingConsole::onCharacterTypeSwitch() @@ -451,7 +458,7 @@ void LLFloaterPathfindingConsole::onCharacterTypeSwitch() llassert(0); break; } - + updatePathTestStatus(); } void LLFloaterPathfindingConsole::onViewCharactersClicked() @@ -468,6 +475,7 @@ void LLFloaterPathfindingConsole::onClearPathClicked() { mHasStartPoint = false; mHasEndPoint = false; + updatePathTestStatus(); } void LLFloaterPathfindingConsole::generatePath() @@ -478,3 +486,33 @@ void LLFloaterPathfindingConsole::generatePath() LLPathingLib::getInstance()->generatePath(mPathData); } } + +void LLFloaterPathfindingConsole::updatePathTestStatus() +{ + static const LLColor4 warningColor = LLUIColorTable::instance().getColor("DrYellow"); + + std::string statusText(""); + LLStyle::Params styleParams; + + if (!mHasStartPoint && !mHasEndPoint) + { + statusText = getString("pathing_choose_start_and_end_points"); + styleParams.color = warningColor; + } + else if (!mHasStartPoint && mHasEndPoint) + { + statusText = getString("pathing_choose_start_point"); + styleParams.color = warningColor; + } + else if (mHasStartPoint && !mHasEndPoint) + { + statusText = getString("pathing_choose_end_point"); + styleParams.color = warningColor; + } + else + { + statusText = getString("pathing_path_valid"); + } + + mPathTestingStatus->setText((LLStringExplicit)statusText, styleParams); +} -- cgit v1.3