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

checkpoint after lazy mtllib reading

Browse source
This commit is contained in:
Howard Stearns 2016-03-15 18:35:59 -07:00
parent 6161aab0c1
commit c9f6b15ac5
1 changed files with 26 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
libraries/fbx/src/OBJReader.cpp
View file

@ -340,25 +340,8 @@ bool OBJReader::parseOBJGroup(OBJTokenizer& tokenizer, const QVariantHash& mappi
break; break;
} }
QByteArray libraryName = tokenizer.getDatum(); QByteArray libraryName = tokenizer.getDatum();
if (librariesSeen.contains(libraryName)) {
break; // Some files use mtllib over and over again for the same libraryName
}
librariesSeen[libraryName] = true; librariesSeen[libraryName] = true;
// Throw away any path part of libraryName, and merge against original url. // We'll read it later only if we actually need it.
QUrl libraryUrl = _url.resolved(QUrl(libraryName).fileName());
#ifdef WANT_DEBUG
qCDebug(modelformat) << "OBJ Reader new library:" << libraryName << " at:" << libraryUrl;
#endif
QNetworkReply* netReply = request(libraryUrl, false);
if (netReply->isFinished() && (netReply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt() == 200)) {
parseMaterialLibrary(netReply);
} else {
#ifdef WANT_DEBUG
qCDebug(modelformat) << "OBJ Reader " << libraryName << " did not answer. Got "
<< netReply->attribute(QNetworkRequest::HttpReasonPhraseAttribute).toString();
#endif
}
netReply->deleteLater();
} else if (token == "usemtl") { } else if (token == "usemtl") {
if (tokenizer.nextToken() != OBJTokenizer::DATUM_TOKEN) { if (tokenizer.nextToken() != OBJTokenizer::DATUM_TOKEN) {
break; break;
@ -519,8 +502,8 @@ FBXGeometry* OBJReader::readOBJ(QByteArray& model, const QVariantHash& mapping,
} }
if (specifiesUV || (0 != groupMaterialName.compare("none", Qt::CaseInsensitive))) { if (specifiesUV || (0 != groupMaterialName.compare("none", Qt::CaseInsensitive))) {
// Blender has a convention that a material named "None" isn't really used (or defined). // Blender has a convention that a material named "None" isn't really used (or defined).
needsMaterialLibrary = groupMaterialName != SMART_DEFAULT_MATERIAL_NAME;
material.used = true; material.used = true;
needsMaterialLibrary = groupMaterialName != SMART_DEFAULT_MATERIAL_NAME;
} }
materials[groupMaterialName] = material; materials[groupMaterialName] = material;
meshPart.materialID = groupMaterialName; meshPart.materialID = groupMaterialName;
@ -548,9 +531,9 @@ FBXGeometry* OBJReader::readOBJ(QByteArray& model, const QVariantHash& mapping,
} }
OBJMaterial& preDefinedMaterial = materials[SMART_DEFAULT_MATERIAL_NAME]; OBJMaterial& preDefinedMaterial = materials[SMART_DEFAULT_MATERIAL_NAME];
// Some .obj files use the convention that a group with uv coordinates that doesn't define a material, should use
// a texture with the same basename as the .obj file.
if (preDefinedMaterial.userSpecifiesUV && !url.isEmpty()) { if (preDefinedMaterial.userSpecifiesUV && !url.isEmpty()) {
// Some .obj files use the convention that a group with uv coordinates that doesn't define a material, should use
// a texture with the same basename as the .obj file.
QString filename = url.fileName(); QString filename = url.fileName();
int extIndex = filename.lastIndexOf('.'); // by construction, this does not fail int extIndex = filename.lastIndexOf('.'); // by construction, this does not fail
QString basename = filename.remove(extIndex + 1, sizeof("obj")); QString basename = filename.remove(extIndex + 1, sizeof("obj"));
@ -574,6 +557,28 @@ FBXGeometry* OBJReader::readOBJ(QByteArray& model, const QVariantHash& mapping,
} }
materials[SMART_DEFAULT_MATERIAL_NAME] = preDefinedMaterial; materials[SMART_DEFAULT_MATERIAL_NAME] = preDefinedMaterial;
} }
if (needsMaterialLibrary) {
foreach (QString libraryName, librariesSeen.keys()) {
// Throw away any path part of libraryName, and merge against original url.
QUrl libraryUrl = _url.resolved(QUrl(libraryName).fileName());
#ifdef WANT_DEBUG
qCDebug(modelformat) << "OBJ Reader material library" << libraryName << "used in" << _url;
#endif
QNetworkReply* netReply = request(libraryUrl, false);
if (netReply->isFinished() &&
(libraryUrl.toString().startsWith("file", Qt::CaseInsensitive) ? // file urls don't have http status codes
netReply->attribute(QNetworkRequest::HttpReasonPhraseAttribute).toString().isEmpty() :
(netReply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt() == 200))) {
parseMaterialLibrary(netReply);
} else {
#ifdef WANT_DEBUG
qCDebug(modelformat) << "OBJ Reader" << libraryName << "did not answer. Got"
<< netReply->attribute(QNetworkRequest::HttpReasonPhraseAttribute).toString();
#endif
}
netReply->deleteLater();
}
}
foreach (QString materialID, materials.keys()) { foreach (QString materialID, materials.keys()) {
OBJMaterial& objMaterial = materials[materialID]; OBJMaterial& objMaterial = materials[materialID];