TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-03 18:31:55 -04:00
Code Issues Packages Projects Releases Wiki Activity

bam2egg: fix skinning bug for joints with DefaultPose

Browse Source
This commit is contained in:
rdb 2020-03-14 14:48:31 +01:00
parent c5c1d4557b
commit ebd538a7f8
2 changed files with 52 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
panda/src/egg2pg/eggSaver.cxx
View File

@ -345,18 +345,61 @@ convert_anim_node(AnimBundleNode *node, const WorkingNodePath &node_path,
*/ */
void EggSaver:: void EggSaver::
convert_character_bundle(PartGroup *bundleNode, EggGroupNode *egg_parent, CharacterJointMap *joint_map) { convert_character_bundle(PartGroup *bundleNode, EggGroupNode *egg_parent, CharacterJointMap *joint_map) {
convert_character_bundle(bundleNode, egg_parent, joint_map, nullptr);
}
/**
* Converts the indicated Character Bundle to the corresponding Egg joints
* structure.
*/
void EggSaver::
convert_character_bundle(PartGroup *bundleNode, EggGroupNode *egg_parent,
CharacterJointMap *joint_map, const CharacterJoint *parent_joint) {
int num_children = bundleNode->get_num_children(); int num_children = bundleNode->get_num_children();
const CharacterJoint *character_joint = nullptr;
EggGroupNode *joint_group = egg_parent; EggGroupNode *joint_group = egg_parent;
if (bundleNode->is_of_type(CharacterJoint::get_class_type())) { if (bundleNode->is_of_type(CharacterJoint::get_class_type())) {
CharacterJoint *character_joint = DCAST(CharacterJoint, bundleNode); character_joint = DCAST(CharacterJoint, bundleNode);
LMatrix4 transformf;
character_joint->get_transform(transformf);
LMatrix4d transformd(LCAST(double, transformf));
EggGroup *joint = new EggGroup(bundleNode->get_name()); EggGroup *joint = new EggGroup(bundleNode->get_name());
joint->add_matrix4(transformd);
joint->set_group_type(EggGroup::GT_joint); joint->set_group_type(EggGroup::GT_joint);
// The default_value originally passed to the CharacterJoint is what is used
// for skinning. However, the _default_value can be changed after joint
// construction (such as via a <DefaultPose>), so we can't just pull the
// current _default_value.
//
// We have to instead work back from the _initial_net_transform_inverse,
// which is computed at construction time from the original default_value:
//
// _net_transform = default_value * parent_joint->_net_transform;
// _initial_net_transform_inverse = invert(_net_transform);
//
// So we should be able to reconstruct the original default_value like so:
//
// default_value = invert(_initial_net_transform_inverse)
// * parent_joint->_initial_net_transform_inverse;
//
LMatrix4d net_transform = invert(LCAST(double, character_joint->_initial_net_transform_inverse));
if (parent_joint != nullptr) {
if (parent_joint->_initial_net_transform_inverse != character_joint->_initial_net_transform_inverse) {
LMatrix4d parent_inverse = LCAST(double, parent_joint->_initial_net_transform_inverse);
joint->add_matrix4(net_transform * parent_inverse);
}
} else if (!net_transform.is_identity()) {
joint->add_matrix4(net_transform);
}
// The joint's _default_value, if different, goes into a <DefaultPose>.
LMatrix4d default_pose = LCAST(double, character_joint->_default_value);
if (default_pose != joint->get_transform3d()) {
EggTransform transform;
transform.add_matrix4(LCAST(double, default_pose));
joint->set_default_pose(transform);
}
joint_group = joint; joint_group = joint;
egg_parent->add_child(joint_group); egg_parent->add_child(joint_group);
if (joint_map != nullptr) { if (joint_map != nullptr) {
@ -373,7 +416,7 @@ convert_character_bundle(PartGroup *bundleNode, EggGroupNode *egg_parent, Charac
for (int i = 0; i < num_children ; i++) { for (int i = 0; i < num_children ; i++) {
PartGroup *partGroup= bundleNode->get_child(i); PartGroup *partGroup= bundleNode->get_child(i);
convert_character_bundle(partGroup, joint_group, joint_map); convert_character_bundle(partGroup, joint_group, joint_map, character_joint);
} }
} }

3
panda/src/egg2pg/eggSaver.h
View File

@ -78,6 +78,9 @@ private:
void convert_character_node(Character *node, const WorkingNodePath &node_path, void convert_character_node(Character *node, const WorkingNodePath &node_path,
EggGroupNode *egg_parent, bool has_decal); EggGroupNode *egg_parent, bool has_decal);
void convert_character_bundle(PartGroup *bundleNode, EggGroupNode *egg_parent, CharacterJointMap *jointMap); void convert_character_bundle(PartGroup *bundleNode, EggGroupNode *egg_parent, CharacterJointMap *jointMap);
void convert_character_bundle(PartGroup *bundleNode, EggGroupNode *egg_parent,
CharacterJointMap *jointMap,
const CharacterJoint *parent_joint);
void convert_collision_node(CollisionNode *node, const WorkingNodePath &node_path, void convert_collision_node(CollisionNode *node, const WorkingNodePath &node_path,
EggGroupNode *egg_parent, bool has_decal, EggGroupNode *egg_parent, bool has_decal,
CharacterJointMap *joint_map); CharacterJointMap *joint_map);