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

Convert hfmModel and materialMapping fields in model-baker Baker to getters

Browse source
This commit is contained in:
sabrina-shanman 2019-02-21 16:03:45 -08:00
parent 612cf43c43
commit 86c948f116
3 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -178,8 +178,13 @@ namespace baker {
void Baker::run() {
_engine->run();
hfmModel = _engine->getOutput().get<BakerEngineBuilder::Output>().get0();
materialMapping = _engine->getOutput().get<BakerEngineBuilder::Output>().get1();
}
hfm::Model::Pointer Baker::getHFMModel() const {
return _engine->getOutput().get<BakerEngineBuilder::Output>().get0();
}
MaterialMapping Baker::getMaterialMapping() const {
return _engine->getOutput().get<BakerEngineBuilder::Output>().get1();
}
};

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

@ -28,8 +28,8 @@ namespace baker {
void run();
// Outputs, available after run() is called
hfm::Model::Pointer hfmModel;
MaterialMapping materialMapping;
hfm::Model::Pointer getHFMModel() const;
MaterialMapping getMaterialMapping() const;
protected:
EnginePointer _engine;

4
libraries/model-networking/src/model-networking/ModelCache.cpp
View file

@ -341,8 +341,8 @@ void GeometryDefinitionResource::setGeometryDefinition(HFMModel::Pointer hfmMode
modelBaker.run();
// Assume ownership of the processed HFMModel
_hfmModel = modelBaker.hfmModel;
_materialMapping = modelBaker.materialMapping;
_hfmModel = modelBaker.getHFMModel();
_materialMapping = modelBaker.getMaterialMapping();
// Copy materials
QHash<QString, size_t> materialIDAtlas;