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

debug statements to find the node parsing error

Browse source
This commit is contained in:
amantley 2019-03-11 17:50:20 -07:00
parent e94d248ac5
commit 7c7e632589
2 changed files with 20 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libraries/animation/src/AnimClip.cpp
View file

@ -154,7 +154,7 @@ void AnimClip::copyFromNetworkAnim() {
const float avatarToAnimationHeightRatio = avatarHeightInMeters / animHeightInMeters;
const float unitsRatio = 1.0f / (avatarUnitScale / animationUnitScale);
const float parentScaleRatio = 1.0f / (avatarHipsParentScale / animHipsParentScale);
qCDebug(animation) << " avatar unit scale " << avatarUnitScale << " animation unit scale " << animationUnitScale << " avatar height " << avatarHeightInMeters << " animation height " << animHeightInMeters << " avatar scale " << avatarHipsParentScale << " animation scale " << animHipsParentScale;
boneLengthScale = avatarToAnimationHeightRatio * unitsRatio * parentScaleRatio;
}

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

@ -142,6 +142,7 @@ glm::mat4 getGlobalTransform(const QMultiMap<QString, QString>& _connectionParen
visitedNodes.append(nodeID); // Append each node we visit
const FBXModel& fbxModel = fbxModels.value(nodeID);
qCDebug(modelformat) << "this fbx model name is " << fbxModel.name;
globalTransform = glm::translate(fbxModel.translation) * fbxModel.preTransform * glm::mat4_cast(fbxModel.preRotation *
fbxModel.rotation * fbxModel.postRotation) * fbxModel.postTransform * globalTransform;
if (fbxModel.hasGeometricOffset) {
@ -201,13 +202,23 @@ public:
void appendModelIDs(const QString& parentID, const QMultiMap<QString, QString>& connectionChildMap,
QHash<QString, FBXModel>& fbxModels, QSet<QString>& remainingModels, QVector<QString>& modelIDs, bool isRootNode = false) {
if (remainingModels.contains(parentID)) {
qCDebug(modelformat) << " remaining models contains parent " << parentID;
modelIDs.append(parentID);
remainingModels.remove(parentID);
}
int parentIndex = isRootNode ? -1 : modelIDs.size() - 1;
int parentIndex = 1000;
if (isRootNode) {
qCDebug(modelformat) << " found a root node " << parentID;
parentIndex = -1;
} else {
parentIndex = modelIDs.size() - 1;
}
//int parentIndex = isRootNode ? -1 : modelIDs.size() - 1;
foreach (const QString& childID, connectionChildMap.values(parentID)) {
qCDebug(modelformat) << " searching children, parent id " << parentID;
if (remainingModels.contains(childID)) {
FBXModel& fbxModel = fbxModels[childID];
qCDebug(modelformat) << " child id " << fbxModel.name;
if (fbxModel.parentIndex == -1) {
fbxModel.parentIndex = parentIndex;
appendModelIDs(childID, connectionChildMap, fbxModels, remainingModels, modelIDs);
@ -441,6 +452,7 @@ HFMModel* FBXSerializer::extractHFMModel(const QVariantHash& mapping, const QStr
QString hifiGlobalNodeID;
unsigned int meshIndex = 0;
haveReportedUnhandledRotationOrder = false;
int nodeParentId = -1;
foreach (const FBXNode& child, node.children) {
if (child.name == "FBXHeaderExtension") {
@ -497,6 +509,7 @@ HFMModel* FBXSerializer::extractHFMModel(const QVariantHash& mapping, const QStr
}
} else if (child.name == "Objects") {
foreach (const FBXNode& object, child.children) {
nodeParentId++;
if (object.name == "Geometry") {
if (object.properties.at(2) == "Mesh") {
meshes.insert(getID(object.properties), extractMesh(object, meshIndex));
@ -505,6 +518,7 @@ HFMModel* FBXSerializer::extractHFMModel(const QVariantHash& mapping, const QStr
blendshapes.append(extracted);
}
} else if (object.name == "Model") {
qCDebug(modelformat) << "model name from object properties " << getName(object.properties) << " node parentID " << nodeParentId;
QString name = getName(object.properties);
QString id = getID(object.properties);
modelIDsToNames.insert(id, name);
@ -1181,6 +1195,7 @@ HFMModel* FBXSerializer::extractHFMModel(const QVariantHash& mapping, const QStr
#endif
}
// TODO: check if is code is needed
if (!lights.empty()) {
if (hifiGlobalNodeID.isEmpty()) {
@ -1211,6 +1226,7 @@ HFMModel* FBXSerializer::extractHFMModel(const QVariantHash& mapping, const QStr
for (QHash<QString, FBXModel>::const_iterator fbxModel = fbxModels.constBegin(); fbxModel != fbxModels.constEnd(); fbxModel++) {
// models with clusters must be parented to the cluster top
// Unless the model is a root node.
qCDebug(modelformat) << "fbx model name " << fbxModel.key();
bool isARootNode = !modelIDs.contains(_connectionParentMap.value(fbxModel.key()));
if (!isARootNode) {
foreach(const QString& deformerID, _connectionChildMap.values(fbxModel.key())) {
@ -1266,6 +1282,8 @@ HFMModel* FBXSerializer::extractHFMModel(const QVariantHash& mapping, const QStr
joint.parentIndex = fbxModel.parentIndex;
int jointIndex = hfmModel.joints.size();
qCDebug(modelformat) << "fbx joint name " << fbxModel.name << " joint index " << jointIndex << " parent index " << joint.parentIndex;
joint.translation = fbxModel.translation; // these are usually in centimeters
joint.preTransform = fbxModel.preTransform;
joint.preRotation = fbxModel.preRotation;