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

pass URLs to readFBX, not just URL path

Browse source
This commit is contained in:
Stephen Birarda 2017-04-04 14:32:30 -07:00
parent 4e07a6a865
commit 0a7100e2d8
3 changed files with 12 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
libraries/fbx/src/FBXReader.cpp
View file

@ -443,7 +443,7 @@ FBXLight extractLight(const FBXNode& object) {
return light; return light;
} }
QByteArray fixedTextureFilepath(QByteArray fbxRelativeFilepath, const QString& urlString) { QByteArray fixedTextureFilepath(QByteArray fbxRelativeFilepath, QUrl url) {
// first setup a QFileInfo for the passed relative filepath // first setup a QFileInfo for the passed relative filepath
auto fileInfo = QFileInfo { fbxRelativeFilepath }; auto fileInfo = QFileInfo { fbxRelativeFilepath };
@ -455,15 +455,14 @@ QByteArray fixedTextureFilepath(QByteArray fbxRelativeFilepath, const QString& u
// the RelativeFilename pulled from the FBX is an absolute path // the RelativeFilename pulled from the FBX is an absolute path
// use the URL to figure out where the FBX is being loaded from // use the URL to figure out where the FBX is being loaded from
auto url = QUrl { urlString };
auto filename = fileInfo.fileName(); auto filename = fileInfo.fileName();
if (url.scheme() == "file") { if (url.isLocalFile()) {
// the FBX is being loaded from the local filesystem // the FBX is being loaded from the local filesystem
// in order to match the behaviour with a local FBX, first check if a file with this filename // in order to match the behaviour with a local FBX, first check if a file with this filename
// is right beside the FBX // is right beside the FBX
QFileInfo fileBesideFBX { QFileInfo(urlString).path() + "/" + filename }; QFileInfo fileBesideFBX { QFileInfo(url.toLocalFile()).path() + "/" + filename };
if (fileBesideFBX.exists() && fileBesideFBX.isFile()) { if (fileBesideFBX.exists() && fileBesideFBX.isFile()) {
// we found a file that matches right beside the FBX, return just the filename as the relative path // we found a file that matches right beside the FBX, return just the filename as the relative path
@ -480,7 +479,7 @@ QByteArray fixedTextureFilepath(QByteArray fbxRelativeFilepath, const QString& u
} }
} }
FBXGeometry* FBXReader::extractFBXGeometry(const QVariantHash& mapping, const QString& url) { FBXGeometry* FBXReader::extractFBXGeometry(const QVariantHash& mapping, const QUrl& url) {
const FBXNode& node = _fbxNode; const FBXNode& node = _fbxNode;
QMap<QString, ExtractedMesh> meshes; QMap<QString, ExtractedMesh> meshes;
QHash<QString, QString> modelIDsToNames; QHash<QString, QString> modelIDsToNames;
@ -1839,13 +1838,13 @@ FBXGeometry* FBXReader::extractFBXGeometry(const QVariantHash& mapping, const QS
return geometryPtr; return geometryPtr;
} }
FBXGeometry* readFBX(const QByteArray& model, const QVariantHash& mapping, const QString& url, bool loadLightmaps, float lightmapLevel) { FBXGeometry* readFBX(const QByteArray& model, const QVariantHash& mapping, const QUrl& url, bool loadLightmaps, float lightmapLevel) {
QBuffer buffer(const_cast<QByteArray*>(&model)); QBuffer buffer(const_cast<QByteArray*>(&model));
buffer.open(QIODevice::ReadOnly); buffer.open(QIODevice::ReadOnly);
return readFBX(&buffer, mapping, url, loadLightmaps, lightmapLevel); return readFBX(&buffer, mapping, url, loadLightmaps, lightmapLevel);
} }
FBXGeometry* readFBX(QIODevice* device, const QVariantHash& mapping, const QString& url, bool loadLightmaps, float lightmapLevel) { FBXGeometry* readFBX(QIODevice* device, const QVariantHash& mapping, const QUrl& url, bool loadLightmaps, float lightmapLevel) {
FBXReader reader; FBXReader reader;
reader._fbxNode = FBXReader::parseFBX(device); reader._fbxNode = FBXReader::parseFBX(device);
reader._loadLightmaps = loadLightmaps; reader._loadLightmaps = loadLightmaps;

10
libraries/fbx/src/FBXReader.h
View file

@ -268,7 +268,7 @@ class FBXGeometry {
public: public:
using Pointer = std::shared_ptr<FBXGeometry>; using Pointer = std::shared_ptr<FBXGeometry>;
QString originalURL; QUrl originalURL;
QString author; QString author;
QString applicationName; ///< the name of the application that generated the model QString applicationName; ///< the name of the application that generated the model
@ -330,11 +330,11 @@ Q_DECLARE_METATYPE(FBXGeometry::Pointer)
/// Reads FBX geometry from the supplied model and mapping data. /// Reads FBX geometry from the supplied model and mapping data.
/// \exception QString if an error occurs in parsing /// \exception QString if an error occurs in parsing
FBXGeometry* readFBX(const QByteArray& model, const QVariantHash& mapping, const QString& url = "", bool loadLightmaps = true, float lightmapLevel = 1.0f); FBXGeometry* readFBX(const QByteArray& model, const QVariantHash& mapping, const QUrl& url = QUrl(), bool loadLightmaps = true, float lightmapLevel = 1.0f);
/// Reads FBX geometry from the supplied model and mapping data. /// Reads FBX geometry from the supplied model and mapping data.
/// \exception QString if an error occurs in parsing /// \exception QString if an error occurs in parsing
FBXGeometry* readFBX(QIODevice* device, const QVariantHash& mapping, const QString& url = "", bool loadLightmaps = true, float lightmapLevel = 1.0f); FBXGeometry* readFBX(QIODevice* device, const QVariantHash& mapping, const QUrl& url = QUrl(), bool loadLightmaps = true, float lightmapLevel = 1.0f);
class TextureParam { class TextureParam {
public: public:
@ -402,11 +402,11 @@ public:
FBXNode _fbxNode; FBXNode _fbxNode;
static FBXNode parseFBX(QIODevice* device); static FBXNode parseFBX(QIODevice* device);
FBXGeometry* extractFBXGeometry(const QVariantHash& mapping, const QString& url); FBXGeometry* extractFBXGeometry(const QVariantHash& mapping, const QUrl& url);
ExtractedMesh extractMesh(const FBXNode& object, unsigned int& meshIndex); ExtractedMesh extractMesh(const FBXNode& object, unsigned int& meshIndex);
QHash<QString, ExtractedMesh> meshes; QHash<QString, ExtractedMesh> meshes;
static void buildModelMesh(FBXMesh& extractedMesh, const QString& url); static void buildModelMesh(FBXMesh& extractedMesh, const QUrl& url);
FBXTexture getTexture(const QString& textureID); FBXTexture getTexture(const QString& textureID);

2
libraries/fbx/src/FBXReader_Mesh.cpp
View file

@ -388,7 +388,7 @@ ExtractedMesh FBXReader::extractMesh(const FBXNode& object, unsigned int& meshIn
return data.extracted; return data.extracted;
} }
void FBXReader::buildModelMesh(FBXMesh& extractedMesh, const QString& url) { void FBXReader::buildModelMesh(FBXMesh& extractedMesh, const QUrl& url) {
static QString repeatedMessage = LogHandler::getInstance().addRepeatedMessageRegex("buildModelMesh failed -- .*"); static QString repeatedMessage = LogHandler::getInstance().addRepeatedMessageRegex("buildModelMesh failed -- .*");
unsigned int totalSourceIndices = 0; unsigned int totalSourceIndices = 0;