diff options
| author | Todd Stinson <stinson@lindenlab.com> | 2012-02-13 10:21:51 -0800 |
|---|---|---|
| committer | Todd Stinson <stinson@lindenlab.com> | 2012-02-13 10:21:51 -0800 |
| commit | 06ec2607ce9db7cecee7c76b52cca5f263ef7402 (patch) | |
| tree | 3ed56bbe956c6091f6f5891f5bdcded1ece77ec3 /indra/llrender | |
| parent | 33ad069ea6138cb0e161a9131dc076ffa719c871 (diff) | |
| parent | ec335c7007ac05a098fed320fc2bbc650f0268ea (diff) | |
Pull and merge from ssh://hg@bitbucket.org/stinson_linden/viewer-development-havokai.
Diffstat (limited to 'indra/llrender')
| -rw-r--r-- | indra/llrender/llrendernavprim.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/llrender/llrendernavprim.cpp b/indra/llrender/llrendernavprim.cpp index 71e808d04e..b99a8cdc86 100644 --- a/indra/llrender/llrendernavprim.cpp +++ b/indra/llrender/llrendernavprim.cpp @@ -38,6 +38,7 @@ LLRenderNavPrim gRenderNav; void LLRenderNavPrim::renderSegment( const LLVector3& start, const LLVector3& end, int color, bool overlayMode ) const
{
LLGLSLShader::sNoFixedFunction = false;
+ LLGLEnable smooth(GL_LINE_SMOOTH);
LLColor4 colorA( color );
glLineWidth(1.5f);
gGL.color3fv( colorA.mV );
@@ -51,6 +52,7 @@ void LLRenderNavPrim::renderSegment( const LLVector3& start, const LLVector3& en gGL.flush();
LLGLSLShader::sNoFixedFunction = true;
+ LLGLDisable smoothout(GL_LINE_SMOOTH);
glLineWidth(1.0f);
}
//=============================================================================
@@ -86,7 +88,7 @@ void LLRenderNavPrim::renderTri( const LLVector3& a, const LLVector3& b, const L void LLRenderNavPrim::renderNavMeshVB( LLVertexBuffer* pVBO, int vertCnt )
{
LLGLSUIDefault gls_ui;
- glEnable( GL_DEPTH_TEST );
+ LLGLEnable depth( GL_DEPTH_TEST );
LLGLEnable cull( GL_CULL_FACE );
glLineWidth(1.5f);
LLGLSLShader::sNoFixedFunction = false; @@ -94,11 +96,13 @@ void LLRenderNavPrim::renderNavMeshVB( LLVertexBuffer* pVBO, int vertCnt ) pVBO->setBuffer( LLVertexBuffer::MAP_VERTEX | LLVertexBuffer::MAP_COLOR | LLVertexBuffer::MAP_NORMAL );
pVBO->drawArrays( LLRender::TRIANGLES, 0, vertCnt );
glPolygonMode( GL_FRONT_AND_BACK, GL_LINE );
+ LLGLEnable smooth(GL_LINE_SMOOTH);
//pass 2 outlined
pVBO->drawArrays( LLRender::TRIANGLES, 0, vertCnt );
LLGLSLShader::sNoFixedFunction = true;
glLineWidth(1.0f);
glPolygonMode( GL_FRONT_AND_BACK, GL_FILL );
+ LLGLDisable smoothout(GL_LINE_SMOOTH);
}
//=============================================================================
void LLRenderNavPrim::renderStar( const LLVector3& center, const float scale, int color ) const
|