Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Trees shadow parameters use actual debug settings"

Browse Source 
This reverts commit 3c5a0efb8d.
This commit is contained in:
Salvatore La Bua
2013-09-28 05:15:45 +02:00
parent d08c34cc2e
commit afe0f7ef3d
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
indra/newview/lldrawpooltree.cpp
View File

@@ -110,9 +110,7 @@ void LLDrawPoolTree::render(S32 pass)
renderTree(); renderTree();
} }
else else
{ gGL.getTexUnit(sDiffTex)->bind(mTexturep);
gGL.getTexUnit(sDiffTex)->bind(mTexturep);
}
for (std::vector<LLFace*>::iterator iter = mDrawFace.begin(); for (std::vector<LLFace*>::iterator iter = mDrawFace.begin();
iter != mDrawFace.end(); iter++) iter != mDrawFace.end(); iter++)
@@ -189,8 +187,8 @@ void LLDrawPoolTree::beginShadowPass(S32 pass)
{ {
LLFastTimer t(FTM_SHADOW_TREE); LLFastTimer t(FTM_SHADOW_TREE);
static const LLCachedControl<F32> render_deferred_offset(gSavedSettings, "RenderDeferredTreeShadowOffset"); static const LLCachedControl<F32> render_deferred_offset("RenderDeferredTreeShadowOffset",1.f);
static const LLCachedControl<F32> render_deferred_bias(gSavedSettings, "RenderDeferredTreeShadowBias"); static const LLCachedControl<F32> render_deferred_bias("RenderDeferredTreeShadowBias",1.f);
glPolygonOffset(render_deferred_offset,render_deferred_bias); glPolygonOffset(render_deferred_offset,render_deferred_bias);
gDeferredTreeShadowProgram.bind(); gDeferredTreeShadowProgram.bind();
gDeferredTreeShadowProgram.setMinimumAlpha(0.5f); gDeferredTreeShadowProgram.setMinimumAlpha(0.5f);
@@ -205,8 +203,8 @@ void LLDrawPoolTree::endShadowPass(S32 pass)
{ {
LLFastTimer t(FTM_SHADOW_TREE); LLFastTimer t(FTM_SHADOW_TREE);
static const LLCachedControl<F32> render_deferred_offset(gSavedSettings, "RenderDeferredSpotShadowOffset"); static const LLCachedControl<F32> render_deferred_offset("RenderDeferredSpotShadowOffset",1.f);
static const LLCachedControl<F32> render_deferred_bias(gSavedSettings, "RenderDeferredSpotShadowBias"); static const LLCachedControl<F32> render_deferred_bias("RenderDeferredSpotShadowBias",1.f);
glPolygonOffset(render_deferred_offset,render_deferred_bias); glPolygonOffset(render_deferred_offset,render_deferred_bias);
gDeferredTreeShadowProgram.unbind(); gDeferredTreeShadowProgram.unbind();
} }