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

Moved some initialization to right place

Browse Source
This commit is contained in:
Gyedo Jeon 2008-03-29 01:16:01 +00:00
parent 3cc659cde4
commit 972f0c50e7
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -85,6 +85,7 @@ public:
bool ConvertEggData(EggData *data, bool merge, bool model, bool anim); bool ConvertEggData(EggData *data, bool merge, bool model, bool anim);
bool ConvertEggFile(const char *name, bool merge, bool model, bool anim); bool ConvertEggFile(const char *name, bool merge, bool model, bool anim);
public: public:
void TraverseEggNode(EggNode *node, EggGroup *context, string delim); void TraverseEggNode(EggNode *node, EggGroup *context, string delim);
MayaEggMesh *GetMesh(EggVertexPool *pool); MayaEggMesh *GetMesh(EggVertexPool *pool);
@ -920,6 +921,11 @@ bool MayaEggLoader::ConvertEggData(EggData *data, bool merge, bool model, bool a
} }
*/ */
_start_frame = 0;
_end_frame = 0;
_frame_rate = 24;
_timeUnit = MTime::kFilm;
MeshTable::const_iterator ci; MeshTable::const_iterator ci;
JointTable::const_iterator ji; JointTable::const_iterator ji;
TexTable::const_iterator ti; TexTable::const_iterator ti;
@ -1109,10 +1115,6 @@ void MayaEggLoader::ParseFrameInfo(string comment)
{ {
int length = 0; int length = 0;
int pos, ls, le; int pos, ls, le;
_frame_rate = 24;
_start_frame = 0;
_end_frame = -1;
_timeUnit = MTime::kFilm;
pos = comment.find("-fri"); pos = comment.find("-fri");
if (pos != string::npos) { if (pos != string::npos) {