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

Fix for nacmesh viewing on low gfx setting and llpathinglib update.

meow-7.2.2
prep 2012-02-24 14:34:53 -05:00
parent b7d93d8adf
commit b64773bf2d
3 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
autobuild.xml
View File

@ -1110,9 +1110,9 @@
<key>archive</key>
<map>
<key>hash</key>
<string>def036f4001f9b95824ea490a0d71560</string>
<string>0fb8533cb26dd2707d10904cd4c177b9</string>
<key>url</key>
<string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/stinson_llpathinglibrary/rev/249863/arch/Darwin/installer/llphysicsextensions-0.1-darwin-20120222.tar.bz2</string>
<string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/stinson_llpathinglibrary/rev/249990/arch/Darwin/installer/llphysicsextensions-0.1-darwin-20120224.tar.bz2</string>
</map>
<key>name</key>
<string>darwin</string>
@ -1122,9 +1122,9 @@
<key>archive</key>
<map>
<key>hash</key>
<string>57dd508275c311e98c7ee39cd58b517f</string>
<string>32712ec04262c251e84a277ef0215c4a</string>
<key>url</key>
<string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/stinson_llpathinglibrary/rev/249863/arch/Linux/installer/llphysicsextensions-0.1-linux-20120222.tar.bz2</string>
<string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/stinson_llpathinglibrary/rev/249990/arch/Linux/installer/llphysicsextensions-0.1-linux-20120224.tar.bz2</string>
</map>
<key>name</key>
<string>linux</string>
@ -1134,9 +1134,9 @@
<key>archive</key>
<map>
<key>hash</key>
<string>6902dc4da5e6be1c1f5f0275a5a8d8ef</string>
<string>4604a26b599e7cb2478835fcceff7f24</string>
<key>url</key>
<string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/stinson_llpathinglibrary/rev/249863/arch/CYGWIN/installer/llphysicsextensions-0.1-windows-20120222.tar.bz2</string>
<string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/stinson_llpathinglibrary/rev/249990/arch/CYGWIN/installer/llphysicsextensions-0.1-windows-20120224.tar.bz2</string>
</map>
<key>name</key>
<string>windows</string>

13
indra/llrender/llrendernavprim.cpp
View File

@ -37,6 +37,7 @@ LLRenderNavPrim gRenderNav;
//=============================================================================
void LLRenderNavPrim::renderSegment( const LLVector3& start, const LLVector3& end, int color, bool overlayMode ) const
{
bool ff = LLGLSLShader::sNoFixedFunction;
LLGLSLShader::sNoFixedFunction = false;
LLGLEnable smooth(GL_LINE_SMOOTH);
LLColor4 colorA( color );
@ -51,7 +52,7 @@ void LLRenderNavPrim::renderSegment( const LLVector3& start, const LLVector3& en
gGL.end();
gGL.flush();
LLGLSLShader::sNoFixedFunction = true;
LLGLSLShader::sNoFixedFunction = ff;
LLGLDisable smoothout(GL_LINE_SMOOTH);
glLineWidth(1.0f);
}
@ -70,7 +71,8 @@ void LLRenderNavPrim::renderTri( const LLVector3& a, const LLVector3& b, const L
LLGLEnable cull(GL_CULL_FACE);
LLColor4 colorA( color );
colorA*=1.25f;
gGL.color4fv( colorA.mV );
gGL.color4fv( colorA.mV );
bool ff = LLGLSLShader::sNoFixedFunction;
LLGLSLShader::sNoFixedFunction = false;
gGL.begin(LLRender::TRIANGLES);
{
@ -82,14 +84,15 @@ void LLRenderNavPrim::renderTri( const LLVector3& a, const LLVector3& b, const L
gGL.flush();
glLineWidth(1.0f);
glPolygonMode( GL_FRONT_AND_BACK, GL_FILL );
LLGLSLShader::sNoFixedFunction = true;
LLGLSLShader::sNoFixedFunction = ff;
}
//=============================================================================
void LLRenderNavPrim::renderNavMeshVB( LLVertexBuffer* pVBO, int vertCnt )
{
LLGLEnable blend( GL_BLEND );
LLGLEnable cull( GL_CULL_FACE );
glLineWidth(1.5f);
glLineWidth(1.5f);
bool ff = LLGLSLShader::sNoFixedFunction;
LLGLSLShader::sNoFixedFunction = false;
//pass 1 filled
pVBO->setBuffer( LLVertexBuffer::MAP_VERTEX | LLVertexBuffer::MAP_COLOR | LLVertexBuffer::MAP_NORMAL );
@ -98,7 +101,7 @@ void LLRenderNavPrim::renderNavMeshVB( LLVertexBuffer* pVBO, int vertCnt )
LLGLEnable smooth( GL_LINE_SMOOTH );
//pass 2 outlined
pVBO->drawArrays( LLRender::TRIANGLES, 0, vertCnt );
LLGLSLShader::sNoFixedFunction = true;
LLGLSLShader::sNoFixedFunction = ff;
glLineWidth(1.0f);
glPolygonMode( GL_FRONT_AND_BACK, GL_FILL );
LLGLDisable smoothout( GL_LINE_SMOOTH );

1
indra/newview/llviewerdisplay.cpp
View File

@ -911,6 +911,7 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield, BOOL for_snapshot)
//NavMesh
if (pathfindingConsole->isRenderNavMesh())
{
glClear(GL_DEPTH_BUFFER_BIT | GL_COLOR_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
llPathingLibInstance->renderNavMesh();
exclusiveDraw = true;
}