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

Give the oven model-baker Baker an appropriate materialMappingBaseURL, but disable ParseMaterialMappingTask for now

Browse source
This commit is contained in:
sabrina-shanman 2019-03-13 14:50:50 -07:00
parent b855b0e2a3
commit 32d5f7135f
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
libraries/baking/src/ModelBaker.cpp
View file

@ -249,12 +249,15 @@ void ModelBaker::bakeSourceCopy() {
serializerMapping["combineParts"] = true; // set true so that OBJSerializer reads material info from material library serializerMapping["combineParts"] = true; // set true so that OBJSerializer reads material info from material library
hfm::Model::Pointer loadedModel = serializer->read(modelData, serializerMapping, _modelURL); hfm::Model::Pointer loadedModel = serializer->read(modelData, serializerMapping, _modelURL);
baker::Baker baker(loadedModel, serializerMapping, hifi::URL()); baker::Baker baker(loadedModel, serializerMapping, _mappingURL);
auto config = baker.getConfiguration(); auto config = baker.getConfiguration();
// Enable compressed draco mesh generation // Enable compressed draco mesh generation
config->getJobConfig("BuildDracoMesh")->setEnabled(true); config->getJobConfig("BuildDracoMesh")->setEnabled(true);
// Do not permit potentially lossy modification of joint data meant for runtime // Do not permit potentially lossy modification of joint data meant for runtime
((PrepareJointsConfig*)config->getJobConfig("PrepareJoints"))->passthrough = true; ((PrepareJointsConfig*)config->getJobConfig("PrepareJoints"))->passthrough = true;
// The resources parsed from this job will not be used for now
// TODO: Proper full baking of all materials for a model
config->getJobConfig("ParseMaterialMapping")->setEnabled(false);
// Begin hfm baking // Begin hfm baking
baker.run(); baker.run();