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

Keep new offset rotation method and resolve duplicates at the end

Browse source
This commit is contained in:
luiscuenca 2019-08-22 13:16:32 -07:00
parent 260ee59585
commit 4b1b61ae5b
No known key found for this signature in database
GPG key ID: 2387ECD129A6961D
1 changed files with 79 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

126
libraries/model-baker/src/model-baker/PrepareJointsTask.cpp
View file

@ -60,76 +60,108 @@ void PrepareJointsTask::configure(const Config& config) {
_passthrough = config.passthrough; _passthrough = config.passthrough;
} }
void PrepareJointsTask::run(const baker::BakeContextPointer& context, const Input& input, Output& output) { void PrepareJointsTask::run(const baker::BakeContextPointer& context, const Input& input, Output& output) {
const auto& jointsIn = input.get0(); const auto& jointsIn = input.get0();
auto& jointsOut = output.edit0(); auto& jointsOut = output.edit0();
std::vector<QString> jointNames;
const QString APPEND_DUPLICATE_JOINT = "_joint";
const QString APPEND_DUPLICATE_MESH = "_mesh";
if (_passthrough) { if (_passthrough) {
jointsOut = jointsIn; jointsOut = jointsIn;
} else { } else {
const auto& mapping = input.get1(); const auto& mapping = input.get1();
auto& jointRotationOffsets = output.edit1(); auto& jointRotationOffsets = output.edit1();
auto& jointIndices = output.edit2();
static const QString JOINT_ROTATION_OFFSET2_FIELD = "jointRotationOffset2";
QVariantHash fstHashMap = mapping; QVariantHash fstHashMap = mapping;
bool newJointRot = fstHashMap.contains(JOINT_ROTATION_OFFSET2_FIELD);
// Get joint renames // Get joint renames
auto jointNameMapping = getJointNameMapping(mapping); QMap<QString, QString> jointNameMapping = getJointNameMapping(mapping);
// Apply joint metadata from FST file mappings // Apply joint metadata from FST file mappings
for (const auto& jointIn : jointsIn) { for (const hfm::Joint& jointIn : jointsIn) {
jointsOut.push_back(jointIn); jointsOut.push_back(jointIn);
auto& jointOut = jointsOut.back(); hfm::Joint& jointOut = jointsOut.back();
auto jointNameMapKey = jointNameMapping.key(jointIn.name); if (!newJointRot) {
if (jointNameMapping.contains(jointNameMapKey)) { // Offset rotations are referenced by the new joint's names
jointOut.name = jointNameMapKey; // We need to assign new joint's names now, before the offsets are read.
} QString jointNameMapKey = jointNameMapping.key(jointIn.name);
if (jointNameMapping.contains(jointNameMapKey)) {
// Make sure that joint name is unique jointOut.name = jointNameMapKey;
if (jointIndices.contains(jointOut.name)) {
int duplicatedJointIndex = jointIndices.find(jointOut.name).value();
auto& duplicatedJoint = jointsOut[duplicatedJointIndex];
bool areBothJoints = jointOut.isSkeletonJoint && duplicatedJoint.isSkeletonJoint;
QString existJointName = jointOut.name;
QString appendName;
if (areBothJoints) {
appendName = APPEND_DUPLICATE_JOINT;
qCWarning(model_baker) << "Duplicated skeleton joints found: " << existJointName;
} else {
appendName = APPEND_DUPLICATE_MESH;
qCDebug(model_baker) << "Duplicated joints found. Renaming the mesh joint: " << existJointName;
}
QString newName = existJointName + appendName;
// Make sure the new name is unique
int duplicateIndex = 0;
while (jointIndices.contains(newName)) {
newName = existJointName + appendName + QString::number(++duplicateIndex);
}
// Find and rename the mesh joint
if (!jointOut.isSkeletonJoint) {
jointOut.name = newName;
} else {
duplicatedJoint.name = newName;
jointIndices.remove(jointOut.name);
jointIndices.insert(duplicatedJoint.name, duplicatedJointIndex);
} }
} }
jointIndices.insert(jointOut.name, (int)jointsOut.size()); jointNames.push_back(jointOut.name);
} }
// Get joint rotation offsets from FST file mappings // Get joint rotation offsets from FST file mappings
auto offsets = getJointRotationOffsets(mapping); QMap<QString, glm::quat> offsets = getJointRotationOffsets(mapping);
for (auto itr = offsets.begin(); itr != offsets.end(); itr++) { for (auto itr = offsets.begin(); itr != offsets.end(); itr++) {
QString jointName = itr.key(); QString jointName = itr.key();
int jointIndex = jointIndices.value(jointName) - 1; auto jointToOffset = std::find_if(jointsOut.begin(), jointsOut.end(), [jointName](const hfm::Joint& joint) {
if (jointIndex >= 0) { return (joint.name == jointName && joint.isSkeletonJoint);
glm::quat rotationOffset = itr.value(); });
jointRotationOffsets.insert(jointIndex, rotationOffset); if (jointToOffset != jointsOut.end()) {
qCDebug(model_baker) << "Joint Rotation Offset added to Rig._jointRotationOffsets : " << " jointName: " << jointName << " jointIndex: " << jointIndex << " rotation offset: " << rotationOffset; // In case there are named duplicates we'll assign the offset rotation to the first skeleton joint that matches the name.
int jointIndex = (int)distance(jointsOut.begin(), jointToOffset);
if (jointIndex >= 0) {
glm::quat rotationOffset = itr.value();
jointRotationOffsets.insert(jointIndex, rotationOffset);
qCDebug(model_baker) << "Joint Rotation Offset added to Rig._jointRotationOffsets : " << " jointName: " << jointName << " jointIndex: " << jointIndex << " rotation offset: " << rotationOffset;
break;
}
} }
} }
if (newJointRot) {
// Offset rotations are referenced using the original joint's names
// We need to apply new names now, once we have read the offsets
for (size_t i = 0; i < jointsOut.size(); i++) {
hfm::Joint& jointOut = jointsOut[i];
QString jointNameMapKey = jointNameMapping.key(jointOut.name);
if (jointNameMapping.contains(jointNameMapKey)) {
jointOut.name = jointNameMapKey;
jointNames[i] = jointNameMapKey;
}
}
}
const QString APPEND_DUPLICATE_JOINT = "_joint";
const QString APPEND_DUPLICATE_MESH = "_mesh";
// resolve duplicates and set jointIndices
auto& jointIndices = output.edit2();
for (size_t i = 0; i < jointsOut.size(); i++) {
hfm::Joint& jointOut = jointsOut[i];
if (jointIndices.contains(jointOut.name)) {
int duplicatedJointIndex = jointIndices[jointOut.name] - 1;
if (duplicatedJointIndex >= 0) {
auto& duplicatedJoint = jointsOut[duplicatedJointIndex];
bool areBothJoints = jointOut.isSkeletonJoint && duplicatedJoint.isSkeletonJoint;
QString existJointName = jointOut.name;
QString appendName;
if (areBothJoints) {
appendName = APPEND_DUPLICATE_JOINT;
qCWarning(model_baker) << "Duplicated skeleton joints found: " << existJointName;
} else {
appendName = APPEND_DUPLICATE_MESH;
qCDebug(model_baker) << "Duplicated joints found. Renaming the mesh joint: " << existJointName;
}
QString newName = existJointName + appendName;
// Make sure the new name is unique
int duplicateIndex = 0;
while (jointIndices.contains(newName)) {
newName = existJointName + appendName + QString::number(++duplicateIndex);
}
// Find and rename the mesh joint
if (!jointOut.isSkeletonJoint) {
jointOut.name = newName;
} else {
jointIndices.remove(jointOut.name);
jointIndices.insert(newName, duplicatedJointIndex);
}
}
}
jointIndices.insert(jointOut.name, i + 1);
}
} }
} }