diff options
author | Nat Goodspeed <nat@lindenlab.com> | 2024-05-15 09:07:21 -0400 |
---|---|---|
committer | Nat Goodspeed <nat@lindenlab.com> | 2024-05-15 09:07:21 -0400 |
commit | 5d43bc166d011e911e0492579b2f4f8bf015b48f (patch) | |
tree | ccc4cda5c2c2c3a5689f4a33dcfda2a896f21b8c /indra/llprimitive/lltextureanim.cpp | |
parent | a3f2cacf542e1d770698ef6c7e6ea1c0a5cd3368 (diff) | |
parent | e7eced3c87310b15ac20cc3cd470d67686104a14 (diff) |
Merge commit 'e7eced3' into release/luau-scripting: whitespace fix.
Diffstat (limited to 'indra/llprimitive/lltextureanim.cpp')
-rw-r--r-- | indra/llprimitive/lltextureanim.cpp | 334 |
1 files changed, 167 insertions, 167 deletions
diff --git a/indra/llprimitive/lltextureanim.cpp b/indra/llprimitive/lltextureanim.cpp index 7c48e57a1a..cc156722f4 100644 --- a/indra/llprimitive/lltextureanim.cpp +++ b/indra/llprimitive/lltextureanim.cpp @@ -1,25 +1,25 @@ -/** +/** * @file lltextureanim.cpp * @brief LLTextureAnim base class * * $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$ */ @@ -34,7 +34,7 @@ const S32 TA_BLOCK_SIZE = 16; LLTextureAnim::LLTextureAnim() { - reset(); + reset(); } @@ -45,195 +45,195 @@ LLTextureAnim::~LLTextureAnim() void LLTextureAnim::reset() { - mMode = 0; - mFace = -1; - mSizeX = 4; - mSizeY = 4; - mStart = 0.f; - mLength = 0.f; - mRate = 1.f; + mMode = 0; + mFace = -1; + mSizeX = 4; + mSizeY = 4; + mStart = 0.f; + mLength = 0.f; + mRate = 1.f; } BOOL LLTextureAnim::equals(const LLTextureAnim &other) const { - if (mMode != other.mMode) - { - return FALSE; - } - if (mFace != other.mFace) - { - return FALSE; - } - if (mSizeX != other.mSizeX) - { - return FALSE; - } - if (mSizeY != other.mSizeY) - { - return FALSE; - } - if (mStart != other.mStart) - { - return FALSE; - } - if (mLength != other.mLength) - { - return FALSE; - } - if (mRate != other.mRate) - { - return FALSE; - } - - return TRUE; + if (mMode != other.mMode) + { + return FALSE; + } + if (mFace != other.mFace) + { + return FALSE; + } + if (mSizeX != other.mSizeX) + { + return FALSE; + } + if (mSizeY != other.mSizeY) + { + return FALSE; + } + if (mStart != other.mStart) + { + return FALSE; + } + if (mLength != other.mLength) + { + return FALSE; + } + if (mRate != other.mRate) + { + return FALSE; + } + + return TRUE; } void LLTextureAnim::packTAMessage(LLMessageSystem *mesgsys) const { - U8 data[TA_BLOCK_SIZE]; - data[0] = mMode; - data[1] = mFace; - data[2] = mSizeX; - data[3] = mSizeY; - htolememcpy(data + 4, &mStart, MVT_F32, sizeof(F32)); - htolememcpy(data + 8, &mLength, MVT_F32, sizeof(F32)); - htolememcpy(data + 12, &mRate, MVT_F32, sizeof(F32)); - - mesgsys->addBinaryDataFast(_PREHASH_TextureAnim, data, TA_BLOCK_SIZE); + U8 data[TA_BLOCK_SIZE]; + data[0] = mMode; + data[1] = mFace; + data[2] = mSizeX; + data[3] = mSizeY; + htolememcpy(data + 4, &mStart, MVT_F32, sizeof(F32)); + htolememcpy(data + 8, &mLength, MVT_F32, sizeof(F32)); + htolememcpy(data + 12, &mRate, MVT_F32, sizeof(F32)); + + mesgsys->addBinaryDataFast(_PREHASH_TextureAnim, data, TA_BLOCK_SIZE); } void LLTextureAnim::packTAMessage(LLDataPacker &dp) const { - U8 data[TA_BLOCK_SIZE]; - data[0] = mMode; - data[1] = mFace; - data[2] = mSizeX; - data[3] = mSizeY; - htolememcpy(data + 4, &mStart, MVT_F32, sizeof(F32)); - htolememcpy(data + 8, &mLength, MVT_F32, sizeof(F32)); - htolememcpy(data + 12, &mRate, MVT_F32, sizeof(F32)); - - dp.packBinaryData(data, TA_BLOCK_SIZE, "TextureAnimation"); + U8 data[TA_BLOCK_SIZE]; + data[0] = mMode; + data[1] = mFace; + data[2] = mSizeX; + data[3] = mSizeY; + htolememcpy(data + 4, &mStart, MVT_F32, sizeof(F32)); + htolememcpy(data + 8, &mLength, MVT_F32, sizeof(F32)); + htolememcpy(data + 12, &mRate, MVT_F32, sizeof(F32)); + + dp.packBinaryData(data, TA_BLOCK_SIZE, "TextureAnimation"); } void LLTextureAnim::unpackTAMessage(LLMessageSystem *mesgsys, const S32 block_num) { - S32 size = mesgsys->getSizeFast(_PREHASH_ObjectData, block_num, _PREHASH_TextureAnim); - - if (size != TA_BLOCK_SIZE) - { - if (size) - { - LL_WARNS() << "Bad size " << size << " for TA block, ignoring." << LL_ENDL; - } - mMode = 0; - return; - } - - U8 data[TA_BLOCK_SIZE]; - mesgsys->getBinaryDataFast(_PREHASH_ObjectData, _PREHASH_TextureAnim, data, TA_BLOCK_SIZE, block_num); - - mMode = data[0]; - mFace = data[1]; - if (mMode & LLTextureAnim::SMOOTH) - { - mSizeX = llmax((U8)0, data[2]); - mSizeY = llmax((U8)0, data[3]); - } - else - { - mSizeX = llmax((U8)1, data[2]); - mSizeY = llmax((U8)1, data[3]); - } - htolememcpy(&mStart, data + 4, MVT_F32, sizeof(F32)); - htolememcpy(&mLength, data + 8, MVT_F32, sizeof(F32)); - htolememcpy(&mRate, data + 12, MVT_F32, sizeof(F32)); + S32 size = mesgsys->getSizeFast(_PREHASH_ObjectData, block_num, _PREHASH_TextureAnim); + + if (size != TA_BLOCK_SIZE) + { + if (size) + { + LL_WARNS() << "Bad size " << size << " for TA block, ignoring." << LL_ENDL; + } + mMode = 0; + return; + } + + U8 data[TA_BLOCK_SIZE]; + mesgsys->getBinaryDataFast(_PREHASH_ObjectData, _PREHASH_TextureAnim, data, TA_BLOCK_SIZE, block_num); + + mMode = data[0]; + mFace = data[1]; + if (mMode & LLTextureAnim::SMOOTH) + { + mSizeX = llmax((U8)0, data[2]); + mSizeY = llmax((U8)0, data[3]); + } + else + { + mSizeX = llmax((U8)1, data[2]); + mSizeY = llmax((U8)1, data[3]); + } + htolememcpy(&mStart, data + 4, MVT_F32, sizeof(F32)); + htolememcpy(&mLength, data + 8, MVT_F32, sizeof(F32)); + htolememcpy(&mRate, data + 12, MVT_F32, sizeof(F32)); } void LLTextureAnim::unpackTAMessage(LLDataPacker &dp) { - S32 size; - U8 data[TA_BLOCK_SIZE]; - dp.unpackBinaryData(data, size, "TextureAnimation"); - if (size != TA_BLOCK_SIZE) - { - if (size) - { - LL_WARNS() << "Bad size " << size << " for TA block, ignoring." << LL_ENDL; - } - mMode = 0; - return; - } - - mMode = data[0]; - mFace = data[1]; - mSizeX = data[2]; - mSizeY = data[3]; - htolememcpy(&mStart, data + 4, MVT_F32, sizeof(F32)); - htolememcpy(&mLength, data + 8, MVT_F32, sizeof(F32)); - htolememcpy(&mRate, data + 12, MVT_F32, sizeof(F32)); + S32 size; + U8 data[TA_BLOCK_SIZE]; + dp.unpackBinaryData(data, size, "TextureAnimation"); + if (size != TA_BLOCK_SIZE) + { + if (size) + { + LL_WARNS() << "Bad size " << size << " for TA block, ignoring." << LL_ENDL; + } + mMode = 0; + return; + } + + mMode = data[0]; + mFace = data[1]; + mSizeX = data[2]; + mSizeY = data[3]; + htolememcpy(&mStart, data + 4, MVT_F32, sizeof(F32)); + htolememcpy(&mLength, data + 8, MVT_F32, sizeof(F32)); + htolememcpy(&mRate, data + 12, MVT_F32, sizeof(F32)); } LLSD LLTextureAnim::asLLSD() const { - LLSD sd; - sd["mode"] = mMode; - sd["face"] = mFace; - sd["sizeX"] = mSizeX; - sd["sizeY"] = mSizeY; - sd["start"] = mStart; - sd["length"] = mLength; - sd["rate"] = mRate; - return sd; + LLSD sd; + sd["mode"] = mMode; + sd["face"] = mFace; + sd["sizeX"] = mSizeX; + sd["sizeY"] = mSizeY; + sd["start"] = mStart; + sd["length"] = mLength; + sd["rate"] = mRate; + return sd; } bool LLTextureAnim::fromLLSD(LLSD& sd) { - const char *w; - w = "mode"; - if (sd.has(w)) - { - mMode = (U8)sd[w].asInteger(); - } else goto fail; - - w = "face"; - if (sd.has(w)) - { - mFace = (S8)sd[w].asInteger(); - } else goto fail; - - w = "sizeX"; - if (sd.has(w)) - { - mSizeX = (U8)sd[w].asInteger(); - } else goto fail; - - w = "sizeY"; - if (sd.has(w)) - { - mSizeY = (U8)sd[w].asInteger(); - } else goto fail; - - w = "start"; - if (sd.has(w)) - { - mStart = (F32)sd[w].asReal(); - } else goto fail; - - w = "length"; - if (sd.has(w)) - { - mLength = (F32)sd[w].asReal(); - } else goto fail; - - w = "rate"; - if (sd.has(w)) - { - mRate = (F32)sd[w].asReal(); - } else goto fail; - - return true; + const char *w; + w = "mode"; + if (sd.has(w)) + { + mMode = (U8)sd[w].asInteger(); + } else goto fail; + + w = "face"; + if (sd.has(w)) + { + mFace = (S8)sd[w].asInteger(); + } else goto fail; + + w = "sizeX"; + if (sd.has(w)) + { + mSizeX = (U8)sd[w].asInteger(); + } else goto fail; + + w = "sizeY"; + if (sd.has(w)) + { + mSizeY = (U8)sd[w].asInteger(); + } else goto fail; + + w = "start"; + if (sd.has(w)) + { + mStart = (F32)sd[w].asReal(); + } else goto fail; + + w = "length"; + if (sd.has(w)) + { + mLength = (F32)sd[w].asReal(); + } else goto fail; + + w = "rate"; + if (sd.has(w)) + { + mRate = (F32)sd[w].asReal(); + } else goto fail; + + return true; fail: - return false; + return false; } |