RomanNum3ral
/
open_toontown_panda3d
mirror of https://github.com/open-toontown/panda3d.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed a bug of creating wrong joint hierarchy

This commit is contained in:
Gyedo Jeon 2010-02-18 00:50:34 +00:00
parent b9f4cec283
commit 60cbcbf78f
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pandatool/src/mayaegg/mayaEggLoader.cxx
View File

@ -121,6 +121,8 @@ public:
TexTable _tex_tab;
SurfaceTable _surface_tab;
vector <MayaEggJoint *> _joint_list;
int _start_frame;
int _end_frame;
int _frame_rate;
@ -502,6 +504,9 @@ MayaEggJoint *MayaEggLoader::MakeJoint(EggGroup *joint, EggGroup *context)
}
_joint_tab[joint] = result;
// [gjeon] since _joint_tab is not always properly sorted
_joint_list.push_back(result);
return result;
}
@ -1809,8 +1814,8 @@ bool MayaEggLoader::ConvertEggData(EggData *data, bool merge, bool model, bool a
mayaloader_cat.spam() << "thickness from joints: " << thickness << endl;
}
thickness = thickness * 0.025;
for (ji = _joint_tab.begin(); ji != _joint_tab.end(); ++ji) {
MayaEggJoint *joint = (*ji).second;
for (unsigned int i=0; i<_joint_list.size(); i++) {
MayaEggJoint *joint = _joint_list[i];
if (mayaloader_cat.is_spam()) {
mayaloader_cat.spam() << "creating a joint: " << joint->_egg_joint->get_name() << endl;
}