diff options
| author | prep <prep@lindenlab.com> | 2012-01-05 17:02:22 -0500 |
|---|---|---|
| committer | prep <prep@lindenlab.com> | 2012-01-05 17:02:22 -0500 |
| commit | 22b877e70a6f72256ff585465232bed93792571d (patch) | |
| tree | 7964a5d8278f0a79479ac5ad6f31a7dfcea55d48 /indra/newview | |
| parent | e2fd0266ca7249e2008b68f11050973d1e429a62 (diff) | |
WIP: Navmesh vbos rendering fixes (added normal and color maps).
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llviewerdisplay.cpp | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/indra/newview/llviewerdisplay.cpp b/indra/newview/llviewerdisplay.cpp index 3cc025462b..85896c74dd 100644 --- a/indra/newview/llviewerdisplay.cpp +++ b/indra/newview/llviewerdisplay.cpp @@ -915,24 +915,15 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield, BOOL for_snapshot) //Navmesh
if ( LLPathingLib::getInstance()->getRenderNavMeshState() )
{
- glClearColor(0.0f, 0.0f, 0.0f, 0.5f);
-
+ glClearColor(0.0f, 0.0f, 0.0f, 0.5f);
glEnable(GL_DEPTH_TEST);
- gGL.setSceneBlendType( LLRender::BT_ALPHA );
gGL.setAmbientLightColor( LLColor4::white );
LLPathingLib::getInstance()->renderNavMesh( allowRenderables );
exclusiveDraw = true;
}
//physics/exclusion shapes
if ( LLPathingLib::getInstance()->getRenderShapeState() )
- {
- glEnable(GL_DEPTH_TEST);
- gGL.setSceneBlendType( LLRender::BT_REPLACE );
- GLfloat LightAmbient[]= { 0.5f, 0.5f, 0.5f, 1.0f };
- glLightfv(GL_LIGHT1, GL_AMBIENT, LightAmbient);
- LLGLSUIDefault texture_state;
- LLGLDepthTest gls_depth(GL_TRUE);
- gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
+ {
LLPathingLib::getInstance()->renderNavMeshShapesVBO();
exclusiveDraw = true;
}
|