livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Ensuring that the pathfinding console member variables are private with accessor functions where need be.

master
Todd Stinson 2012-04-18 18:34:54 -07:00
parent d2850572a4
commit 12207b5f2c
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
indra/newview/llfloaterpathfindingconsole.cpp
View File

@ -390,7 +390,12 @@ void LLFloaterPathfindingConsole::setRenderHeatmapType(LLPathingLib::LLPLCharact
break;
}
return mShowNavMeshWalkabilityComboBox->setValue(comboBoxValue);
mShowNavMeshWalkabilityComboBox->setValue(comboBoxValue);
}
const LLColor4 &LLFloaterPathfindingConsole::getNavMeshBackgroundColor() const
{
return mNavMeshColors.mNavMeshClear;
}
LLFloaterPathfindingConsole::LLFloaterPathfindingConsole(const LLSD& pSeed)

6
indra/newview/llfloaterpathfindingconsole.h
View File

@ -47,6 +47,7 @@ class LLTabContainer;
class LLComboBox;
class LLButton;
class LLToolset;
class LLColor4;
class LLFloaterPathfindingConsole
: public LLFloater
@ -87,6 +88,8 @@ public:
LLPathingLib::LLPLCharacterType getRenderHeatmapType() const;
void setRenderHeatmapType(LLPathingLib::LLPLCharacterType pRenderHeatmapType);
const LLColor4 &getNavMeshBackgroundColor() const;
protected:
private:
@ -185,8 +188,7 @@ private:
static LLHandle<LLFloaterPathfindingConsole> sInstanceHandle;
public:
LLPathingLib::NavMeshColors mNavMeshColors;
LLPathingLib::NavMeshColors mNavMeshColors;
};
#endif // LL_LLFLOATERPATHFINDINGCONSOLE_H

2
indra/newview/pipeline.cpp
View File

@ -4353,7 +4353,7 @@ void LLPipeline::renderDebug()
if ( !pathfindingConsole->isRenderWorld() )
{
const LLColor4 &clearColor = pathfindingConsole->mNavMeshColors.mNavMeshClear;
const LLColor4 &clearColor = pathfindingConsole->getNavMeshBackgroundColor();
gGL.setColorMask(true, true);
glClearColor(clearColor.mV[0],clearColor.mV[1],clearColor.mV[2],0);
glClear(GL_DEPTH_BUFFER_BIT | GL_COLOR_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);