diff options
| author | prep <prep@lindenlab.com> | 2011-12-07 17:56:02 -0500 |
|---|---|---|
| committer | prep <prep@lindenlab.com> | 2011-12-07 17:56:02 -0500 |
| commit | 8974278746932fe470e2cbc52511fbc915f1e893 (patch) | |
| tree | bc8323ebdf7c6ceafa10dc808376df299a05d0d9 /indra/llrender/llrendernavprim.cpp | |
| parent | 0b99da8ba522da1a4a1e4b6dba24ee8dac42de60 (diff) | |
Turning on navmesh rendering toggles normal renderables
Diffstat (limited to 'indra/llrender/llrendernavprim.cpp')
| -rw-r--r-- | indra/llrender/llrendernavprim.cpp | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/indra/llrender/llrendernavprim.cpp b/indra/llrender/llrendernavprim.cpp index e88972219d..73bc21ab7c 100644 --- a/indra/llrender/llrendernavprim.cpp +++ b/indra/llrender/llrendernavprim.cpp @@ -51,25 +51,27 @@ void LLRenderNavPrim::renderSegment( const LLVector3& start, const LLVector3& en //=============================================================================
void LLRenderNavPrim::renderTri( const LLVector3& a, const LLVector3& b, const LLVector3& c, int color ) const
{
- LLGLEnable offset(GL_POLYGON_OFFSET_LINE);
- glPolygonMode(GL_FRONT_AND_BACK, GL_FILL);
+ glPolygonMode(GL_NONE, GL_FILL);
+ LLGLDisable cull(GL_CULL_FACE);
+ LLGLEnable lighting( GL_LIGHTING );
+ //glEnable(GL_POLYGON_STIPPLE);
glLineWidth(1.5f);
- LLColor4 colorA( color );
+ LLColor4 colorA( color );
gGL.color4fv( colorA.mV ); + gGL.begin(LLRender::TRIANGLES); { gGL.vertex3fv( a.mV ); gGL.vertex3fv( b.mV ); gGL.vertex3fv( c.mV ); } - gGL.end();
-
- glLineWidth(1.f);
+ gGL.end(); + gGL.flush();
}
//=============================================================================
-void LLRenderNavPrim::renderNavMeshVB( const LLVertexBuffer* pVBO, int vertCnt ) const
+void LLRenderNavPrim::renderNavMeshVB( LLVertexBuffer* pVBO, int vertCnt )
{
- //pVBO->setBuffer( LLVertexBuffer::MAP_VERTEX ); + //pVBO->setBuffer( LLVertexBuffer::MAP_VERTEX | LLVertexBuffer::MAP_COLOR ); pVBO->drawArrays( LLRender::TRIANGLES, 0, vertCnt );
}
//=============================================================================
\ No newline at end of file |