Mirrors/overte-thingvellir
3
0
Fork 0
mirror of https://thingvellir.net/git/overte synced 2025-03-27 23:52:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Reapply "Disabled texture loading for agent"

Browse source 
This reverts commit bf601dfa6e.
This commit is contained in:
ksuprynowicz 2024-03-26 21:06:11 +01:00
parent d44ae7a961
commit 65387adee8
4 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
assignment-client/src/Agent.cpp
View file

@ -108,7 +108,6 @@ Agent::Agent(ReceivedMessage& message) :
DependencyManager::set<ModelFormatRegistry>();
DependencyManager::set<ModelCache>();
DependencyManager::set<TextureCache>();
// Needed to ensure the creation of the DebugDraw instance on the main thread
DebugDraw::getInstance();
@ -849,7 +848,6 @@ void Agent::aboutToFinish() {
DependencyManager::destroy<ModelFormatRegistry>();
DependencyManager::destroy<ModelCache>();
DependencyManager::destroy<TextureCache>();
DependencyManager::destroy<PluginManager>();

3
assignment-client/src/avatars/ScriptableAvatar.cpp
View file

@ -143,9 +143,6 @@ static AnimPose composeAnimPose(const HFMJoint& joint, const glm::quat rotation,
}
void ScriptableAvatar::update(float deltatime) {
// TODO: the current decision to use geometry resource results in loading textures, but it works way better
// than previous choice of loading avatar as animation, which was missing data such as joint names hash,
// and also didn't support glTF models. Optimizing this will be left fot future PR.
if (!_geometryResource && !_skeletonModelFilenameURL.isEmpty()) { // AvatarData will parse the .fst, but not get the .fbx skeleton.
_geometryResource = DependencyManager::get<ModelCache>()->getGeometryResource(_skeletonModelFilenameURL);
}

8
libraries/model-networking/src/model-networking/ModelCache.cpp
View file

@ -355,8 +355,12 @@ void GeometryResource::deleter() {
void GeometryResource::setTextures() {
if (_hfmModel) {
for (const HFMMaterial& material : _hfmModel->materials) {
_materials.push_back(std::make_shared<NetworkMaterial>(material, _textureBaseURL));
if (DependencyManager::get<TextureCache>()) {
for (const HFMMaterial& material : _hfmModel->materials) {
_materials.push_back(std::make_shared<NetworkMaterial>(material, _textureBaseURL));
}
} else {
qDebug() << "GeometryResource::setTextures: TextureCache dependency not available, skipping textures";
}
}
}

8
libraries/procedural/src/procedural/ProceduralMaterialCache.cpp
View file

@ -865,7 +865,13 @@ graphics::TextureMapPointer NetworkMaterial::fetchTextureMap(const QUrl& baseUrl
}
const auto url = getTextureUrl(baseUrl, hfmTexture);
const auto texture = DependencyManager::get<TextureCache>()->getTexture(url, type, hfmTexture.content, hfmTexture.maxNumPixels, hfmTexture.sourceChannel);
auto textureCache = DependencyManager::get<TextureCache>();
NetworkTexturePointer texture;
if (textureCache) {
textureCache->getTexture(url, type, hfmTexture.content, hfmTexture.maxNumPixels, hfmTexture.sourceChannel);
} else {
qDebug() << "GeometryResource::setTextures: TextureCache dependency not available, skipping textures";
}
_textures[channel] = Texture { hfmTexture.name, texture };
auto map = std::make_shared<graphics::TextureMap>();