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

Shiny HUD objects not fullbright. https://bitbucket.org/VirLinden/viewer-development-shining-fixes/changeset/c7fca203c70f

Browse Source
This commit is contained in:
Shyotl
2012-01-27 21:28:27 -06:00
parent fc65380f2a
commit 744b5b6404
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
indra/newview/llvovolume.cpp
View File

@@ -4211,6 +4211,11 @@ void LLVolumeGeometryManager::genDrawInfo(LLSpatialGroup* group, U32 mask, std::
fullbright = TRUE; fullbright = TRUE;
} }
if (hud_group)
{ //all hud attachments are fullbright
fullbright = TRUE;
}
const LLTextureEntry* te = facep->getTextureEntry(); const LLTextureEntry* te = facep->getTextureEntry();
tex = facep->getTexture(); tex = facep->getTexture();
@@ -4236,7 +4241,6 @@ void LLVolumeGeometryManager::genDrawInfo(LLSpatialGroup* group, U32 mask, std::
} }
} }
else if (gPipeline.canUseVertexShaders() else if (gPipeline.canUseVertexShaders()
&& group->mSpatialPartition->mPartitionType != LLViewerRegion::PARTITION_HUD
&& LLPipeline::sRenderBump && LLPipeline::sRenderBump
&& te->getShiny()) && te->getShiny())
{ //shiny { //shiny
@@ -4301,9 +4305,11 @@ void LLVolumeGeometryManager::genDrawInfo(LLSpatialGroup* group, U32 mask, std::
} }
} }
//not sure why this is here -- shiny HUD attachments maybe? -- davep 5/11/2010 if (!gPipeline.canUseVertexShaders() &&
if (!is_alpha && te->getShiny() && LLPipeline::sRenderBump) !is_alpha &&
{ te->getShiny() &&
LLPipeline::sRenderBump)
{ //shiny as an extra pass when shaders are disabled
registerFace(group, facep, LLRenderPass::PASS_SHINY); registerFace(group, facep, LLRenderPass::PASS_SHINY);
} }
} }