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

Aurora-Sim is now WhiteCore

Browse Source 
Minor Alchemy merge in removing llvlmanager,
indra_constants no longer has *_LAYER_CODE
This commit is contained in:
Lirusaito
2019-01-25 21:19:51 -05:00
parent 0fca6ee425
commit 049c1e16b0
17 changed files with 133 additions and 326 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
indra/newview/llvlmanager.cpp
View File

@@ -42,6 +42,16 @@
#include "llframetimer.h"
#include "llsurface.h"
const char LAND_LAYER_CODE = 'L';
const char WATER_LAYER_CODE = 'W';
const char WIND_LAYER_CODE = '7';
const char CLOUD_LAYER_CODE = '8';
const char WHITECORE_LAND_LAYER_CODE = 'M';
const char WHITECORE_WATER_LAYER_CODE = 'X';
const char WHITECORE_WIND_LAYER_CODE = '9';
const char WHITECORE_CLOUD_LAYER_CODE = ':';
LLVLManager gVLManager;
LLVLManager::~LLVLManager()
@@ -56,33 +66,22 @@ LLVLManager::~LLVLManager()
void LLVLManager::addLayerData(LLVLData *vl_datap, const S32 mesg_size)
{
// <FS:CR> Aurora Sim
//if (LAND_LAYER_CODE == vl_datap->mType)
if (LAND_LAYER_CODE == vl_datap->mType || AURORA_LAND_LAYER_CODE == vl_datap->mType)
// </FS:CR> Aurora Sim
if (LAND_LAYER_CODE == vl_datap->mType || WHITECORE_LAND_LAYER_CODE == vl_datap->mType)
{
mLandBits += mesg_size * 8;
}
// <FS:CR> Aurora Sim
//else if (WIND_LAYER_CODE == vl_datap->mType)
else if (WIND_LAYER_CODE == vl_datap->mType || AURORA_WIND_LAYER_CODE == vl_datap->mType)
// </FS:CR> Aurora Sim
{
mWindBits += mesg_size * 8;
}
// <FS:CR> Aurora Sim
//else if (CLOUD_LAYER_CODE == vl_datap->mType)
else if (CLOUD_LAYER_CODE == vl_datap->mType || AURORA_CLOUD_LAYER_CODE == vl_datap->mType)
// </FS:CR> Aurora Sim
{
mCloudBits += mesg_size * 8;
}
// <FS:CR> Aurora Sim
else if (WATER_LAYER_CODE == vl_datap->mType || AURORA_CLOUD_LAYER_CODE == vl_datap->mType)
else if (WATER_LAYER_CODE == vl_datap->mType || WHITECORE_CLOUD_LAYER_CODE == vl_datap->mType)
{
mWaterBits += mesg_size * 8;
}
// </FS:CR> Aurora Sim
else if (WIND_LAYER_CODE == vl_datap->mType || WHITECORE_WIND_LAYER_CODE == vl_datap->mType)
{
mWindBits += mesg_size * 8;
}
else if (CLOUD_LAYER_CODE == vl_datap->mType || WHITECORE_CLOUD_LAYER_CODE == vl_datap->mType)
{
mCloudBits += mesg_size * 8;
}
else
{
LL_ERRS() << "Unknown layer type!" << (S32)vl_datap->mType << LL_ENDL;
@@ -108,19 +107,16 @@ void LLVLManager::unpackData(const S32 num_packets)
{
datap->mRegionp->getLand().decompressDCTPatch(bit_pack, &goph, FALSE);
}
// <FS:CR> Aurora Sim
else if (AURORA_LAND_LAYER_CODE == datap->mType)
else if (WHITECORE_LAND_LAYER_CODE == datap->mType)
{
datap->mRegionp->getLand().decompressDCTPatch(bit_pack, &goph, TRUE);
}
//else if (WIND_LAYER_CODE == datap->mType)
else if (WIND_LAYER_CODE == datap->mType || AURORA_WIND_LAYER_CODE == datap->mType)
// </FS:CR> Aurora Sim
else if (WIND_LAYER_CODE == datap->mType || WHITECORE_WIND_LAYER_CODE == datap->mType)
{
datap->mRegionp->mWind.decompress(bit_pack, &goph);
}
else if (CLOUD_LAYER_CODE == datap->mType || AURORA_CLOUD_LAYER_CODE == datap->mType)
else if (CLOUD_LAYER_CODE == datap->mType || WHITECORE_CLOUD_LAYER_CODE == datap->mType)
{
#if ENABLE_CLASSIC_CLOUDS
datap->mRegionp->mCloudLayer.decompress(bit_pack, &goph);
@@ -156,6 +152,11 @@ S32 LLVLManager::getCloudBits() const
return mCloudBits;
}
S32 LLVLManager::getWaterBits() const
{
return mWaterBits;
}
S32 LLVLManager::getTotalBytes() const
{
return mLandBits + mWindBits + mCloudBits;
@@ -189,6 +190,6 @@ LLVLData::LLVLData(LLViewerRegion *regionp, const S8 type, U8 *data, const S32 s
LLVLData::~LLVLData()
{
delete [] mData;
mData = NULL;
mRegionp = NULL;
mData = nullptr;
mRegionp = nullptr;
}