From 1da5c221ac19b973f3232c5d3b266ee3d0e3c94c Mon Sep 17 00:00:00 2001 From: luiscuenca Date: Tue, 10 Oct 2017 13:53:18 -0700 Subject: [PATCH] ModelCache.cpp to coding standard --- .../src/model-networking/ModelCache.cpp | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/libraries/model-networking/src/model-networking/ModelCache.cpp b/libraries/model-networking/src/model-networking/ModelCache.cpp index 93b12f09fe..56862957de 100644 --- a/libraries/model-networking/src/model-networking/ModelCache.cpp +++ b/libraries/model-networking/src/model-networking/ModelCache.cpp @@ -189,28 +189,23 @@ void GeometryReader::run() { if (fbxGeometry->meshes.size() == 0 && fbxGeometry->joints.size() == 0) { throw QString("empty geometry, possibly due to an unsupported FBX version"); } - } - else if (_url.path().toLower().endsWith(".obj")) { + } else if (_url.path().toLower().endsWith(".obj")) { fbxGeometry.reset(OBJReader().readOBJ(_data, _mapping, _combineParts, _url)); - } - else if (_url.path().toLower().endsWith(".obj.gz")) { + } else if (_url.path().toLower().endsWith(".obj.gz")) { QByteArray uncompressedData; if (gunzip(_data, uncompressedData)) { fbxGeometry.reset(OBJReader().readOBJ(uncompressedData, _mapping, _combineParts, _url)); - } - else { + } else { throw QString("failed to decompress .obj.gz"); } - } - else if (_url.path().toLower().endsWith(".gltf")) { + } else if (_url.path().toLower().endsWith(".gltf")) { std::shared_ptr glreader = std::make_shared(); fbxGeometry.reset(glreader->readGLTF(_data, _mapping, _url)); if (fbxGeometry->meshes.size() == 0 && fbxGeometry->joints.size() == 0) { throw QString("empty geometry, possibly due to an unsupported GLTF version"); } - } - else { + } else { throw QString("unsupported format"); }