summaryrefslogtreecommitdiff
path: root/indra/newview/llface.inl
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2024-05-15 09:07:21 -0400
committerNat Goodspeed <nat@lindenlab.com>2024-05-15 09:07:21 -0400
commit5d43bc166d011e911e0492579b2f4f8bf015b48f (patch)
treeccc4cda5c2c2c3a5689f4a33dcfda2a896f21b8c /indra/newview/llface.inl
parenta3f2cacf542e1d770698ef6c7e6ea1c0a5cd3368 (diff)
parente7eced3c87310b15ac20cc3cd470d67686104a14 (diff)
Merge commit 'e7eced3' into release/luau-scripting: whitespace fix.
Diffstat (limited to 'indra/newview/llface.inl')
-rw-r--r--indra/newview/llface.inl172
1 files changed, 86 insertions, 86 deletions
diff --git a/indra/newview/llface.inl b/indra/newview/llface.inl
index c37b77d2cd..566917d800 100644
--- a/indra/newview/llface.inl
+++ b/indra/newview/llface.inl
@@ -1,25 +1,25 @@
-/**
+/**
* @file llface.inl
* @brief Inline functions for LLFace
*
* $LicenseInfo:firstyear=2001&license=viewerlgpl$
* Second Life Viewer Source Code
* Copyright (C) 2010, Linden Research, Inc.
- *
+ *
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation;
* version 2.1 of the License only.
- *
+ *
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
- *
+ *
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
+ *
* Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA
* $/LicenseInfo$
*/
@@ -31,130 +31,130 @@
#include "llrender.h"
inline BOOL LLFace::getDirty() const
-{
- return (mGeneration != mDrawPoolp->mGeneration);
+{
+ return (mGeneration != mDrawPoolp->mGeneration);
}
inline void LLFace::clearDirty()
{
- mGeneration = mDrawPoolp->mGeneration;
+ mGeneration = mDrawPoolp->mGeneration;
}
inline const LLTextureEntry* LLFace::getTextureEntry() const
{
- return mVObjp->getTE(mTEOffset);
+ return mVObjp->getTE(mTEOffset);
}
inline LLDrawPool* LLFace::getPool() const
{
- return mDrawPoolp;
+ return mDrawPoolp;
}
inline S32 LLFace::getStride() const
{
- return mDrawPoolp->getStride();
+ return mDrawPoolp->getStride();
}
inline LLDrawable* LLFace::getDrawable() const
{
- return mDrawablep;
+ return mDrawablep;
}
inline LLViewerObject* LLFace::getViewerObject() const
{
- return mVObjp;
+ return mVObjp;
}
-inline S32 LLFace::getColors (LLStrider<LLColor4U> &colors)
+inline S32 LLFace::getColors (LLStrider<LLColor4U> &colors)
{
- if (!mGeomCount)
- {
- return -1;
- }
- LLColor4U *colorp = NULL;
- if (isState(BACKLIST))
- {
- if (!mBackupMem)
- {
- printDebugInfo();
- LL_ERRS() << "No backup memory for face" << LL_ENDL;
- }
- colorp = (LLColor4U*)(mBackupMem + (4 * mIndicesCount) + (mGeomCount * mDrawPoolp->getStride()));
- colors = colorp;
- return 0;
- }
- else
- {
- llassert(mGeomIndex >= 0);
- if (!mDrawPoolp->getColorStrider(colors, mGeomIndex))
- {
- printDebugInfo();
- LL_ERRS() << "No color pointer for a color strider!" << LL_ENDL;
- }
- mDrawPoolp->setDirtyColors();
- return mGeomIndex;
- }
+ if (!mGeomCount)
+ {
+ return -1;
+ }
+ LLColor4U *colorp = NULL;
+ if (isState(BACKLIST))
+ {
+ if (!mBackupMem)
+ {
+ printDebugInfo();
+ LL_ERRS() << "No backup memory for face" << LL_ENDL;
+ }
+ colorp = (LLColor4U*)(mBackupMem + (4 * mIndicesCount) + (mGeomCount * mDrawPoolp->getStride()));
+ colors = colorp;
+ return 0;
+ }
+ else
+ {
+ llassert(mGeomIndex >= 0);
+ if (!mDrawPoolp->getColorStrider(colors, mGeomIndex))
+ {
+ printDebugInfo();
+ LL_ERRS() << "No color pointer for a color strider!" << LL_ENDL;
+ }
+ mDrawPoolp->setDirtyColors();
+ return mGeomIndex;
+ }
}
-inline S32 LLFace::getTexCoords (LLStrider<LLVector2> &texCoords, S32 pass )
+inline S32 LLFace::getTexCoords (LLStrider<LLVector2> &texCoords, S32 pass )
{
- if (!mGeomCount)
- {
- return -1;
- }
- if (isState(BACKLIST))
- {
- if (!mBackupMem)
- {
- printDebugInfo();
- LL_ERRS() << "No backup memory for face" << LL_ENDL;
- }
- texCoords = (LLVector2*)(mBackupMem + (4 * mIndicesCount) + mDrawPoolp->mDataOffsets[LLDrawPool::DATA_TEX_COORDS0 + pass]);
- texCoords.setStride( mDrawPoolp->getStride());
- return 0;
- }
- else
- {
- llassert(mGeomIndex >= 0);
- mDrawPoolp->getTexCoordStrider(texCoords, mGeomIndex, pass );
- mDrawPoolp->setDirty();
- return mGeomIndex;
- }
+ if (!mGeomCount)
+ {
+ return -1;
+ }
+ if (isState(BACKLIST))
+ {
+ if (!mBackupMem)
+ {
+ printDebugInfo();
+ LL_ERRS() << "No backup memory for face" << LL_ENDL;
+ }
+ texCoords = (LLVector2*)(mBackupMem + (4 * mIndicesCount) + mDrawPoolp->mDataOffsets[LLDrawPool::DATA_TEX_COORDS0 + pass]);
+ texCoords.setStride( mDrawPoolp->getStride());
+ return 0;
+ }
+ else
+ {
+ llassert(mGeomIndex >= 0);
+ mDrawPoolp->getTexCoordStrider(texCoords, mGeomIndex, pass );
+ mDrawPoolp->setDirty();
+ return mGeomIndex;
+ }
}
-inline S32 LLFace::getIndices (U32* &indicesp)
+inline S32 LLFace::getIndices (U32* &indicesp)
{
- if (isState(BACKLIST))
- {
- indicesp = (U32*)mBackupMem;
- return 0;
- }
- else
- {
- indicesp = mDrawPoolp->getIndices(mIndicesIndex);
- llassert(mGeomIndex >= 0);
- return mGeomIndex;
- }
+ if (isState(BACKLIST))
+ {
+ indicesp = (U32*)mBackupMem;
+ return 0;
+ }
+ else
+ {
+ indicesp = mDrawPoolp->getIndices(mIndicesIndex);
+ llassert(mGeomIndex >= 0);
+ return mGeomIndex;
+ }
}
inline const U32* LLFace::getRawIndices() const
{
- llassert(!isState(BACKLIST));
+ llassert(!isState(BACKLIST));
- return &mDrawPoolp->mIndices[mIndicesIndex];
+ return &mDrawPoolp->mIndices[mIndicesIndex];
}
inline void LLFace::bindTexture(S32 stage) const
{
- if (mTexture)
- {
- mTexture->bindTexture(stage);
- }
- else
- {
- LLImageGL::unbindTexture(stage, GL_TEXTURE_2D);
- }
+ if (mTexture)
+ {
+ mTexture->bindTexture(stage);
+ }
+ else
+ {
+ LLImageGL::unbindTexture(stage, GL_TEXTURE_2D);
+ }
}
#endif