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

Fix for: assert when rendering paths, wireframe world when navmesh render disabled, heat map breaking walkables etc, and navmesh edges being offset from navmesh

meow-7.2.2
Dave Parks 2012-04-05 00:28:04 -05:00
parent 0b75e17f41
commit 669addd719
2 changed files with 31 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
autobuild.xml
View File

@ -1112,7 +1112,7 @@
<key>hash</key>
<string>dfd1e738be5d48f5d99a903936cbce31</string>
<key>url</key>
<string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/stinson_llpathinglibrary_xray/rev/252987/arch/Darwin/installer/llphysicsextensions-0.1-darwin-20120404.tar.bz2</string>
<string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/stinson_llpathinglibrary_xray/rev/253100/arch/Darwin/installer/llphysicsextensions-0.1-darwin-20120404.tar.bz2</string>
</map>
<key>name</key>
<string>darwin</string>
@ -1122,9 +1122,9 @@
<key>archive</key>
<map>
<key>hash</key>
<string>2656b0b7eddf19ca67ad5b55100b8782</string>
<string>b98d39ed597a56a4f6c1e9624ad4c92c</string>
<key>url</key>
<string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/stinson_llpathinglibrary_xray/rev/252987/arch/Linux/installer/llphysicsextensions-0.1-linux-20120404.tar.bz2</string>
<string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/stinson_llpathinglibrary_xray/rev/253100/arch/Linux/installer/llphysicsextensions-0.1-linux-20120405.tar.bz2</string>
</map>
<key>name</key>
<string>linux</string>
@ -1134,9 +1134,9 @@
<key>archive</key>
<map>
<key>hash</key>
<string>5ad3230901d4683902aa3bdf995309b2</string>
<string>5bcff9a15f78ffe09aafd5fbe02076cb</string>
<key>url</key>
<string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/stinson_llpathinglibrary_xray/rev/252987/arch/CYGWIN/installer/llphysicsextensions-0.1-windows-20120404.tar.bz2</string>
<string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/stinson_llpathinglibrary_xray/rev/253100/arch/CYGWIN/installer/llphysicsextensions-0.1-windows-20120404.tar.bz2</string>
</map>
<key>name</key>
<string>windows</string>

36
indra/newview/pipeline.cpp
View File

@ -4341,11 +4341,7 @@ void LLPipeline::renderDebug()
gPathfindingProgram.uniform1f("alpha_scale", 1.f);
}
if ( pathfindingConsole->isRenderWorld() )
{
glPolygonMode( GL_FRONT_AND_BACK, GL_LINE );
}
else
if ( !pathfindingConsole->isRenderWorld() )
{
const LLColor4 &clearColor = pathfindingConsole->mNavMeshColors.mNavMeshClear;
gGL.setColorMask(true, true);
@ -4361,11 +4357,21 @@ void LLPipeline::renderDebug()
glLineWidth(2.0f);
LLGLEnable cull(GL_CULL_FACE);
LLGLDisable blend(GL_BLEND);
int materialIndex = pathfindingConsole->getHeatMapType();
llPathingLibInstance->renderNavMesh( materialIndex );
//render edges
int materialIndex = pathfindingConsole->getHeatMapType();
if ( pathfindingConsole->isRenderWorld() )
{
LLGLEnable blend(GL_BLEND);
gPathfindingProgram.uniform1f("alpha_scale", 0.66f);
llPathingLibInstance->renderNavMesh( materialIndex );
}
else
{
llPathingLibInstance->renderNavMesh( materialIndex );
}
//render edges
if (LLGLSLShader::sNoFixedFunction)
{
gPathfindingNoNormalsProgram.bind();
@ -4388,7 +4394,17 @@ void LLPipeline::renderDebug()
if ( pathfindingConsole->isRenderPath() )
{
LLGLEnable blend(GL_BLEND);
llPathingLibInstance->renderPath();
if (LLGLSLShader::sNoFixedFunction)
{
gUIProgram.bind();
gGL.getTexUnit(0)->bind(LLViewerFetchedTexture::sWhiteImagep);
llPathingLibInstance->renderPath();
gPathfindingProgram.bind();
}
else
{
llPathingLibInstance->renderPath();
}
}
//physics/exclusion shapes
if ( pathfindingConsole->isRenderAnyShapes() )