Fix remaining issues with merge

libraries/baking/src/ModelBaker.cpp

@@ -249,7 +249,7 @@ void ModelBaker::bakeSourceCopy() {
         serializerMapping["combineParts"] = true; // set true so that OBJSerializer reads material info from material library
         hfm::Model::Pointer loadedModel = serializer->read(modelData, serializerMapping, _modelURL);
 
-        baker::Baker baker(loadedModel, serializerMapping);
+        baker::Baker baker(loadedModel, serializerMapping, hifi::URL());
         auto config = baker.getConfiguration();
         // Enable compressed draco mesh generation
         config->getJobConfig("BuildDracoMesh")->setEnabled(true);

libraries/model-baker/src/model-baker/Baker.cpp

@@ -119,12 +119,13 @@ namespace baker {
 
     class BakerEngineBuilder {
     public:
-        using Input = VaryingSet2<hfm::Model::Pointer, hifi::VariantHash>;
+        using Input = VaryingSet3<hfm::Model::Pointer, hifi::VariantHash, hifi::URL>;
         using Output = VaryingSet4<hfm::Model::Pointer, MaterialMapping, std::vector<hifi::ByteArray>, std::vector<std::vector<hifi::ByteArray>>>;
         using JobModel = Task::ModelIO<BakerEngineBuilder, Input, Output>;
         void build(JobModel& model, const Varying& input, Varying& output) {
             const auto& hfmModelIn = input.getN<Input>(0);
             const auto& mapping = input.getN<Input>(1);
+            const auto& materialMappingBaseURL = input.getN<Input>(2);
 
             // Split up the inputs from hfm::Model
             const auto modelPartsIn = model.addJob<GetModelPartsTask>("GetModelParts", hfmModelIn);
@@ -157,7 +158,8 @@ namespace baker {
             const auto jointIndices = jointInfoOut.getN<PrepareJointsTask::Output>(2);
 
             // Parse material mapping
-            const auto materialMapping = model.addJob<ParseMaterialMappingTask>("ParseMaterialMapping", mapping);
+            const auto parseMaterialMappingInputs = ParseMaterialMappingTask::Input(mapping, materialMappingBaseURL).asVarying();
+            const auto materialMapping = model.addJob<ParseMaterialMappingTask>("ParseMaterialMapping", parseMaterialMappingInputs);
 
             // Build Draco meshes
             // NOTE: This task is disabled by default and must be enabled through configuration
@@ -182,10 +184,11 @@ namespace baker {
         }
     };
 
-    Baker::Baker(const hfm::Model::Pointer& hfmModel, const hifi::VariantHash& mapping) :
+    Baker::Baker(const hfm::Model::Pointer& hfmModel, const hifi::VariantHash& mapping, const hifi::URL& materialMappingBaseURL) :
         _engine(std::make_shared<Engine>(BakerEngineBuilder::JobModel::create("Baker"), std::make_shared<BakeContext>())) {
         _engine->feedInput<BakerEngineBuilder::Input>(0, hfmModel);
         _engine->feedInput<BakerEngineBuilder::Input>(1, mapping);
+        _engine->feedInput<BakerEngineBuilder::Input>(2, materialMappingBaseURL);
     }
 
     std::shared_ptr<TaskConfig> Baker::getConfiguration() {

libraries/model-baker/src/model-baker/Baker.h

@@ -23,7 +23,7 @@
 namespace baker {
     class Baker {
     public:
-        Baker(const hfm::Model::Pointer& hfmModel, const hifi::VariantHash& mapping);
+        Baker(const hfm::Model::Pointer& hfmModel, const hifi::VariantHash& mapping, const hifi::URL& materialMappingBaseURL);
 
         std::shared_ptr<TaskConfig> getConfiguration();
 

libraries/model-baker/src/model-baker/BakerTypes.h

@@ -36,7 +36,6 @@ namespace baker {
     using TangentsPerBlendshape = std::vector<std::vector<glm::vec3>>;
 
     using MeshIndicesToModelNames = QHash<int, QString>;
-    using GeometryMappingPair = std::pair<QUrl, QVariantHash>;
 };
 
 #endif // hifi_BakerTypes_h

libraries/model-baker/src/model-baker/ParseMaterialMappingTask.cpp

@@ -11,8 +11,8 @@
 #include "ModelBakerLogging.h"
 
 void ParseMaterialMappingTask::run(const baker::BakeContextPointer& context, const Input& input, Output& output) {
-    const auto& url = input.first;
+    const auto& mapping = input.get0();
-    const auto& mapping = input.second;
+    const auto& url = input.get1();
     MaterialMapping materialMapping;
 
     auto mappingIter = mapping.find("materialMap");

libraries/model-baker/src/model-baker/ParseMaterialMappingTask.h

@@ -13,6 +13,8 @@
 
 #include <hfm/HFM.h>
 
+#include <shared/HifiTypes.h>
+
 #include "Engine.h"
 #include "BakerTypes.h"
 
@@ -20,7 +22,7 @@
 
 class ParseMaterialMappingTask {
 public:
-    using Input = baker::GeometryMappingPair;
+    using Input = baker::VaryingSet2<hifi::VariantHash, hifi::URL>;
     using Output = MaterialMapping;
     using JobModel = baker::Job::ModelIO<ParseMaterialMappingTask, Input, Output>;
 

libraries/model-networking/src/model-networking/ModelCache.cpp

@@ -340,7 +340,7 @@ void GeometryDefinitionResource::downloadFinished(const QByteArray& data) {
 
 void GeometryDefinitionResource::setGeometryDefinition(HFMModel::Pointer hfmModel, const GeometryMappingPair& mapping) {
     // Do processing on the model
-    baker::Baker modelBaker(hfmModel, mapping.second);
+    baker::Baker modelBaker(hfmModel, mapping.second, mapping.first);
     modelBaker.run();
 
     // Assume ownership of the processed HFMModel