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

Path-267: Add support for rendering of walkable objects, obstacles and material phantoms.

meow-7.2.2
prep 2012-02-24 13:16:35 -05:00
parent 11bc6e9780
commit b7d93d8adf
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
indra/llrender/llrendernavprim.cpp
View File

@ -87,8 +87,7 @@ void LLRenderNavPrim::renderTri( const LLVector3& a, const LLVector3& b, const L
//=============================================================================
void LLRenderNavPrim::renderNavMeshVB( LLVertexBuffer* pVBO, int vertCnt )
{
LLGLSUIDefault gls_ui;
LLGLEnable depth( GL_DEPTH_TEST );
LLGLEnable blend( GL_BLEND );
LLGLEnable cull( GL_CULL_FACE );
glLineWidth(1.5f);
LLGLSLShader::sNoFixedFunction = false;
@ -96,13 +95,13 @@ void LLRenderNavPrim::renderNavMeshVB( LLVertexBuffer* pVBO, int vertCnt )
pVBO->setBuffer( LLVertexBuffer::MAP_VERTEX | LLVertexBuffer::MAP_COLOR | LLVertexBuffer::MAP_NORMAL );
pVBO->drawArrays( LLRender::TRIANGLES, 0, vertCnt );
glPolygonMode( GL_FRONT_AND_BACK, GL_LINE );
LLGLEnable smooth(GL_LINE_SMOOTH);
LLGLEnable smooth( GL_LINE_SMOOTH );
//pass 2 outlined
pVBO->drawArrays( LLRender::TRIANGLES, 0, vertCnt );
LLGLSLShader::sNoFixedFunction = true;
glLineWidth(1.0f);
glPolygonMode( GL_FRONT_AND_BACK, GL_FILL );
LLGLDisable smoothout(GL_LINE_SMOOTH);
LLGLDisable smoothout( GL_LINE_SMOOTH );
}
//=============================================================================
void LLRenderNavPrim::renderStar( const LLVector3& center, const float scale, int color ) const

2
indra/newview/llfloaterpathfindingconsole.cpp
View File

@ -248,7 +248,7 @@ void LLFloaterPathfindingConsole::onClose(bool pIsAppQuitting)
{
mAgentStateSlot.disconnect();
}
LLPathingLib::getInstance()->cleanupResidual();
LLFloater::onClose(pIsAppQuitting);
}