livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #129 from Hecklezz/fix/gltf_hiding_in_bp 

Improves GLTF hiding while object is displaying Blinn-Phong
master
Beq Janus 2025-05-23 12:10:47 +01:00 committed by GitHub
parent 780286158e 0e60ec606a
commit 19cc266540
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 79 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/fspanelface.cpp
View File

@ -737,7 +737,6 @@ void FSPanelFace::onMatTabChange()
if(objectp)
{
last_mat = curr_mat;
gSavedSettings.setBOOL("FSShowSelectedInBlinnPhong", (curr_mat == MATMEDIA_MATERIAL));
// Iterate through the linkset and mark each object for update
for (LLObjectSelection::iterator iter = LLSelectMgr::getInstance()->getSelection()->begin();
iter != LLSelectMgr::getInstance()->getSelection()->end(); ++iter)
@ -760,6 +759,7 @@ void FSPanelFace::onMatTabChange()
// Since we allow both PBR and BP textures to be applied at the same time,
// we need to hide or show the GLTF material only locally based on the current tab.
gSavedSettings.setBOOL("FSShowSelectedInBlinnPhong", (curr_mat == MATMEDIA_MATERIAL));
if (curr_mat != MATMEDIA_PBR)
LLSelectMgr::getInstance()->hideGLTFMaterial();
else

112
indra/newview/llviewerobject.cpp
View File

@ -7756,6 +7756,16 @@ void LLViewerObject::setRenderMaterialID(S32 te_in, const LLUUID& id, bool updat
start_idx = llmax(start_idx, 0);
end_idx = llmin(end_idx, (S32) getNumTEs());
// <FS> [FIRE-35138] If we are hiding the GLTF material, call the function again but with a null material id
static LLCachedControl<bool> showSelectedinBP(gSavedSettings, "FSShowSelectedInBlinnPhong");
bool hiding_gltf_material = showSelectedinBP && isSelected();
if (hiding_gltf_material && id.notNull())
{
setRenderMaterialID(te_in, LLUUID::null, update_server, local_origin);
return;
}
// </FS>
LLRenderMaterialParams* param_block = (LLRenderMaterialParams*)getParameterEntry(LLNetworkData::PARAMS_RENDER_MATERIAL);
if (!param_block && id.notNull())
{ // block doesn't exist, but it will need to
@ -7792,43 +7802,53 @@ void LLViewerObject::setRenderMaterialID(S32 te_in, const LLUUID& id, bool updat
}
}
if (update_server || material_changed)
{
tep->setGLTFRenderMaterial(nullptr);
}
if (new_material != tep->getGLTFMaterial())
{
tep->setGLTFMaterial(new_material, !update_server);
}
if (material_changed && new_material)
{
// Sometimes, the material may change out from underneath the overrides.
// This is usually due to the server sending a new material ID, but
// the overrides have not changed due to being only texture
// transforms. Re-apply the overrides to the render material here,
// if present.
const LLGLTFMaterial* override_material = tep->getGLTFMaterialOverride();
if (override_material)
// <FS> [FIRE-35138] Only set GLTF material if not hiding it
if (!hiding_gltf_material)
{ // </FS>
if (update_server || material_changed)
{
new_material->onMaterialComplete([obj_id = getID(), te]()
{
LLViewerObject* obj = gObjectList.findObject(obj_id);
if (!obj) { return; }
LLTextureEntry* tep = obj->getTE(te);
if (!tep) { return; }
const LLGLTFMaterial* new_material = tep->getGLTFMaterial();
if (!new_material) { return; }
const LLGLTFMaterial* override_material = tep->getGLTFMaterialOverride();
if (!override_material) { return; }
LLGLTFMaterial* render_material = new LLFetchedGLTFMaterial();
*render_material = *new_material;
render_material->applyOverride(*override_material);
tep->setGLTFRenderMaterial(render_material);
});
tep->setGLTFRenderMaterial(nullptr);
}
}
if (new_material != tep->getGLTFMaterial())
{
tep->setGLTFMaterial(new_material, !update_server);
}
if (material_changed && new_material)
{
// Sometimes, the material may change out from underneath the overrides.
// This is usually due to the server sending a new material ID, but
// the overrides have not changed due to being only texture
// transforms. Re-apply the overrides to the render material here,
// if present.
const LLGLTFMaterial* override_material = tep->getGLTFMaterialOverride();
if (override_material)
{
new_material->onMaterialComplete([obj_id = getID(), te]()
{
LLViewerObject* obj = gObjectList.findObject(obj_id);
if (!obj) { return; }
LLTextureEntry* tep = obj->getTE(te);
if (!tep) { return; }
const LLGLTFMaterial* new_material = tep->getGLTFMaterial();
if (!new_material) { return; }
const LLGLTFMaterial* override_material = tep->getGLTFMaterialOverride();
if (!override_material) { return; }
LLGLTFMaterial* render_material = new LLFetchedGLTFMaterial();
*render_material = *new_material;
render_material->applyOverride(*override_material);
tep->setGLTFRenderMaterial(render_material);
});
}
}
// <FS> [FIRE-35138] Update the saved GLTF material since we got an update
if (material_changed)
{
updateSavedGLTFMaterial(te);
}
} // </FS>
}
// signal to render pipe that render batches must be rebuilt for this object
@ -7907,6 +7927,28 @@ void LLViewerObject::saveGLTFMaterials()
}
}
void LLViewerObject::updateSavedGLTFMaterial(S32 te)
{
if (te >= mSavedGLTFMaterialIds.size())
{
// Nothing is saved, so don't need to update anything
return;
}
mSavedGLTFMaterialIds[te] = getRenderMaterialID(te);
LLPointer<LLGLTFMaterial> old_override = getTE(te)->getGLTFMaterialOverride();
if (old_override.notNull())
{
LLGLTFMaterial* copy = new LLGLTFMaterial(*old_override);
mSavedGLTFOverrideMaterials[te] = copy;
}
else
{
mSavedGLTFOverrideMaterials[te] = nullptr;
}
}
void LLViewerObject::clearSavedGLTFMaterials()
{
mSavedGLTFMaterialIds.clear();

1
indra/newview/llviewerobject.h
View File

@ -214,6 +214,7 @@ public:
const uuid_vec_t& getSavedGLTFMaterialIds() const { return mSavedGLTFMaterialIds; };
const gltf_materials_vec_t& getSavedGLTFOverrideMaterials() const { return mSavedGLTFOverrideMaterials; };
void saveGLTFMaterials();
void updateSavedGLTFMaterial(S32 te);
void clearSavedGLTFMaterials();
// </FS>