From 1e45d1ae4c25ae8ec73d2b4dc40a5d4efb23121c Mon Sep 17 00:00:00 2001 From: prep Date: Thu, 5 Jan 2012 17:43:36 -0500 Subject: vbos for physics shapes are rendering correctly --- indra/llrender/llrendernavprim.cpp | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'indra/llrender/llrendernavprim.cpp') diff --git a/indra/llrender/llrendernavprim.cpp b/indra/llrender/llrendernavprim.cpp index 0965f00e0b..ac8d45789c 100644 --- a/indra/llrender/llrendernavprim.cpp +++ b/indra/llrender/llrendernavprim.cpp @@ -85,20 +85,18 @@ void LLRenderNavPrim::renderTri( const LLVector3& a, const LLVector3& b, const L //============================================================================= void LLRenderNavPrim::renderNavMeshVB( LLVertexBuffer* pVBO, int vertCnt ) { + LLGLSUIDefault gls_ui; glLineWidth(1.5f); LLGLSLShader::sNoFixedFunction = false; glPolygonMode( GL_FRONT_AND_BACK, GL_FILL ); - LLGLEnable cull( GL_CULL_FACE ); - + LLGLEnable cull( GL_CULL_FACE ); //pass 1 filled pVBO->setBuffer( LLVertexBuffer::MAP_VERTEX | LLVertexBuffer::MAP_COLOR | LLVertexBuffer::MAP_NORMAL ); pVBO->drawArrays( LLRender::TRIANGLES, 0, vertCnt ); - //glPolygonMode( GL_FRONT_AND_BACK, GL_LINE ); - //static GLubyte red[]= { 255.0f, 0.0f, 0.0f, 255.0f }; - //glColor4ubv( red ); + glPolygonMode( GL_FRONT_AND_BACK, GL_LINE ); //pass 2 outlined - //pVBO->drawArrays( LLRender::TRIANGLES, 0, vertCnt ); + pVBO->drawArrays( LLRender::TRIANGLES, 0, vertCnt ); LLGLSLShader::sNoFixedFunction = true; glLineWidth(1.0f); glPolygonMode( GL_FRONT_AND_BACK, GL_FILL ); -- cgit v1.2.3