TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-09-27 15:25:54 -04:00
Code Issues Packages Projects Releases Wiki Activity

bam2egg: change overloaded method (for ABI reasons) to default arg

Browse Source 
This is a follow-up to ebd538a7f83bd4ff9938a7e5f97a9ad8e6198552
This commit is contained in:
rdb 2020-03-14 15:02:52 +01:00
parent f524f00e8e
commit 244c880f38
2 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -339,15 +339,6 @@ convert_anim_node(AnimBundleNode *node, const WorkingNodePath &node_path,
eggTable->add_child(eggAnimation); eggTable->add_child(eggAnimation);
} }
/**
* Converts the indicated Character Bundle to the corresponding Egg joints
* structure.
*/
void EggSaver::
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 * Converts the indicated Character Bundle to the corresponding Egg joints
* structure. * structure.

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

@ -77,10 +77,9 @@ private:
EggGroupNode *egg_parent, bool has_decal); EggGroupNode *egg_parent, bool has_decal);
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, void convert_character_bundle(PartGroup *bundleNode, EggGroupNode *egg_parent,
CharacterJointMap *jointMap, CharacterJointMap *jointMap,
const CharacterJoint *parent_joint); const CharacterJoint *parent_joint = nullptr);
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);