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

Removed dead code related to 'RenderForSelect'.

Browse Source
This commit is contained in:
Shyotl
2011-08-09 02:11:10 -05:00
parent 9bda97786f
commit 04ea6a967e
27 changed files with 8 additions and 636 deletions
Download Patch File Download Diff File Expand all files Collapse all files

77
indra/newview/llface.cpp
View File

@@ -478,83 +478,6 @@ void LLFace::updateCenterAgent()
}
}
void LLFace::renderForSelect(U32 data_mask)
{
if(mDrawablep.isNull() || mVertexBuffer.isNull())
{
return;
}
LLSpatialGroup* group = mDrawablep->getSpatialGroup();
if (!group || group->isState(LLSpatialGroup::GEOM_DIRTY))
{
return;
}
if (mVObjp->mGLName)
{
S32 name = mVObjp->mGLName;
LLColor4U color((U8)(name >> 16), (U8)(name >> 8), (U8)name);
#if 0 // *FIX: Postponing this fix until we have texcoord pick info...
if (mTEOffset != -1)
{
color.mV[VALPHA] = (U8)(getTextureEntry()->getColor().mV[VALPHA] * 255.f);
}
#endif
glColor4ubv(color.mV);
if (!getPool())
{
switch (getPoolType())
{
case LLDrawPool::POOL_ALPHA:
gGL.getTexUnit(0)->bind(getTexture());
break;
default:
gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
break;
}
}
mVertexBuffer->setBuffer(data_mask);
#if !LL_RELEASE_FOR_DOWNLOAD
LLGLState::checkClientArrays("", data_mask);
#endif
if (mTEOffset != -1)
{
// mask off high 4 bits (16 total possible faces)
color.mV[0] &= 0x0f;
color.mV[0] |= (mTEOffset & 0x0f) << 4;
glColor4ubv(color.mV);
}
if (mIndicesCount)
{
if (isState(GLOBAL))
{
if (mDrawablep->getVOVolume())
{
glPushMatrix();
glMultMatrixf((float*) mDrawablep->getRegion()->mRenderMatrix.mMatrix);
mVertexBuffer->draw(LLRender::TRIANGLES, mIndicesCount, mIndicesIndex);
glPopMatrix();
}
else
{
mVertexBuffer->draw(LLRender::TRIANGLES, mIndicesCount, mIndicesIndex);
}
}
else
{
glPushMatrix();
glMultMatrixf((float*)getRenderMatrix().mMatrix);
mVertexBuffer->draw(LLRender::TRIANGLES, mIndicesCount, mIndicesIndex);
glPopMatrix();
}
}
}
}
void LLFace::renderSelected(LLViewerTexture *imagep, const LLColor4& color)
{
if (mDrawablep->getSpatialGroup() == NULL)