From aef696efe6c1a4df3a9af2ff19ee9d6161f4cb40 Mon Sep 17 00:00:00 2001
From: sabrina-shanman <sabrina@highfidelity.io>
Date: Wed, 20 Feb 2019 14:28:44 -0800
Subject: [PATCH] Add passthrough config to PrepareJointsTask

---
 .../src/model-baker/PrepareJointsTask.cpp     | 57 +++++++++++--------
 .../src/model-baker/PrepareJointsTask.h       | 15 ++++-
 2 files changed, 47 insertions(+), 25 deletions(-)

diff --git a/libraries/model-baker/src/model-baker/PrepareJointsTask.cpp b/libraries/model-baker/src/model-baker/PrepareJointsTask.cpp
index 3b1a57cb43..63d0408337 100644
--- a/libraries/model-baker/src/model-baker/PrepareJointsTask.cpp
+++ b/libraries/model-baker/src/model-baker/PrepareJointsTask.cpp
@@ -50,37 +50,46 @@ QMap<QString, glm::quat> getJointRotationOffsets(const QVariantHash& mapping) {
     return jointRotationOffsets;
 }
 
+void PrepareJointsTask::configure(const Config& config) {
+    _passthrough = config.passthrough;
+}
+
 void PrepareJointsTask::run(const baker::BakeContextPointer& context, const Input& input, Output& output) {
     const auto& jointsIn = input.get0();
-    const auto& mapping = input.get1();
     auto& jointsOut = output.edit0();
-    auto& jointRotationOffsets = output.edit1();
-    auto& jointIndices = output.edit2();
 
-    // Get joint renames
-    auto jointNameMapping = getJointNameMapping(mapping);
-    // Apply joint metadata from FST file mappings
-    for (const auto& jointIn : jointsIn) {
-        jointsOut.push_back(jointIn);
-        auto& jointOut = jointsOut.back();
+    if (_passthrough) {
+        jointsOut = jointsIn;
+    } else {
+        const auto& mapping = input.get1();
+        auto& jointRotationOffsets = output.edit1();
+        auto& jointIndices = output.edit2();
 
-        auto jointNameMapKey = jointNameMapping.key(jointIn.name);
-        if (jointNameMapping.contains(jointNameMapKey)) {
-            jointOut.name = jointNameMapKey;
+        // Get joint renames
+        auto jointNameMapping = getJointNameMapping(mapping);
+        // Apply joint metadata from FST file mappings
+        for (const auto& jointIn : jointsIn) {
+            jointsOut.push_back(jointIn);
+            auto& jointOut = jointsOut.back();
+
+            auto jointNameMapKey = jointNameMapping.key(jointIn.name);
+            if (jointNameMapping.contains(jointNameMapKey)) {
+                jointOut.name = jointNameMapKey;
+            }
+
+            jointIndices.insert(jointOut.name, (int)jointsOut.size());
         }
 
-        jointIndices.insert(jointOut.name, (int)jointsOut.size());
-    }
-
-    // Get joint rotation offsets from FST file mappings
-    auto offsets = getJointRotationOffsets(mapping);
-    for (auto itr = offsets.begin(); itr != offsets.end(); itr++) {
-        QString jointName = itr.key();
-        int jointIndex = jointIndices.value(jointName) - 1;
-        if (jointIndex != -1) {
-            glm::quat rotationOffset = itr.value();
-            jointRotationOffsets.insert(jointIndex, rotationOffset);
-            qCDebug(model_baker) << "Joint Rotation Offset added to Rig._jointRotationOffsets : " << " jointName: " << jointName << " jointIndex: " << jointIndex << " rotation offset: " << rotationOffset;
+        // Get joint rotation offsets from FST file mappings
+        auto offsets = getJointRotationOffsets(mapping);
+        for (auto itr = offsets.begin(); itr != offsets.end(); itr++) {
+            QString jointName = itr.key();
+            int jointIndex = jointIndices.value(jointName) - 1;
+            if (jointIndex != -1) {
+                glm::quat rotationOffset = itr.value();
+                jointRotationOffsets.insert(jointIndex, rotationOffset);
+                qCDebug(model_baker) << "Joint Rotation Offset added to Rig._jointRotationOffsets : " << " jointName: " << jointName << " jointIndex: " << jointIndex << " rotation offset: " << rotationOffset;
+            }
         }
     }
 }
diff --git a/libraries/model-baker/src/model-baker/PrepareJointsTask.h b/libraries/model-baker/src/model-baker/PrepareJointsTask.h
index e12d8ffd2c..6185d2fdad 100644
--- a/libraries/model-baker/src/model-baker/PrepareJointsTask.h
+++ b/libraries/model-baker/src/model-baker/PrepareJointsTask.h
@@ -18,13 +18,26 @@
 
 #include "Engine.h"
 
+// The property "passthrough", when enabled, will let the input joints flow to the output unmodified, unlike the disabled property, which discards the data
+class PrepareJointsTaskConfig : public baker::JobConfig {
+    Q_OBJECT
+    Q_PROPERTY(bool passthrough MEMBER passthrough)
+public:
+    bool passthrough { false };
+};
+
 class PrepareJointsTask {
 public:
+    using Config = PrepareJointsTaskConfig;
     using Input = baker::VaryingSet2<std::vector<hfm::Joint>, QVariantHash /*mapping*/>;
     using Output = baker::VaryingSet3<std::vector<hfm::Joint>, QMap<int, glm::quat> /*jointRotationOffsets*/, QHash<QString, int> /*jointIndices*/>;
-    using JobModel = baker::Job::ModelIO<PrepareJointsTask, Input, Output>;
+    using JobModel = baker::Job::ModelIO<PrepareJointsTask, Input, Output, Config>;
 
+    void configure(const Config& config);
     void run(const baker::BakeContextPointer& context, const Input& input, Output& output);
+
+protected:
+    bool _passthrough { false };
 };
 
 #endif // hifi_PrepareJointsTask_h
\ No newline at end of file