Mirrors/overte-AleziaKurdis
3
0
Fork 0
mirror of https://github.com/AleziaKurdis/overte.git synced 2025-04-08 19:32:15 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove unused alternate read functions in FBXSerializer

Browse source
This commit is contained in:
sabrina-shanman 2018-11-09 10:52:45 -08:00
parent f971294d6d
commit 8e0fb0f9c4
2 changed files with 2 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
libraries/fbx/src/FBXSerializer.cpp
View file

@ -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<QByteArray*>(&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()));
}

5
libraries/fbx/src/FBXSerializer.h
View file

@ -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);