From f01462797c3344fa57f882cbc2d85dc739b75e90 Mon Sep 17 00:00:00 2001 From: Todd Stinson Date: Mon, 2 Apr 2012 17:59:59 -0700 Subject: Updating to the latest xray version of the llphysicsextensions pre-built package. --- autobuild.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index 3a2a425bc1..6931dca428 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -1110,9 +1110,9 @@ archive hash - ffa4e99eb6bfea9b02f0fee971d515ef + fdf8c670a99a9d0c020c046e5fe28ed2 url - http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/stinson_llpathinglibrary/rev/252687/arch/Darwin/installer/llphysicsextensions-0.1-darwin-20120402.tar.bz2 + http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/stinson_llpathinglibrary_xray/rev/252805/arch/Darwin/installer/llphysicsextensions-0.1-darwin-20120402.tar.bz2 name darwin @@ -1122,9 +1122,9 @@ archive hash - 27c6a92b3287e11fbff3120049734b29 + 42d1054fb9e739d7f2d774789af532e0 url - http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/stinson_llpathinglibrary/rev/252687/arch/Linux/installer/llphysicsextensions-0.1-linux-20120402.tar.bz2 + http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/stinson_llpathinglibrary_xray/rev/252805/arch/Linux/installer/llphysicsextensions-0.1-linux-20120403.tar.bz2 name linux @@ -1134,9 +1134,9 @@ archive hash - bf21fdd1d3dab3b6ecfe795c8228c2ec + ee1088886cf7bb63def8ea4fb7405e19 url - http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/stinson_llpathinglibrary/rev/252687/arch/CYGWIN/installer/llphysicsextensions-0.1-windows-20120402.tar.bz2 + http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/stinson_llpathinglibrary_xray/rev/252805/arch/CYGWIN/installer/llphysicsextensions-0.1-windows-20120402.tar.bz2 name windows -- cgit v1.3 From 27e4d822e138585ea23279b8a276b90c77b86d90 Mon Sep 17 00:00:00 2001 From: Dave Parks Date: Tue, 3 Apr 2012 03:10:22 -0500 Subject: Update to fixed llpathinglibrary --- autobuild.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index 6931dca428..a2f341f514 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -1110,9 +1110,9 @@ archive hash - fdf8c670a99a9d0c020c046e5fe28ed2 + 21c7d216ad56664b33669d33c9d3e318 url - http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/stinson_llpathinglibrary_xray/rev/252805/arch/Darwin/installer/llphysicsextensions-0.1-darwin-20120402.tar.bz2 + http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/stinson_llpathinglibrary/rev/252817/arch/Darwin/installer/llphysicsextensions-0.1-darwin-20120403.tar.bz2 name darwin @@ -1122,9 +1122,9 @@ archive hash - 42d1054fb9e739d7f2d774789af532e0 + 430357db21d689ef8b04f3b507d7e04d url - http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/stinson_llpathinglibrary_xray/rev/252805/arch/Linux/installer/llphysicsextensions-0.1-linux-20120403.tar.bz2 + http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/stinson_llpathinglibrary/rev/252817/arch/Linux/installer/llphysicsextensions-0.1-linux-20120403.tar.bz2 name linux @@ -1134,9 +1134,9 @@ archive hash - ee1088886cf7bb63def8ea4fb7405e19 + f961e16bd7b20629099b33a8aa437e98 url - http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/stinson_llpathinglibrary_xray/rev/252805/arch/CYGWIN/installer/llphysicsextensions-0.1-windows-20120402.tar.bz2 + http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/stinson_llpathinglibrary/rev/252817/arch/CYGWIN/installer/llphysicsextensions-0.1-windows-20120403.tar.bz2 name windows -- cgit v1.3 From 68a4e0ee992fc6f2f1e3a733788f6fe31b85b549 Mon Sep 17 00:00:00 2001 From: Dave Parks Date: Tue, 3 Apr 2012 16:12:33 -0500 Subject: Fix build. Axe deprecated glNormal call. Don't show the world just because navmesh isn't checked. --- autobuild.xml | 12 +-- indra/llrender/llrendernavprim.cpp | 193 ++++++++++++++++++------------------- indra/newview/pipeline.cpp | 28 +++--- 3 files changed, 118 insertions(+), 115 deletions(-) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index a2f341f514..9baed813ef 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -1110,9 +1110,9 @@ archive hash - 21c7d216ad56664b33669d33c9d3e318 + 6f0127b409cda1635cf7d52f5ec52365 url - http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/stinson_llpathinglibrary/rev/252817/arch/Darwin/installer/llphysicsextensions-0.1-darwin-20120403.tar.bz2 + http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/stinson_llpathinglibrary_xray/rev/252896/arch/Darwin/installer/llphysicsextensions-0.1-darwin-20120403.tar.bz2 name darwin @@ -1122,9 +1122,9 @@ archive hash - 430357db21d689ef8b04f3b507d7e04d + 8e6525e0b3b0cf6fdea14dba19a1465a url - http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/stinson_llpathinglibrary/rev/252817/arch/Linux/installer/llphysicsextensions-0.1-linux-20120403.tar.bz2 + http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/stinson_llpathinglibrary_xray/rev/252896/arch/Linux/installer/llphysicsextensions-0.1-linux-20120403.tar.bz2 name linux @@ -1134,9 +1134,9 @@ archive hash - f961e16bd7b20629099b33a8aa437e98 + e26184acc9ccaf359d26e356f768350e url - http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/stinson_llpathinglibrary/rev/252817/arch/CYGWIN/installer/llphysicsextensions-0.1-windows-20120403.tar.bz2 + http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/stinson_llpathinglibrary_xray/rev/252896/arch/CYGWIN/installer/llphysicsextensions-0.1-windows-20120403.tar.bz2 name windows diff --git a/indra/llrender/llrendernavprim.cpp b/indra/llrender/llrendernavprim.cpp index 7dd042271a..56b176d39c 100644 --- a/indra/llrender/llrendernavprim.cpp +++ b/indra/llrender/llrendernavprim.cpp @@ -1,97 +1,96 @@ -/** - * @file LLRenderNavPrim.cpp - * @brief Renderable primitives used by the pathing library - * - * $LicenseInfo:firstyear=2001&license=viewerlgpl$ - * Second Life Viewer Source Code - * Copyright (C) 2010, Linden Research, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; - * version 2.1 of the License only. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * - * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA - * $/LicenseInfo$ - */ - - -#include "linden_common.h" -#include "llrendernavprim.h" -#include "llerror.h" -#include "llglheaders.h" -#include "llvertexbuffer.h" -#include "llglslshader.h" - -//============================================================================= -LLRenderNavPrim gRenderNav; -//============================================================================= -void LLRenderNavPrim::renderLLSegment( const LLVector3& start, const LLVector3& end, const LLColor4U& color ) const -{ - LLColor4 colorA( color ); - gGL.color3fv( colorA.mV ); - - gGL.begin(LLRender::LINES); - { - gGL.vertex3fv( start.mV ); - gGL.vertex3fv( end.mV ); - } - gGL.end(); -} -//============================================================================= -void LLRenderNavPrim::renderTri( const LLVector3& a, const LLVector3& b, const LLVector3& c, int color ) const -{ - LLColor4 colorA( color ); - colorA*=1.25f; - gGL.color4fv( colorA.mV ); - gGL.begin(LLRender::TRIANGLES); - { - gGL.vertex3fv( a.mV ); - gGL.vertex3fv( b.mV ); - gGL.vertex3fv( c.mV ); - } - gGL.end(); -} -//============================================================================= -void LLRenderNavPrim::renderLLTri( const LLVector3& a, const LLVector3& b, const LLVector3& c, const LLColor4U& color, const LLVector3& n ) const -{ - LLColor4 cV(color); - gGL.color4fv( cV.mV ); - gGL.begin(LLRender::TRIANGLES); - { - glNormal3f( n.mV[0],n.mV[1],n.mV[2] ); - gGL.vertex3fv( a.mV ); - gGL.vertex3fv( b.mV ); - gGL.vertex3fv( c.mV ); - } - gGL.end(); -} -//============================================================================= -void LLRenderNavPrim::renderNavMeshVB( LLVertexBuffer* pVBO, int vertCnt ) -{ - pVBO->setBuffer( LLVertexBuffer::MAP_VERTEX | LLVertexBuffer::MAP_COLOR | LLVertexBuffer::MAP_NORMAL ); - pVBO->drawArrays( LLRender::TRIANGLES, 0, vertCnt ); -} -//============================================================================= -void LLRenderNavPrim::renderStar( const LLVector3& center, const float scale, const LLColor4U& color ) const -{ - for (int k=0; k<3; k++) - { - LLVector3 star, pt1, pt2; - star = LLVector3( 0.0f,0.0f,0.0f); - star[k] = 0.5f; - pt1 = center + star; - pt2 = center - star; - renderLLSegment( pt1, pt2, color ); - } -} -//============================================================================= +/** + * @file LLRenderNavPrim.cpp + * @brief Renderable primitives used by the pathing library + * + * $LicenseInfo:firstyear=2001&license=viewerlgpl$ + * Second Life Viewer Source Code + * Copyright (C) 2010, Linden Research, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; + * version 2.1 of the License only. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * + * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA + * $/LicenseInfo$ + */ + + +#include "linden_common.h" +#include "llrendernavprim.h" +#include "llerror.h" +#include "llglheaders.h" +#include "llvertexbuffer.h" +#include "llglslshader.h" + +//============================================================================= +LLRenderNavPrim gRenderNav; +//============================================================================= +void LLRenderNavPrim::renderLLSegment( const LLVector3& start, const LLVector3& end, const LLColor4U& color ) const +{ + LLColor4 colorA( color ); + gGL.color3fv( colorA.mV ); + + gGL.begin(LLRender::LINES); + { + gGL.vertex3fv( start.mV ); + gGL.vertex3fv( end.mV ); + } + gGL.end(); +} +//============================================================================= +void LLRenderNavPrim::renderTri( const LLVector3& a, const LLVector3& b, const LLVector3& c, int color ) const +{ + LLColor4 colorA( color ); + colorA*=1.25f; + gGL.color4fv( colorA.mV ); + gGL.begin(LLRender::TRIANGLES); + { + gGL.vertex3fv( a.mV ); + gGL.vertex3fv( b.mV ); + gGL.vertex3fv( c.mV ); + } + gGL.end(); +} +//============================================================================= +void LLRenderNavPrim::renderLLTri( const LLVector3& a, const LLVector3& b, const LLVector3& c, const LLColor4U& color, const LLVector3& n ) const +{ + LLColor4 cV(color); + gGL.color4fv( cV.mV ); + gGL.begin(LLRender::TRIANGLES); + { + gGL.vertex3fv( a.mV ); + gGL.vertex3fv( b.mV ); + gGL.vertex3fv( c.mV ); + } + gGL.end(); +} +//============================================================================= +void LLRenderNavPrim::renderNavMeshVB( LLVertexBuffer* pVBO, int vertCnt ) +{ + pVBO->setBuffer( LLVertexBuffer::MAP_VERTEX | LLVertexBuffer::MAP_COLOR | LLVertexBuffer::MAP_NORMAL ); + pVBO->drawArrays( LLRender::TRIANGLES, 0, vertCnt ); +} +//============================================================================= +void LLRenderNavPrim::renderStar( const LLVector3& center, const float scale, const LLColor4U& color ) const +{ + for (int k=0; k<3; k++) + { + LLVector3 star, pt1, pt2; + star = LLVector3( 0.0f,0.0f,0.0f); + star[k] = 0.5f; + pt1 = center + star; + pt2 = center - star; + renderLLSegment( pt1, pt2, color ); + } +} +//============================================================================= diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index c1b0e6736f..4c40c6f12e 100644 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -4340,24 +4340,28 @@ void LLPipeline::renderDebug() if (!pathfindingConsoleHandle.isDead()) { LLFloaterPathfindingConsole *pathfindingConsole = pathfindingConsoleHandle.get(); + + if ( pathfindingConsole->isRenderWorld() ) + { + glPolygonMode( GL_FRONT_AND_BACK, GL_LINE ); + } + else + { + const LLColor4 &clearColor = pathfindingConsole->mNavMeshColors.mNavMeshClear; + 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); + gGL.setColorMask(true, false); + glPolygonMode( GL_FRONT_AND_BACK, GL_FILL ); + } + //NavMesh if ( pathfindingConsole->isRenderNavMesh() ) { gGL.flush(); glLineWidth(2.0f); LLGLEnable cull(GL_CULL_FACE); LLGLDisable blend(GL_BLEND); - if ( pathfindingConsole->isRenderWorld() ) - { - glPolygonMode( GL_FRONT_AND_BACK, GL_LINE ); - } - else - { - const LLColor4 &clearColor = pathfindingConsole->mNavMeshColors.mNavMeshClear; - glClearColor(clearColor.mV[0],clearColor.mV[1],clearColor.mV[2],0); - glClear(GL_DEPTH_BUFFER_BIT | GL_COLOR_BUFFER_BIT | GL_STENCIL_BUFFER_BIT); - glPolygonMode( GL_FRONT_AND_BACK, GL_FILL ); - } - + int materialIndex = pathfindingConsole->getHeatMapType(); llPathingLibInstance->renderNavMesh( materialIndex ); gGL.flush(); -- cgit v1.3 From c3726f4f15d12259424cbc2b974d638bc3a7e79c Mon Sep 17 00:00:00 2001 From: prep Date: Wed, 4 Apr 2012 11:54:54 -0400 Subject: Updated llphysics extensions package --- autobuild.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index 9baed813ef..5199ce0d19 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -1112,7 +1112,7 @@ hash 6f0127b409cda1635cf7d52f5ec52365 url - http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/stinson_llpathinglibrary_xray/rev/252896/arch/Darwin/installer/llphysicsextensions-0.1-darwin-20120403.tar.bz2 + http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/stinson_llpathinglibrary_xray/rev/252974/arch/Darwin/installer/llphysicsextensions-0.1-darwin-20120404.tar.bz2 name darwin @@ -1122,9 +1122,9 @@ archive hash - 8e6525e0b3b0cf6fdea14dba19a1465a + cb639c760253d1315dda8a283a6f2715 url - http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/stinson_llpathinglibrary_xray/rev/252896/arch/Linux/installer/llphysicsextensions-0.1-linux-20120403.tar.bz2 + http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/stinson_llpathinglibrary_xray/rev/252974/arch/Linux/installer/llphysicsextensions-0.1-linux-20120404.tar.bz2 name linux @@ -1134,9 +1134,9 @@ archive hash - e26184acc9ccaf359d26e356f768350e + dbac794b95a4180f75d1190aee6a91f1 url - http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/stinson_llpathinglibrary_xray/rev/252896/arch/CYGWIN/installer/llphysicsextensions-0.1-windows-20120403.tar.bz2 + http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/stinson_llpathinglibrary_xray/rev/252974/arch/CYGWIN/installer/llphysicsextensions-0.1-windows-20120404.tar.bz2 name windows -- cgit v1.3 From d21dd289b0543d1043424067de230561e531999c Mon Sep 17 00:00:00 2001 From: Dave Parks Date: Wed, 4 Apr 2012 14:16:17 -0500 Subject: Cleanup edge render and resolve assertions from lack of normals in edges. --- autobuild.xml | 12 ++++++------ indra/newview/llviewershadermgr.cpp | 12 ++++++++++++ indra/newview/llviewershadermgr.h | 1 + indra/newview/pipeline.cpp | 29 +++++++++++++++++++++++++++++ 4 files changed, 48 insertions(+), 6 deletions(-) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index 5199ce0d19..ac7105c8b5 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -1110,9 +1110,9 @@ archive hash - 6f0127b409cda1635cf7d52f5ec52365 + dfd1e738be5d48f5d99a903936cbce31 url - http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/stinson_llpathinglibrary_xray/rev/252974/arch/Darwin/installer/llphysicsextensions-0.1-darwin-20120404.tar.bz2 + 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 name darwin @@ -1122,9 +1122,9 @@ archive hash - cb639c760253d1315dda8a283a6f2715 + 2656b0b7eddf19ca67ad5b55100b8782 url - http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/stinson_llpathinglibrary_xray/rev/252974/arch/Linux/installer/llphysicsextensions-0.1-linux-20120404.tar.bz2 + 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 name linux @@ -1134,9 +1134,9 @@ archive hash - dbac794b95a4180f75d1190aee6a91f1 + 5ad3230901d4683902aa3bdf995309b2 url - http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/stinson_llpathinglibrary_xray/rev/252974/arch/CYGWIN/installer/llphysicsextensions-0.1-windows-20120404.tar.bz2 + 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 name windows diff --git a/indra/newview/llviewershadermgr.cpp b/indra/newview/llviewershadermgr.cpp index 0948e261ce..65b6634c57 100644 --- a/indra/newview/llviewershadermgr.cpp +++ b/indra/newview/llviewershadermgr.cpp @@ -135,6 +135,7 @@ LLGLSLShader gUnderWaterProgram; //interface shaders LLGLSLShader gHighlightProgram; LLGLSLShader gPathfindingProgram; +LLGLSLShader gPathfindingNoNormalsProgram; //avatar shader handles LLGLSLShader gAvatarProgram; @@ -596,6 +597,7 @@ void LLViewerShaderMgr::unloadShaders() gAlphaMaskProgram.unload(); gUIProgram.unload(); gPathfindingProgram.unload(); + gPathfindingNoNormalsProgram.unload(); gCustomAlphaProgram.unload(); gGlowCombineProgram.unload(); gSplatTextureRectProgram.unload(); @@ -2522,6 +2524,16 @@ BOOL LLViewerShaderMgr::loadShadersInterface() success = gPathfindingProgram.createShader(NULL, NULL); } + if (success) + { + gPathfindingNoNormalsProgram.mName = "PathfindingNoNormals Shader"; + gPathfindingNoNormalsProgram.mShaderFiles.clear(); + gPathfindingNoNormalsProgram.mShaderFiles.push_back(make_pair("interface/pathfindingNoNormalV.glsl", GL_VERTEX_SHADER_ARB)); + gPathfindingNoNormalsProgram.mShaderFiles.push_back(make_pair("interface/pathfindingF.glsl", GL_FRAGMENT_SHADER_ARB)); + gPathfindingNoNormalsProgram.mShaderLevel = mVertexShaderLevel[SHADER_INTERFACE]; + success = gPathfindingNoNormalsProgram.createShader(NULL, NULL); + } + if (success) { gCustomAlphaProgram.mName = "Custom Alpha Shader"; diff --git a/indra/newview/llviewershadermgr.h b/indra/newview/llviewershadermgr.h index 2f4edc2659..ceb14870d4 100644 --- a/indra/newview/llviewershadermgr.h +++ b/indra/newview/llviewershadermgr.h @@ -289,6 +289,7 @@ extern LLGLSLShader gGlowExtractProgram; //interface shaders extern LLGLSLShader gHighlightProgram; extern LLGLSLShader gPathfindingProgram; +extern LLGLSLShader gPathfindingNoNormalsProgram; // avatar shader handles extern LLGLSLShader gAvatarProgram; diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index 6f75c09803..fb6e97ea9d 100644 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -4364,6 +4364,21 @@ void LLPipeline::renderDebug() int materialIndex = pathfindingConsole->getHeatMapType(); llPathingLibInstance->renderNavMesh( materialIndex ); + + //render edges + if (LLGLSLShader::sNoFixedFunction) + { + gPathfindingNoNormalsProgram.bind(); + gPathfindingNoNormalsProgram.uniform1f("tint", 1.f); + gPathfindingNoNormalsProgram.uniform1f("alpha_scale", 1.f); + llPathingLibInstance->renderNavMeshEdges( materialIndex ); + gPathfindingProgram.bind(); + } + else + { + llPathingLibInstance->renderNavMeshEdges( materialIndex ); + } + gGL.flush(); glPolygonMode( GL_FRONT_AND_BACK, GL_FILL ); glLineWidth(1.0f); @@ -4504,6 +4519,20 @@ void LLPipeline::renderDebug() gPathfindingProgram.uniform1f("ambiance", ambiance); llPathingLibInstance->renderNavMesh( materialIndex ); } + + //render edges + if (LLGLSLShader::sNoFixedFunction) + { + gPathfindingNoNormalsProgram.bind(); + gPathfindingNoNormalsProgram.uniform1f("tint", gSavedSettings.getF32("PathfindingXRayTint")); + gPathfindingNoNormalsProgram.uniform1f("alpha_scale", gSavedSettings.getF32("PathfindingXRayOpacity")); + llPathingLibInstance->renderNavMeshEdges( materialIndex ); + gPathfindingProgram.bind(); + } + else + { + llPathingLibInstance->renderNavMeshEdges( materialIndex ); + } gGL.flush(); glLineWidth(1.0f); -- cgit v1.3 From 669addd719fea9376dde00b2c2b22562aa8d8b78 Mon Sep 17 00:00:00 2001 From: Dave Parks Date: Thu, 5 Apr 2012 00:28:04 -0500 Subject: Fix for: assert when rendering paths, wireframe world when navmesh render disabled, heat map breaking walkables etc, and navmesh edges being offset from navmesh --- autobuild.xml | 10 +++++----- indra/newview/pipeline.cpp | 34 +++++++++++++++++++++++++--------- 2 files changed, 30 insertions(+), 14 deletions(-) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index ac7105c8b5..bd849c46de 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -1112,7 +1112,7 @@ hash dfd1e738be5d48f5d99a903936cbce31 url - 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 + 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 name darwin @@ -1122,9 +1122,9 @@ archive hash - 2656b0b7eddf19ca67ad5b55100b8782 + b98d39ed597a56a4f6c1e9624ad4c92c url - 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 + 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 name linux @@ -1134,9 +1134,9 @@ archive hash - 5ad3230901d4683902aa3bdf995309b2 + 5bcff9a15f78ffe09aafd5fbe02076cb url - 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 + 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 name windows diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index fb6e97ea9d..d00ad3b5bb 100644 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -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 + 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() ) -- cgit v1.3 From 8918c38f13ff09377964eedd8578feb9107cfc95 Mon Sep 17 00:00:00 2001 From: prep Date: Thu, 5 Apr 2012 11:26:20 -0400 Subject: Updated llphysics extensions library. --- autobuild.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index bd849c46de..aed3ff40ad 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -1110,9 +1110,9 @@ archive hash - dfd1e738be5d48f5d99a903936cbce31 + f097f6ce84e87c1784cc00ed116d84cf url - 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 + http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/stinson_llpathinglibrary_xray/rev/253109/arch/Darwin/installer/llphysicsextensions-0.1-darwin-20120405.tar.bz2 name darwin @@ -1122,9 +1122,9 @@ archive hash - b98d39ed597a56a4f6c1e9624ad4c92c + aef9443544aeaeb2022773ba102a414c url - 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 + http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/stinson_llpathinglibrary_xray/rev/253109/arch/Linux/installer/llphysicsextensions-0.1-linux-20120405.tar.bz2 name linux @@ -1134,9 +1134,9 @@ archive hash - 5bcff9a15f78ffe09aafd5fbe02076cb + a1a1d4258bbdd5f3c091a42dee5d9df4 url - 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 + http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/stinson_llpathinglibrary_xray/rev/253109/arch/CYGWIN/installer/llphysicsextensions-0.1-windows-20120405.tar.bz2 name windows -- cgit v1.3 From c1dab242520b20394f9e0c1dd1652c74f925d6eb Mon Sep 17 00:00:00 2001 From: prep Date: Thu, 5 Apr 2012 15:07:44 -0400 Subject: physics extensions library update --- autobuild.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index aed3ff40ad..abb49991c1 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -1110,9 +1110,9 @@ archive hash - f097f6ce84e87c1784cc00ed116d84cf + 4b030fdec520ad07720c14b966a14942 url - http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/stinson_llpathinglibrary_xray/rev/253109/arch/Darwin/installer/llphysicsextensions-0.1-darwin-20120405.tar.bz2 + http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/stinson_llpathinglibrary_xray/rev/253134/arch/Darwin/installer/llphysicsextensions-0.1-darwin-20120405.tar.bz2 name darwin @@ -1122,9 +1122,9 @@ archive hash - aef9443544aeaeb2022773ba102a414c + 8720f94255150a044b9d04fe19e84edc url - http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/stinson_llpathinglibrary_xray/rev/253109/arch/Linux/installer/llphysicsextensions-0.1-linux-20120405.tar.bz2 + http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/stinson_llpathinglibrary_xray/rev/253134/arch/Linux/installer/llphysicsextensions-0.1-linux-20120405.tar.bz2 name linux @@ -1134,9 +1134,9 @@ archive hash - a1a1d4258bbdd5f3c091a42dee5d9df4 + 44d0eec26bba7f10736b603c32ffc41a url - http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/stinson_llpathinglibrary_xray/rev/253109/arch/CYGWIN/installer/llphysicsextensions-0.1-windows-20120405.tar.bz2 + http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/stinson_llpathinglibrary_xray/rev/253134/arch/CYGWIN/installer/llphysicsextensions-0.1-windows-20120405.tar.bz2 name windows -- cgit v1.3