Merge pull request #893 from overte-org/fix/agent_textures

Fix previous commit for not loading textures on agent
overte-org · Mar 26, 2024 · 36b6010 · 36b6010
2 parents d44ae7a + edb3580
commit 36b6010
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 8 deletions.
diff --git a/assignment-client/src/Agent.cpp b/assignment-client/src/Agent.cpp
@@ -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>();
 

diff --git a/assignment-client/src/avatars/ScriptableAvatar.cpp b/assignment-client/src/avatars/ScriptableAvatar.cpp
@@ -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);
     }

diff --git a/libraries/model-networking/src/model-networking/ModelCache.cpp b/libraries/model-networking/src/model-networking/ModelCache.cpp
@@ -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";
         }
     }
 }

diff --git a/libraries/procedural/src/procedural/ProceduralMaterialCache.cpp b/libraries/procedural/src/procedural/ProceduralMaterialCache.cpp
@@ -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) {
+        texture = 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>();