diff options
Diffstat (limited to 'indra/newview/llvlmanager.cpp')
| -rw-r--r-- | indra/newview/llvlmanager.cpp | 176 |
1 files changed, 88 insertions, 88 deletions
diff --git a/indra/newview/llvlmanager.cpp b/indra/newview/llvlmanager.cpp index 895ceed880..901516f832 100644 --- a/indra/newview/llvlmanager.cpp +++ b/indra/newview/llvlmanager.cpp @@ -1,25 +1,25 @@ -/** +/** * @file llvlmanager.cpp * @brief LLVLManager class implementation * * $LicenseInfo:firstyear=2002&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$ */ @@ -36,133 +36,133 @@ #include "llsurface.h" #include "llbitpack.h" -const char LAND_LAYER_CODE = 'L'; -const char WIND_LAYER_CODE = '7'; -const char CLOUD_LAYER_CODE = '8'; +const char LAND_LAYER_CODE = 'L'; +const char WIND_LAYER_CODE = '7'; +const char CLOUD_LAYER_CODE = '8'; LLVLManager gVLManager; LLVLManager::~LLVLManager() { - S32 i; - for (i = 0; i < mPacketData.size(); i++) - { - delete mPacketData[i]; - } - mPacketData.clear(); + S32 i; + for (i = 0; i < mPacketData.size(); i++) + { + delete mPacketData[i]; + } + mPacketData.clear(); } void LLVLManager::addLayerData(LLVLData *vl_datap, const S32Bytes mesg_size) { - if (LAND_LAYER_CODE == vl_datap->mType) - { - mLandBits += mesg_size; - } - else if (WIND_LAYER_CODE == vl_datap->mType) - { - mWindBits += mesg_size; - } - else if (CLOUD_LAYER_CODE == vl_datap->mType) - { - mCloudBits += mesg_size; - } - else - { - LL_ERRS() << "Unknown layer type!" << (S32)vl_datap->mType << LL_ENDL; - } - - mPacketData.push_back(vl_datap); + if (LAND_LAYER_CODE == vl_datap->mType) + { + mLandBits += mesg_size; + } + else if (WIND_LAYER_CODE == vl_datap->mType) + { + mWindBits += mesg_size; + } + else if (CLOUD_LAYER_CODE == vl_datap->mType) + { + mCloudBits += mesg_size; + } + else + { + LL_ERRS() << "Unknown layer type!" << (S32)vl_datap->mType << LL_ENDL; + } + + mPacketData.push_back(vl_datap); } void LLVLManager::unpackData(const S32 num_packets) { - static LLFrameTimer decode_timer; - - S32 i; - for (i = 0; i < mPacketData.size(); i++) - { - LLVLData *datap = mPacketData[i]; - - LLBitPack bit_pack(datap->mData, datap->mSize); - LLGroupHeader goph; - - decode_patch_group_header(bit_pack, &goph); - if (LAND_LAYER_CODE == datap->mType) - { - datap->mRegionp->getLand().decompressDCTPatch(bit_pack, &goph, FALSE); - } - else if (WIND_LAYER_CODE == datap->mType) - { - datap->mRegionp->mWind.decompress(bit_pack, &goph); - - } - else if (CLOUD_LAYER_CODE == datap->mType) - { - - } - } - - for (i = 0; i < mPacketData.size(); i++) - { - delete mPacketData[i]; - } - mPacketData.clear(); + static LLFrameTimer decode_timer; + + S32 i; + for (i = 0; i < mPacketData.size(); i++) + { + LLVLData *datap = mPacketData[i]; + + LLBitPack bit_pack(datap->mData, datap->mSize); + LLGroupHeader goph; + + decode_patch_group_header(bit_pack, &goph); + if (LAND_LAYER_CODE == datap->mType) + { + datap->mRegionp->getLand().decompressDCTPatch(bit_pack, &goph, FALSE); + } + else if (WIND_LAYER_CODE == datap->mType) + { + datap->mRegionp->mWind.decompress(bit_pack, &goph); + + } + else if (CLOUD_LAYER_CODE == datap->mType) + { + + } + } + + for (i = 0; i < mPacketData.size(); i++) + { + delete mPacketData[i]; + } + mPacketData.clear(); } void LLVLManager::resetBitCounts() { - mLandBits = mWindBits = mCloudBits = (S32Bits)0; + mLandBits = mWindBits = mCloudBits = (S32Bits)0; } U32Bits LLVLManager::getLandBits() const { - return mLandBits; + return mLandBits; } U32Bits LLVLManager::getWindBits() const { - return mWindBits; + return mWindBits; } U32Bits LLVLManager::getCloudBits() const { - return mCloudBits; + return mCloudBits; } S32Bytes LLVLManager::getTotalBytes() const { - return mLandBits + mWindBits + mCloudBits; + return mLandBits + mWindBits + mCloudBits; } void LLVLManager::cleanupData(LLViewerRegion *regionp) { - S32 cur = 0; - while (cur < mPacketData.size()) - { - if (mPacketData[cur]->mRegionp == regionp) - { - delete mPacketData[cur]; - mPacketData.erase(mPacketData.begin() + cur); - } - else - { - cur++; - } - } + S32 cur = 0; + while (cur < mPacketData.size()) + { + if (mPacketData[cur]->mRegionp == regionp) + { + delete mPacketData[cur]; + mPacketData.erase(mPacketData.begin() + cur); + } + else + { + cur++; + } + } } LLVLData::LLVLData(LLViewerRegion *regionp, const S8 type, U8 *data, const S32 size) { - mType = type; - mData = data; - mRegionp = regionp; - mSize = size; + mType = type; + mData = data; + mRegionp = regionp; + mSize = size; } LLVLData::~LLVLData() { - delete [] mData; - mData = NULL; - mRegionp = NULL; + delete [] mData; + mData = NULL; + mRegionp = NULL; } |