History

Re-name FBXGeometry to HFMGeometry and do the same for related classes

sabrina-shanman committed 8 years ago

Commit becee7f1 parent e01401252 files · +578 −578Browse files

Showing the changes to interface/src/ModelPackager.cpp (1 of 52 files). Show all

Unified · Split

interface/src/ModelPackager.cpp+2−2
@@ -235,7 +235,7 @@ bool ModelPackager::zipModel() { · 234 unmodified lines
235 return true;235 return true;
236}236}
237 237
238void ModelPackager::populateBasicMapping(QVariantHash& mapping, QString filename, const FBXGeometry& geometry) {238void ModelPackager::populateBasicMapping(QVariantHash& mapping, QString filename, const HFMGeometry& geometry) {
239 239
240 bool isBodyType = _modelType == FSTReader::BODY_ONLY_MODEL || _modelType == FSTReader::HEAD_AND_BODY_MODEL;240 bool isBodyType = _modelType == FSTReader::BODY_ONLY_MODEL || _modelType == FSTReader::HEAD_AND_BODY_MODEL;
241 241
@@ -370,7 +370,7 @@ void ModelPackager::populateBasicMapping(QVariantHash& mapping, QString filename · 128 unmodified lines
370 370
371void ModelPackager::listTextures() {371void ModelPackager::listTextures() {
372 _textures.clear();372 _textures.clear();
373 foreach (const FBXMaterial mat, _geometry->materials) {373 foreach (const HFMMaterial mat, _geometry->materials) {
374 if (!mat.albedoTexture.filename.isEmpty() && mat.albedoTexture.content.isEmpty() &&374 if (!mat.albedoTexture.filename.isEmpty() && mat.albedoTexture.content.isEmpty() &&
375 !_textures.contains(mat.albedoTexture.filename)) {375 !_textures.contains(mat.albedoTexture.filename)) {
376 _textures << mat.albedoTexture.filename;376 _textures << mat.albedoTexture.filename;