diff options
| author | prep <none@none> | 2012-03-07 10:34:49 -0500 |
|---|---|---|
| committer | prep <none@none> | 2012-03-07 10:34:49 -0500 |
| commit | 34a0a98f9d9557620b7586d343e8173a43164316 (patch) | |
| tree | 7d927a32b21be24c155f8077a05be2fd3e990c3b /indra/newview/pipeline.cpp | |
| parent | 4370d0263301a60988335e99d37f4b584f160f77 (diff) | |
Partial fix for Path-387. Path-287 Viewer perfomance tweaks.
Diffstat (limited to 'indra/newview/pipeline.cpp')
| -rw-r--r-- | indra/newview/pipeline.cpp | 35 |
1 files changed, 35 insertions, 0 deletions
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index 70cf09caca..2c61f70ef4 100644 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -105,6 +105,7 @@ #include "llcurl.h" #include "llnotifications.h" #include "LLPathingLib.h" +#include "llfloaterpathfindingconsole.h" #ifdef _DEBUG // Debug indices is disabled for now for debug performance - djs 4/24/02 @@ -4327,6 +4328,40 @@ void LLPipeline::renderDebug() LLMemType mt(LLMemType::MTYPE_PIPELINE); assertInitialized(); +
+ //Render any navmesh geometry
+ LLPathingLib *llPathingLibInstance = LLPathingLib::getInstance();
+ if ( llPathingLibInstance != NULL )
+ {
+ LLHandle<LLFloaterPathfindingConsole> pathfindingConsoleHandle = LLFloaterPathfindingConsole::getInstanceHandle();
+ if (!pathfindingConsoleHandle.isDead())
+ {
+ LLFloaterPathfindingConsole *pathfindingConsole = pathfindingConsoleHandle.get();
+ //Determine if we can should overlay the navmesh ontop of the scenes typical renderables
+ //allowRenderables = pathfindingConsole->isRenderWorld();
+
+ //NavMesh
+ if ( pathfindingConsole->isRenderNavMesh() )
+ {
+ glClearColor(0,0,0,0);
+ glClear(GL_DEPTH_BUFFER_BIT | GL_COLOR_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
+ //LLGLDisable lighting(GL_LIGHTING);
+ llPathingLibInstance->renderNavMesh();
+ gGL.flush();
+ }
+ //physics/exclusion shapes
+ if ( pathfindingConsole->isRenderAnyShapes() )
+ {
+ llPathingLibInstance->renderNavMeshShapesVBO( pathfindingConsole->getRenderShapeFlags() );
+ }
+ //User designated path
+ if ( pathfindingConsole->isRenderPath() )
+ {
+ llPathingLibInstance->renderPath();
+ }
+ }
+ }
+ gGL.color4f(1,1,1,1); |