From 8e0fb0f9c440c378b1456d8b60bc850c2eb90114 Mon Sep 17 00:00:00 2001 From: sabrina-shanman Date: Fri, 9 Nov 2018 10:52:45 -0800 Subject: [PATCH] Remove unused alternate read functions in FBXSerializer --- libraries/fbx/src/FBXSerializer.cpp | 11 ++--------- libraries/fbx/src/FBXSerializer.h | 5 ----- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/libraries/fbx/src/FBXSerializer.cpp b/libraries/fbx/src/FBXSerializer.cpp index c5c0b94f9b..9f5867feda 100644 --- a/libraries/fbx/src/FBXSerializer.cpp +++ b/libraries/fbx/src/FBXSerializer.cpp @@ -1799,17 +1799,10 @@ HFMModel* FBXSerializer::extractHFMModel(const QVariantHash& mapping, const QStr HFMModel::Pointer FBXSerializer::read(const QByteArray& data, const QVariantHash& mapping, const QUrl& url) { QBuffer buffer(const_cast(&data)); buffer.open(QIODevice::ReadOnly); - return HFMModel::Pointer(read(&buffer, mapping, url)); -} -HFMModel* FBXSerializer::read(QIODevice* device, const QVariantHash& mapping, const QUrl& url) { - _rootNode = parseFBX(device); + _rootNode = parseFBX(&buffer); qCDebug(modelformat) << "Reading FBX: " << url; - return extractHFMModel(mapping, url.toString()); -} - -HFMModel* readFBX(QIODevice* device, const QVariantHash& mapping, const QString& url, bool loadLightmaps, float lightmapLevel) { - return FBXSerializer().extractHFMModel(mapping, url); + return HFMModel::Pointer(extractHFMModel(mapping, url.toString())); } diff --git a/libraries/fbx/src/FBXSerializer.h b/libraries/fbx/src/FBXSerializer.h index 89f815ec1e..c69f75cc5c 100644 --- a/libraries/fbx/src/FBXSerializer.h +++ b/libraries/fbx/src/FBXSerializer.h @@ -35,10 +35,6 @@ class QIODevice; class FBXNode; -/// Reads HFMModel from the supplied model and mapping data. -/// \exception QString if an error occurs in parsing -HFMModel* readFBX(QIODevice* device, const QVariantHash& mapping, const QString& url = "", bool loadLightmaps = true, float lightmapLevel = 1.0f); - class TextureParam { public: glm::vec2 UVTranslation; @@ -104,7 +100,6 @@ public: /// Reads HFMModel from the supplied model and mapping data. /// \exception QString if an error occurs in parsing HFMModel::Pointer read(const QByteArray& data, const QVariantHash& mapping, const QUrl& url = QUrl()) override; - HFMModel* read(QIODevice* device, const QVariantHash& mapping, const QUrl& url = QUrl()); FBXNode _rootNode; static FBXNode parseFBX(QIODevice* device);