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

Fix for weird links in Blender exports.

Browse source
This commit is contained in:
Andrzej Kapolka 2013-10-18 18:43:07 -07:00
parent b3384d0869
commit b294f5b13e
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
interface/src/renderer/FBXReader.cpp
View file

@ -446,11 +446,11 @@ class FBXModel {
public: public:
QByteArray name; QByteArray name;
int parentIndex;
glm::mat4 preRotation; glm::mat4 preRotation;
glm::quat rotation; glm::quat rotation;
glm::mat4 postRotation; glm::mat4 postRotation;
int parentIndex;
}; };
glm::mat4 getGlobalTransform(const QMultiHash<QString, QString>& parentMap, glm::mat4 getGlobalTransform(const QMultiHash<QString, QString>& parentMap,
@ -513,8 +513,11 @@ void appendModelIDs(const QString& parentID, const QMultiHash<QString, QString>&
int parentIndex = modelIDs.size() - 1; int parentIndex = modelIDs.size() - 1;
foreach (const QString& childID, childMap.values(parentID)) { foreach (const QString& childID, childMap.values(parentID)) {
if (models.contains(childID)) { if (models.contains(childID)) {
models[childID].parentIndex = parentIndex; FBXModel& model = models[childID];
appendModelIDs(childID, childMap, models, modelIDs); if (model.parentIndex == -1) {
model.parentIndex = parentIndex;
appendModelIDs(childID, childMap, models, modelIDs);
}
} }
} }
} }
@ -714,7 +717,7 @@ FBXGeometry extractFBXGeometry(const FBXNode& node, const QVariantHash& mapping)
glm::vec3 preRotation, rotation, postRotation; glm::vec3 preRotation, rotation, postRotation;
glm::vec3 scale = glm::vec3(1.0f, 1.0f, 1.0f); glm::vec3 scale = glm::vec3(1.0f, 1.0f, 1.0f);
glm::vec3 scalePivot, rotationPivot; glm::vec3 scalePivot, rotationPivot;
FBXModel model = { name }; FBXModel model = { name, -1 };
foreach (const FBXNode& subobject, object.children) { foreach (const FBXNode& subobject, object.children) {
if (subobject.name == "Properties60") { if (subobject.name == "Properties60") {
foreach (const FBXNode& property, subobject.children) { foreach (const FBXNode& property, subobject.children) {