Skip to content
GitLab
Commit 7d123824 authored by Rye Mutt's avatar Rye Mutt 🍞
Browse files

Some cleanup to local baking for opensim

parent df3d8a34
Hide whitespace changes
Inline Side-by-side
indra/llappearance/lltexlayer.cpp
View file @ 7d123824
......@@ -1281,7 +1281,7 @@ const U8* LLTexLayer::getAlphaData() const
const LLUUID& uuid = getUUID();
alpha_mask_crc.update((U8*)(&uuid.mData), UUID_BYTES);
for (auto param : mParamAlphaList)
for (const LLTexLayerParamAlpha* param : mParamAlphaList)
{
// MULTI-WEARABLE: verify visual parameters used here
F32 param_weight = param->getWeight();
......
indra/newview/llagentwearablesfetch.cpp
View file @ 7d123824
......@@ -162,7 +162,7 @@ void LLInitialWearablesFetch::processWearablesMessage()
{
LLViewerJointAttachment* attachment = iter->second;
if (!attachment) continue;
for (auto attached_object : attachment->mAttachedObjects)
for (LLViewerObject* attached_object : attachment->mAttachedObjects)
{
if (!attached_object) continue;
const LLUUID& item_id = attached_object->getAttachmentItemID();
......
indra/newview/llvoavatar.cpp
View file @ 7d123824
......@@ -7781,7 +7781,8 @@ void LLVOAvatar::onGlobalColorChanged(const LLTexGlobalColor* global_color, BOOL
else if (global_color == mTexEyeColor)
{
// LL_INFOS() << "invalidateComposite cause: onGlobalColorChanged( eyecolor )" << LL_ENDL;
invalidateComposite( mBakedTextureDatas[BAKED_EYES].mTexLayerSet, upload_bake); }
invalidateComposite( mBakedTextureDatas[BAKED_EYES].mTexLayerSet, upload_bake);
}
updateMeshTextures();
}
......@@ -8033,13 +8034,22 @@ void LLVOAvatar::updateRuthTimer(bool loading)
BOOL LLVOAvatar::processFullyLoadedChange(bool loading)
{
// we wait a little bit before giving the all clear,
// to let textures settle down
const F32 PAUSE = 1.f;
// We wait a little bit before giving the 'all clear', to let things to
// settle down (models to snap into place, textures to get first packets)
const F32 LOADED_DELAY = 1.f;
const F32 FIRST_USE_DELAY = 3.f;
if (loading)
mFullyLoadedTimer.reset();
mFullyLoaded = (mFullyLoadedTimer.getElapsedTimeF32() > PAUSE);
if (mFirstFullyVisible)
{
mFullyLoaded = (mFullyLoadedTimer.getElapsedTimeF32() > FIRST_USE_DELAY);
}
else
{
mFullyLoaded = (mFullyLoadedTimer.getElapsedTimeF32() > LOADED_DELAY);
}
if (!mPreviousFullyLoaded && !loading && mFullyLoaded)
{
......@@ -8146,36 +8156,15 @@ void LLVOAvatar::updateMeshVisibility()
LLViewerJointAttachment* attachment = attachment_point.second;
if (attachment)
{
for (const auto& objectp : attachment->mAttachedObjects)
for (LLViewerObject *objectp : attachment->mAttachedObjects)
{
if (objectp)
{
for (int face_index = 0; face_index < objectp->getNumTEs(); face_index++)
{
LLTextureEntry* tex_entry = objectp->getTE(face_index);
bake_flag[BAKED_HEAD] |= (tex_entry->getID() == IMG_USE_BAKED_HEAD);
bake_flag[BAKED_EYES] |= (tex_entry->getID() == IMG_USE_BAKED_EYES);
bake_flag[BAKED_HAIR] |= (tex_entry->getID() == IMG_USE_BAKED_HAIR);
bake_flag[BAKED_LOWER] |= (tex_entry->getID() == IMG_USE_BAKED_LOWER);
bake_flag[BAKED_UPPER] |= (tex_entry->getID() == IMG_USE_BAKED_UPPER);
bake_flag[BAKED_SKIRT] |= (tex_entry->getID() == IMG_USE_BAKED_SKIRT);
bake_flag[BAKED_LEFT_ARM] |= (tex_entry->getID() == IMG_USE_BAKED_LEFTARM);
bake_flag[BAKED_LEFT_LEG] |= (tex_entry->getID() == IMG_USE_BAKED_LEFTLEG);
bake_flag[BAKED_AUX1] |= (tex_entry->getID() == IMG_USE_BAKED_AUX1);
bake_flag[BAKED_AUX2] |= (tex_entry->getID() == IMG_USE_BAKED_AUX2);
bake_flag[BAKED_AUX3] |= (tex_entry->getID() == IMG_USE_BAKED_AUX3);
}
}
LLViewerObject::const_child_list_t& child_list = objectp->getChildren();
for (const auto& iter1 : child_list)
{
LLViewerObject* objectchild = iter1;
if (objectchild)
{
for (int face_index = 0; face_index < objectchild->getNumTEs(); face_index++)
if (tex_entry)
{
LLTextureEntry* tex_entry = objectchild->getTE(face_index);
bake_flag[BAKED_HEAD] |= (tex_entry->getID() == IMG_USE_BAKED_HEAD);
bake_flag[BAKED_EYES] |= (tex_entry->getID() == IMG_USE_BAKED_EYES);
bake_flag[BAKED_HAIR] |= (tex_entry->getID() == IMG_USE_BAKED_HAIR);
......@@ -8190,6 +8179,32 @@ void LLVOAvatar::updateMeshVisibility()
}
}
}
LLViewerObject::const_child_list_t& child_list = objectp->getChildren();
for (LLViewerObject* objectchild : child_list)
{
if (objectchild)
{
for (int face_index = 0; face_index < objectchild->getNumTEs(); face_index++)
{
LLTextureEntry* tex_entry = objectchild->getTE(face_index);
if (tex_entry)
{
bake_flag[BAKED_HEAD] |= (tex_entry->getID() == IMG_USE_BAKED_HEAD);
bake_flag[BAKED_EYES] |= (tex_entry->getID() == IMG_USE_BAKED_EYES);
bake_flag[BAKED_HAIR] |= (tex_entry->getID() == IMG_USE_BAKED_HAIR);
bake_flag[BAKED_LOWER] |= (tex_entry->getID() == IMG_USE_BAKED_LOWER);
bake_flag[BAKED_UPPER] |= (tex_entry->getID() == IMG_USE_BAKED_UPPER);
bake_flag[BAKED_SKIRT] |= (tex_entry->getID() == IMG_USE_BAKED_SKIRT);
bake_flag[BAKED_LEFT_ARM] |= (tex_entry->getID() == IMG_USE_BAKED_LEFTARM);
bake_flag[BAKED_LEFT_LEG] |= (tex_entry->getID() == IMG_USE_BAKED_LEFTLEG);
bake_flag[BAKED_AUX1] |= (tex_entry->getID() == IMG_USE_BAKED_AUX1);
bake_flag[BAKED_AUX2] |= (tex_entry->getID() == IMG_USE_BAKED_AUX2);
bake_flag[BAKED_AUX3] |= (tex_entry->getID() == IMG_USE_BAKED_AUX3);
}
}
}
}
}
}
}
......
indra/newview/llvoavatarself.cpp
View file @ 7d123824
......@@ -265,6 +265,10 @@ void LLVOAvatarSelf::setHoverIfRegionEnabled()
setHoverOffset(LLVector3(0.0, 0.0, llclamp(hover_z,MIN_HOVER_Z,MAX_HOVER_Z)));
LL_INFOS("Avatar") << avString() << " set hover height from debug setting " << hover_z << LL_ENDL;
}
else if (!isUsingServerBakes())
{
computeBodySize();
}
else
{
setHoverOffset(LLVector3(0.0, 0.0, 0.0));
......@@ -1412,9 +1416,8 @@ BOOL LLVOAvatarSelf::detachObject(LLViewerObject *viewer_object)
LLFollowCamMgr::getInstance()->setCameraActive(viewer_object->getID(), FALSE);
LLViewerObject::const_child_list_t& child_list = viewer_object->getChildren();
for (const auto& iter : child_list)
for (LLViewerObject* child_objectp : child_list)
{
LLViewerObject* child_objectp = iter;
// the simulator should automatically handle
// permissions revocation
......@@ -2538,7 +2541,7 @@ LLSD summarize_by_buckets(std::vector<LLSD> in_records,
for (auto& record : in_records)
{
LLSD key;
for (auto& field : by_fields)
for (const auto& field : by_fields)
{
key[field] = record[field];
}
......@@ -2557,7 +2560,7 @@ LLSD summarize_by_buckets(std::vector<LLSD> in_records,
void LLVOAvatarSelf::sendViewerAppearanceChangeMetrics()
{
std::string caps_url;
std::string caps_url;
if (getRegion())
{
// runway - change here to activate.
......@@ -2566,44 +2569,33 @@ void LLVOAvatarSelf::sendViewerAppearanceChangeMetrics()
if (!caps_url.empty())
{
LLCoros::instance().launch("LLVOAvatarSelf::appearanceChangeMetricsCoro",
boost::bind(&LLVOAvatarSelf::appearanceChangeMetricsCoro, this, caps_url));
LLCoros::instance().launch("LLVOAvatarSelf::appearanceChangeMetricsCoro",
boost::bind(&LLVOAvatarSelf::appearanceChangeMetricsCoro, this, caps_url));
mTimeSinceLastRezMessage.reset();
}
}
//class CheckAgentAppearanceServiceResponder final : public LLHTTPClient::Responder
//{
//public:
// CheckAgentAppearanceServiceResponder() {}
//
// virtual ~CheckAgentAppearanceServiceResponder() {}
//
// /* virtual */ void httpSuccess()
// {
// LL_DEBUGS("Avatar") << "OK" << LL_ENDL;
// }
//
// // Error
// /*virtual*/ void httpFailure()
// {
// if (isAgentAvatarValid())
// {
// LL_DEBUGS("Avatar") << "failed, will rebake "
// << dumpResponse() << LL_ENDL;
// forceAppearanceUpdate();
// }
// }
//
// static void forceAppearanceUpdate()
// {
// // Trying to rebake immediately after crossing region boundary
// // seems to be failure prone; adding a delay factor. Yes, this
// // fix is ad-hoc and not guaranteed to work in all cases.
// doAfterInterval(boost::bind(&LLVOAvatarSelf::forceBakeAllTextures,
// gAgentAvatarp.get(), true), 5.0);
// }
//};
void CheckAgentAppearanceService_httpSuccess( LLSD const &aData )
{
LL_DEBUGS("Avatar") << "OK" << LL_ENDL;
}
void forceAppearanceUpdate()
{
// Trying to rebake immediately after crossing region boundary
// seems to be failure prone; adding a delay factor. Yes, this
// fix is ad-hoc and not guaranteed to work in all cases.
doAfterInterval(boost::bind(&LLVOAvatarSelf::forceBakeAllTextures, gAgentAvatarp.get(), true), 5.0);
}
void CheckAgentAppearanceService_httpFailure( LLSD const &aData )
{
if (isAgentAvatarValid())
{
LL_DEBUGS("Avatar") << "failed, will rebake " << aData << LL_ENDL;
forceAppearanceUpdate();
}
}
void LLVOAvatarSelf::checkForUnsupportedServerBakeAppearance()
{
......@@ -2617,12 +2609,13 @@ void LLVOAvatarSelf::checkForUnsupportedServerBakeAppearance()
// if baked image service is unknown, need to refresh.
if (LLAppearanceMgr::instance().getAppearanceServiceURL().empty())
{
//CheckAgentAppearanceServiceResponder::forceAppearanceUpdate();
forceAppearanceUpdate();
}
// query baked image service to check status.
//std::string image_url = gAgentAvatarp->getImageURL(TEX_HEAD_BAKED,
// getTE(TEX_HEAD_BAKED)->getID());
//LLHTTPClient::head(image_url, new CheckAgentAppearanceServiceResponder);
std::string image_url = gAgentAvatarp->getImageURL(TEX_HEAD_BAKED,
getTE(TEX_HEAD_BAKED)->getID());
LLCoreHttpUtil::HttpCoroutineAdapter::callbackHttpGet( image_url, CheckAgentAppearanceService_httpSuccess, CheckAgentAppearanceService_httpFailure );
}
const LLUUID& LLVOAvatarSelf::grabBakedTexture(EBakedTextureIndex baked_index) const
......@@ -2691,10 +2684,9 @@ BOOL LLVOAvatarSelf::canGrabBakedTexture(EBakedTextureIndex baked_index) const
if (!items.empty())
{
// search for full permissions version
for (auto& item : items)
for (LLViewerInventoryItem* itemp : items)
{
LLViewerInventoryItem* itemp = item;
if (itemp->getIsFullPerm())
if (itemp->getIsFullPerm())
{
can_grab = TRUE;
break;
......@@ -2895,7 +2887,7 @@ void LLVOAvatarSelf::outputRezDiagnostics() const
}
}
LL_DEBUGS("Avatar") << "\t Time points for each upload (start / finish)" << LL_ENDL;
for (U32 i = 0; i < getNumBakes(); ++i)
for (U32 i = 0; i < LLAvatarAppearanceDefines::BAKED_NUM_INDICES; ++i)
{
LL_DEBUGS("Avatar") << "\t\t (" << i << ") \t" << (S32)mDebugBakedTextureTimes[i][0] << " / " << (S32)mDebugBakedTextureTimes[i][1] << LL_ENDL;
}
......@@ -3085,9 +3077,6 @@ LLViewerTexLayerSet* LLVOAvatarSelf::getLayerSet(EBakedTextureIndex baked_index)
return NULL;
}
// static
void LLVOAvatarSelf::onCustomizeStart(bool disable_camera_switch)
{
......@@ -3299,7 +3288,7 @@ void LLVOAvatarSelf::dumpWearableInfo(LLAPRFile& outfile)
type_name.c_str(), wearable->getName().c_str() );
LLWearable::visual_param_vec_t v_params;
wearable->getVisualParams(v_params);
for (auto param : v_params)
for (auto* param : v_params)
{
dump_visual_param(file, param, param->getWeight());
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment