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

SH-2963 Fix for highlight transparent not highlighting 100% transparent objects.

Browse Source
This commit is contained in:
Siana Gearz
2012-02-14 16:45:31 +01:00
parent a0e9e8d4b2
commit a451a8f566
3 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
indra/newview/lldrawpool.h
View File

@@ -139,6 +139,7 @@ public:
PASS_ALPHA, PASS_ALPHA,
PASS_ALPHA_MASK, PASS_ALPHA_MASK,
PASS_FULLBRIGHT_ALPHA_MASK, PASS_FULLBRIGHT_ALPHA_MASK,
PASS_ALPHA_INVISIBLE,
NUM_RENDER_TYPES, NUM_RENDER_TYPES,
}; };

1
indra/newview/lldrawpoolalpha.cpp
View File

@@ -344,6 +344,7 @@ void LLDrawPoolAlpha::render(S32 pass)
pushBatches(LLRenderPass::PASS_ALPHA_MASK, LLVertexBuffer::MAP_VERTEX | LLVertexBuffer::MAP_TEXCOORD0, FALSE); pushBatches(LLRenderPass::PASS_ALPHA_MASK, LLVertexBuffer::MAP_VERTEX | LLVertexBuffer::MAP_TEXCOORD0, FALSE);
pushBatches(LLRenderPass::PASS_FULLBRIGHT_ALPHA_MASK, LLVertexBuffer::MAP_VERTEX | LLVertexBuffer::MAP_TEXCOORD0, FALSE); pushBatches(LLRenderPass::PASS_FULLBRIGHT_ALPHA_MASK, LLVertexBuffer::MAP_VERTEX | LLVertexBuffer::MAP_TEXCOORD0, FALSE);
pushBatches(LLRenderPass::PASS_ALPHA_INVISIBLE, LLVertexBuffer::MAP_VERTEX | LLVertexBuffer::MAP_TEXCOORD0, FALSE);
if(shaders) if(shaders)
{ {

10
indra/newview/llvovolume.cpp
View File

@@ -3692,10 +3692,10 @@ void LLVolumeGeometryManager::rebuildGeom(LLSpatialGroup* group)
else else
{ {
if (te->getColor().mV[3] > 0.f) if (te->getColor().mV[3] > 0.f)
{ { //only treat as alpha in the pipeline if < 100% transparent
drawablep->setState(LLDrawable::HAS_ALPHA); drawablep->setState(LLDrawable::HAS_ALPHA);
alpha_faces.push_back(facep);
} }
alpha_faces.push_back(facep);
} }
} }
else else
@@ -4223,7 +4223,11 @@ void LLVolumeGeometryManager::genDrawInfo(LLSpatialGroup* group, U32 mask, std::
if (is_alpha) if (is_alpha)
{ {
// can we safely treat this as an alpha mask? // can we safely treat this as an alpha mask?
if (facep->canRenderAsMask()) if (facep->getFaceColor().mV[3] <= 0.f)
{ //100% transparent, don't render unless we're highlighting transparent
registerFace(group, facep, LLRenderPass::PASS_ALPHA_INVISIBLE);
}
else if (facep->canRenderAsMask())
{ {
if (te->getFullbright() || LLPipeline::sNoAlpha) if (te->getFullbright() || LLPipeline::sNoAlpha)
{ {