From bf601dfa6e535865abfa49ff0c0aeb4a1e815a6c Mon Sep 17 00:00:00 2001
From: ksuprynowicz <ksuprynowicz@post.pl>
Date: Tue, 26 Mar 2024 17:40:03 +0100
Subject: [PATCH] Revert "Disabled texture loading for agent"

This reverts commit a0aae43386dc8cf6ca4ea2ab6da141b4d691a5c8.
---
 assignment-client/src/Agent.cpp                           | 2 ++
 assignment-client/src/avatars/ScriptableAvatar.cpp        | 3 +++
 .../model-networking/src/model-networking/ModelCache.cpp  | 8 ++------
 .../procedural/src/procedural/ProceduralMaterialCache.cpp | 8 +-------
 4 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/assignment-client/src/Agent.cpp b/assignment-client/src/Agent.cpp
index 246fd22cbb..3ac8eaaff7 100644
--- a/assignment-client/src/Agent.cpp
+++ b/assignment-client/src/Agent.cpp
@@ -108,6 +108,7 @@ 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();
@@ -848,6 +849,7 @@ 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
index 929cd68f7c..3a3b2cf517 100644
--- a/assignment-client/src/avatars/ScriptableAvatar.cpp
+++ b/assignment-client/src/avatars/ScriptableAvatar.cpp
@@ -143,6 +143,9 @@ 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
index a488098b1b..738c61874f 100644
--- a/libraries/model-networking/src/model-networking/ModelCache.cpp
+++ b/libraries/model-networking/src/model-networking/ModelCache.cpp
@@ -355,12 +355,8 @@ void GeometryResource::deleter() {
 
 void GeometryResource::setTextures() {
     if (_hfmModel) {
-        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";
+        for (const HFMMaterial& material : _hfmModel->materials) {
+            _materials.push_back(std::make_shared<NetworkMaterial>(material, _textureBaseURL));
         }
     }
 }
diff --git a/libraries/procedural/src/procedural/ProceduralMaterialCache.cpp b/libraries/procedural/src/procedural/ProceduralMaterialCache.cpp
index fe5d85d0ef..02ec234266 100644
--- a/libraries/procedural/src/procedural/ProceduralMaterialCache.cpp
+++ b/libraries/procedural/src/procedural/ProceduralMaterialCache.cpp
@@ -865,13 +865,7 @@ graphics::TextureMapPointer NetworkMaterial::fetchTextureMap(const QUrl& baseUrl
     }
 
     const auto url = getTextureUrl(baseUrl, hfmTexture);
-    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";
-    }
+    const auto texture = DependencyManager::get<TextureCache>()->getTexture(url, type, hfmTexture.content, hfmTexture.maxNumPixels, hfmTexture.sourceChannel);
     _textures[channel] = Texture { hfmTexture.name, texture };
 
     auto map = std::make_shared<graphics::TextureMap>();