Mirrors/overte-Armored-Dragon
3
0
Fork 0
mirror of https://github.com/Armored-Dragon/overte.git synced 2025-03-11 16:13:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Restore some very odd modularity used by VHACDUtil.

Browse source
This commit is contained in:
Howard Stearns 2015-04-29 22:17:44 -07:00
parent 810242e182
commit 242001a589
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libraries/fbx/src/OBJReader.h
View file

@ -56,3 +56,7 @@ public:
void fbxDebugDump(const FBXGeometry& fbxgeo);
bool parseOBJGroup(OBJTokenizer& tokenizer, const QVariantHash& mapping, FBXGeometry& geometry, float& scaleGuess);
};
// What are these utilities doing here? Apparently used by fbx loading code in VHACD Utils.
void setMeshPartDefaults(FBXMeshPart &meshPart, QString materialID);
void fbxDebugDump(const FBXGeometry& fbxgeo);

2
tools/vhacd-util/src/VHACDUtil.cpp
View file

@ -36,7 +36,7 @@ bool vhacd::VHACDUtil::loadFBX(const QString filename, FBXGeometry& result) {
QByteArray fbxContents = fbx.readAll();
if (filename.toLower().endsWith(".obj")) {
result = readOBJ(fbxContents, QVariantHash());
result = OBJReader().readOBJ(fbxContents, QVariantHash());
} else if (filename.toLower().endsWith(".fbx")) {
result = readFBX(fbxContents, QVariantHash());
} else {