Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 23:40:11 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Use hifi types consistently in model-baker

Browse source
This commit is contained in:
sabrina-shanman 2019-02-21 16:10:40 -08:00
parent 168e47aa62
commit 82382fe9a1
4 changed files with 8 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libraries/model-baker/src/model-baker/Baker.cpp
View file

@ -11,8 +11,6 @@
#include "Baker.h" #include "Baker.h"
#include <shared/HifiTypes.h>
#include "BakerTypes.h" #include "BakerTypes.h"
#include "ModelMath.h" #include "ModelMath.h"
#include "BuildGraphicsMeshTask.h" #include "BuildGraphicsMeshTask.h"
@ -118,7 +116,7 @@ namespace baker {
class BakerEngineBuilder { class BakerEngineBuilder {
public: public:
using Input = VaryingSet2<hfm::Model::Pointer, QVariantHash>; using Input = VaryingSet2<hfm::Model::Pointer, hifi::VariantHash>;
using Output = VaryingSet2<hfm::Model::Pointer, MaterialMapping>; using Output = VaryingSet2<hfm::Model::Pointer, MaterialMapping>;
using JobModel = Task::ModelIO<BakerEngineBuilder, Input, Output>; using JobModel = Task::ModelIO<BakerEngineBuilder, Input, Output>;
void build(JobModel& model, const Varying& input, Varying& output) { void build(JobModel& model, const Varying& input, Varying& output) {
@ -170,7 +168,7 @@ namespace baker {
} }
}; };
Baker::Baker(const hfm::Model::Pointer& hfmModel, const QVariantHash& mapping) : Baker::Baker(const hfm::Model::Pointer& hfmModel, const hifi::VariantHash& mapping) :
_engine(std::make_shared<Engine>(BakerEngineBuilder::JobModel::create("Baker"), std::make_shared<BakeContext>())) { _engine(std::make_shared<Engine>(BakerEngineBuilder::JobModel::create("Baker"), std::make_shared<BakeContext>())) {
_engine->feedInput<BakerEngineBuilder::Input>(0, hfmModel); _engine->feedInput<BakerEngineBuilder::Input>(0, hfmModel);
_engine->feedInput<BakerEngineBuilder::Input>(1, mapping); _engine->feedInput<BakerEngineBuilder::Input>(1, mapping);

6
libraries/model-baker/src/model-baker/Baker.h
View file

@ -12,8 +12,7 @@
#ifndef hifi_baker_Baker_h #ifndef hifi_baker_Baker_h
#define hifi_baker_Baker_h #define hifi_baker_Baker_h
#include <QMap> #include <shared/HifiTypes.h>
#include <hfm/HFM.h> #include <hfm/HFM.h>
#include "Engine.h" #include "Engine.h"
@ -23,7 +22,7 @@
namespace baker { namespace baker {
class Baker { class Baker {
public: public:
Baker(const hfm::Model::Pointer& hfmModel, const QVariantHash& mapping); Baker(const hfm::Model::Pointer& hfmModel, const hifi::VariantHash& mapping);
void run(); void run();
@ -34,7 +33,6 @@ namespace baker {
protected: protected:
EnginePointer _engine; EnginePointer _engine;
}; };
}; };
#endif //hifi_baker_Baker_h #endif //hifi_baker_Baker_h

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

@ -13,7 +13,7 @@
#include "ModelBakerLogging.h" #include "ModelBakerLogging.h"
QMap<QString, QString> getJointNameMapping(const QVariantHash& mapping) { QMap<QString, QString> getJointNameMapping(const hifi::VariantHash& mapping) {
static const QString JOINT_NAME_MAPPING_FIELD = "jointMap"; static const QString JOINT_NAME_MAPPING_FIELD = "jointMap";
QMap<QString, QString> hfmToHifiJointNameMap; QMap<QString, QString> hfmToHifiJointNameMap;
if (!mapping.isEmpty() && mapping.contains(JOINT_NAME_MAPPING_FIELD) && mapping[JOINT_NAME_MAPPING_FIELD].type() == QVariant::Hash) { if (!mapping.isEmpty() && mapping.contains(JOINT_NAME_MAPPING_FIELD) && mapping[JOINT_NAME_MAPPING_FIELD].type() == QVariant::Hash) {
@ -26,7 +26,7 @@ QMap<QString, QString> getJointNameMapping(const QVariantHash& mapping) {
return hfmToHifiJointNameMap; return hfmToHifiJointNameMap;
} }
QMap<QString, glm::quat> getJointRotationOffsets(const QVariantHash& mapping) { QMap<QString, glm::quat> getJointRotationOffsets(const hifi::VariantHash& mapping) {
QMap<QString, glm::quat> jointRotationOffsets; QMap<QString, glm::quat> jointRotationOffsets;
static const QString JOINT_ROTATION_OFFSET_FIELD = "jointRotationOffset"; static const QString JOINT_ROTATION_OFFSET_FIELD = "jointRotationOffset";
if (!mapping.isEmpty() && mapping.contains(JOINT_ROTATION_OFFSET_FIELD) && mapping[JOINT_ROTATION_OFFSET_FIELD].type() == QVariant::Hash) { if (!mapping.isEmpty() && mapping.contains(JOINT_ROTATION_OFFSET_FIELD) && mapping[JOINT_ROTATION_OFFSET_FIELD].type() == QVariant::Hash) {

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

@ -12,8 +12,7 @@
#ifndef hifi_PrepareJointsTask_h #ifndef hifi_PrepareJointsTask_h
#define hifi_PrepareJointsTask_h #define hifi_PrepareJointsTask_h
#include <QHash> #include <shared/HifiTypes.h>
#include <hfm/HFM.h> #include <hfm/HFM.h>
#include "Engine.h" #include "Engine.h"
@ -29,7 +28,7 @@ public:
class PrepareJointsTask { class PrepareJointsTask {
public: public:
using Config = PrepareJointsTaskConfig; using Config = PrepareJointsTaskConfig;
using Input = baker::VaryingSet2<std::vector<hfm::Joint>, QVariantHash /*mapping*/>; using Input = baker::VaryingSet2<std::vector<hfm::Joint>, hifi::VariantHash /*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, Config>; using JobModel = baker::Job::ModelIO<PrepareJointsTask, Input, Output, Config>;