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

Merge pull request #14626 from luiscuenca/gltfEmbeddedBinCrashFix

Browse source 
Case 20391: Fix crash when importing a glTF model that contains embedded buffers
This commit is contained in:
Adam Smith 2018-12-20 16:55:37 -08:00 committed by GitHub
commit 3c89d51994
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 30 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

60
libraries/fbx/src/GLTFSerializer.cpp
View file

@ -533,14 +533,13 @@ bool GLTFSerializer::parseGLTF(const QByteArray& data) {
QJsonDocument d = QJsonDocument::fromJson(data); QJsonDocument d = QJsonDocument::fromJson(data);
QJsonObject jsFile = d.object(); QJsonObject jsFile = d.object();
bool success = setAsset(jsFile);
bool isvalid = setAsset(jsFile); if (success) {
if (isvalid) {
QJsonArray accessors; QJsonArray accessors;
if (getObjectArrayVal(jsFile, "accessors", accessors, _file.defined)) { if (getObjectArrayVal(jsFile, "accessors", accessors, _file.defined)) {
foreach(const QJsonValue & accVal, accessors) { foreach(const QJsonValue & accVal, accessors) {
if (accVal.isObject()) { if (accVal.isObject()) {
addAccessor(accVal.toObject()); success = success && addAccessor(accVal.toObject());
} }
} }
} }
@ -549,7 +548,7 @@ bool GLTFSerializer::parseGLTF(const QByteArray& data) {
if (getObjectArrayVal(jsFile, "animations", animations, _file.defined)) { if (getObjectArrayVal(jsFile, "animations", animations, _file.defined)) {
foreach(const QJsonValue & animVal, accessors) { foreach(const QJsonValue & animVal, accessors) {
if (animVal.isObject()) { if (animVal.isObject()) {
addAnimation(animVal.toObject()); success = success && addAnimation(animVal.toObject());
} }
} }
} }
@ -558,7 +557,7 @@ bool GLTFSerializer::parseGLTF(const QByteArray& data) {
if (getObjectArrayVal(jsFile, "bufferViews", bufferViews, _file.defined)) { if (getObjectArrayVal(jsFile, "bufferViews", bufferViews, _file.defined)) {
foreach(const QJsonValue & bufviewVal, bufferViews) { foreach(const QJsonValue & bufviewVal, bufferViews) {
if (bufviewVal.isObject()) { if (bufviewVal.isObject()) {
addBufferView(bufviewVal.toObject()); success = success && addBufferView(bufviewVal.toObject());
} }
} }
} }
@ -567,7 +566,7 @@ bool GLTFSerializer::parseGLTF(const QByteArray& data) {
if (getObjectArrayVal(jsFile, "buffers", buffers, _file.defined)) { if (getObjectArrayVal(jsFile, "buffers", buffers, _file.defined)) {
foreach(const QJsonValue & bufVal, buffers) { foreach(const QJsonValue & bufVal, buffers) {
if (bufVal.isObject()) { if (bufVal.isObject()) {
addBuffer(bufVal.toObject()); success = success && addBuffer(bufVal.toObject());
} }
} }
} }
@ -576,7 +575,7 @@ bool GLTFSerializer::parseGLTF(const QByteArray& data) {
if (getObjectArrayVal(jsFile, "cameras", cameras, _file.defined)) { if (getObjectArrayVal(jsFile, "cameras", cameras, _file.defined)) {
foreach(const QJsonValue & camVal, cameras) { foreach(const QJsonValue & camVal, cameras) {
if (camVal.isObject()) { if (camVal.isObject()) {
addCamera(camVal.toObject()); success = success && addCamera(camVal.toObject());
} }
} }
} }
@ -585,7 +584,7 @@ bool GLTFSerializer::parseGLTF(const QByteArray& data) {
if (getObjectArrayVal(jsFile, "images", images, _file.defined)) { if (getObjectArrayVal(jsFile, "images", images, _file.defined)) {
foreach(const QJsonValue & imgVal, images) { foreach(const QJsonValue & imgVal, images) {
if (imgVal.isObject()) { if (imgVal.isObject()) {
addImage(imgVal.toObject()); success = success && addImage(imgVal.toObject());
} }
} }
} }
@ -594,7 +593,7 @@ bool GLTFSerializer::parseGLTF(const QByteArray& data) {
if (getObjectArrayVal(jsFile, "materials", materials, _file.defined)) { if (getObjectArrayVal(jsFile, "materials", materials, _file.defined)) {
foreach(const QJsonValue & matVal, materials) { foreach(const QJsonValue & matVal, materials) {
if (matVal.isObject()) { if (matVal.isObject()) {
addMaterial(matVal.toObject()); success = success && addMaterial(matVal.toObject());
} }
} }
} }
@ -603,7 +602,7 @@ bool GLTFSerializer::parseGLTF(const QByteArray& data) {
if (getObjectArrayVal(jsFile, "meshes", meshes, _file.defined)) { if (getObjectArrayVal(jsFile, "meshes", meshes, _file.defined)) {
foreach(const QJsonValue & meshVal, meshes) { foreach(const QJsonValue & meshVal, meshes) {
if (meshVal.isObject()) { if (meshVal.isObject()) {
addMesh(meshVal.toObject()); success = success && addMesh(meshVal.toObject());
} }
} }
} }
@ -612,7 +611,7 @@ bool GLTFSerializer::parseGLTF(const QByteArray& data) {
if (getObjectArrayVal(jsFile, "nodes", nodes, _file.defined)) { if (getObjectArrayVal(jsFile, "nodes", nodes, _file.defined)) {
foreach(const QJsonValue & nodeVal, nodes) { foreach(const QJsonValue & nodeVal, nodes) {
if (nodeVal.isObject()) { if (nodeVal.isObject()) {
addNode(nodeVal.toObject()); success = success && addNode(nodeVal.toObject());
} }
} }
} }
@ -621,7 +620,7 @@ bool GLTFSerializer::parseGLTF(const QByteArray& data) {
if (getObjectArrayVal(jsFile, "samplers", samplers, _file.defined)) { if (getObjectArrayVal(jsFile, "samplers", samplers, _file.defined)) {
foreach(const QJsonValue & samVal, samplers) { foreach(const QJsonValue & samVal, samplers) {
if (samVal.isObject()) { if (samVal.isObject()) {
addSampler(samVal.toObject()); success = success && addSampler(samVal.toObject());
} }
} }
} }
@ -630,7 +629,7 @@ bool GLTFSerializer::parseGLTF(const QByteArray& data) {
if (getObjectArrayVal(jsFile, "scenes", scenes, _file.defined)) { if (getObjectArrayVal(jsFile, "scenes", scenes, _file.defined)) {
foreach(const QJsonValue & sceneVal, scenes) { foreach(const QJsonValue & sceneVal, scenes) {
if (sceneVal.isObject()) { if (sceneVal.isObject()) {
addScene(sceneVal.toObject()); success = success && addScene(sceneVal.toObject());
} }
} }
} }
@ -639,7 +638,7 @@ bool GLTFSerializer::parseGLTF(const QByteArray& data) {
if (getObjectArrayVal(jsFile, "skins", skins, _file.defined)) { if (getObjectArrayVal(jsFile, "skins", skins, _file.defined)) {
foreach(const QJsonValue & skinVal, skins) { foreach(const QJsonValue & skinVal, skins) {
if (skinVal.isObject()) { if (skinVal.isObject()) {
addSkin(skinVal.toObject()); success = success && addSkin(skinVal.toObject());
} }
} }
} }
@ -648,15 +647,12 @@ bool GLTFSerializer::parseGLTF(const QByteArray& data) {
if (getObjectArrayVal(jsFile, "textures", textures, _file.defined)) { if (getObjectArrayVal(jsFile, "textures", textures, _file.defined)) {
foreach(const QJsonValue & texVal, textures) { foreach(const QJsonValue & texVal, textures) {
if (texVal.isObject()) { if (texVal.isObject()) {
addTexture(texVal.toObject()); success = success && addTexture(texVal.toObject());
} }
} }
} }
} else { }
qCDebug(modelformat) << "Error parsing GLTF file."; return success;
return false;
}
return true;
} }
glm::mat4 GLTFSerializer::getModelTransform(const GLTFNode& node) { glm::mat4 GLTFSerializer::getModelTransform(const GLTFNode& node) {
@ -927,16 +923,20 @@ HFMModel::Pointer GLTFSerializer::read(const QByteArray& data, const QVariantHas
_url = QUrl(QFileInfo(localFileName).absoluteFilePath()); _url = QUrl(QFileInfo(localFileName).absoluteFilePath());
} }
parseGLTF(data); if (parseGLTF(data)) {
//_file.dump(); //_file.dump();
auto hfmModelPtr = std::make_shared<HFMModel>(); auto hfmModelPtr = std::make_shared<HFMModel>();
HFMModel& hfmModel = *hfmModelPtr; HFMModel& hfmModel = *hfmModelPtr;
buildGeometry(hfmModel, _url); buildGeometry(hfmModel, _url);
//hfmDebugDump(data); //hfmDebugDump(data);
return hfmModelPtr; return hfmModelPtr;
} else {
qCDebug(modelformat) << "Error parsing GLTF file.";
}
return nullptr;
} }
bool GLTFSerializer::readBinary(const QString& url, QByteArray& outdata) { bool GLTFSerializer::readBinary(const QString& url, QByteArray& outdata) {