Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-29 20:42:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add passthrough config to PrepareJointsTask

Browse source
This commit is contained in:
sabrina-shanman 2019-02-20 14:28:44 -08:00
parent 9c9dc553a2
commit aef696efe6
2 changed files with 47 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
libraries/model-baker/src/model-baker/PrepareJointsTask.cpp
View file

@ -50,10 +50,18 @@ QMap<QString, glm::quat> getJointRotationOffsets(const QVariantHash& mapping) {
return jointRotationOffsets; return jointRotationOffsets;
} }
void PrepareJointsTask::configure(const Config& config) {
_passthrough = config.passthrough;
}
void PrepareJointsTask::run(const baker::BakeContextPointer& context, const Input& input, Output& output) { void PrepareJointsTask::run(const baker::BakeContextPointer& context, const Input& input, Output& output) {
const auto& jointsIn = input.get0(); const auto& jointsIn = input.get0();
const auto& mapping = input.get1();
auto& jointsOut = output.edit0(); auto& jointsOut = output.edit0();
if (_passthrough) {
jointsOut = jointsIn;
} else {
const auto& mapping = input.get1();
auto& jointRotationOffsets = output.edit1(); auto& jointRotationOffsets = output.edit1();
auto& jointIndices = output.edit2(); auto& jointIndices = output.edit2();
@ -83,4 +91,5 @@ void PrepareJointsTask::run(const baker::BakeContextPointer& context, const Inpu
qCDebug(model_baker) << "Joint Rotation Offset added to Rig._jointRotationOffsets : " << " jointName: " << jointName << " jointIndex: " << jointIndex << " rotation offset: " << rotationOffset; qCDebug(model_baker) << "Joint Rotation Offset added to Rig._jointRotationOffsets : " << " jointName: " << jointName << " jointIndex: " << jointIndex << " rotation offset: " << rotationOffset;
} }
} }
}
} }

15
libraries/model-baker/src/model-baker/PrepareJointsTask.h
View file

@ -18,13 +18,26 @@
#include "Engine.h" #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 { class PrepareJointsTask {
public: public:
using Config = PrepareJointsTaskConfig;
using Input = baker::VaryingSet2<std::vector<hfm::Joint>, QVariantHash /*mapping*/>; 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 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); void run(const baker::BakeContextPointer& context, const Input& input, Output& output);
protected:
bool _passthrough { false };
}; };
#endif // hifi_PrepareJointsTask_h #endif // hifi_PrepareJointsTask_h