Added fileOnUrl to check if a texture exist at the location. It return the correct filename of where the texture lives. Added the url of the fix file to extractFBXGeometry and readFBX and updated the calls to readFBX to include the url of the fix file.

So it now does not break existing content. Found a second place in the FBXReader.cpp where the RelativeFileName stripped out the dir location.

Marcel Verhagen committed 11 years ago

Commit 8f0893b1 parent fac497d6 files · +29 −14Browse files

Showing the changes to interface/src/ModelPackager.cpp (1 of 6 files). Show all

Unified · Split

@@ -106,7 +106,7 @@ bool ModelPackager::loadModel() { · 105 unmodified lines
106	}	106	}
107	qCDebug(interfaceapp) << "Reading FBX file : " << _fbxInfo.filePath();	107	qCDebug(interfaceapp) << "Reading FBX file : " << _fbxInfo.filePath();
108	QByteArray fbxContents = fbx.readAll();	108	QByteArray fbxContents = fbx.readAll();
109	_geometry = readFBX(fbxContents, QVariantHash());	109	_geometry = readFBX(fbxContents, QVariantHash(), _fbxInfo.filePath());
110		110
111	// make sure we have some basic mappings	111	// make sure we have some basic mappings
112	populateBasicMapping(_mapping, _fbxInfo.filePath(), _geometry);	112	populateBasicMapping(_mapping, _fbxInfo.filePath(), _geometry);

Keyboard shortcuts