diff --git a/pandatool/src/softegg/softNodeDesc.cxx b/pandatool/src/softegg/softNodeDesc.cxx index fb99bcc601..ecf318aa02 100755 --- a/pandatool/src/softegg/softNodeDesc.cxx +++ b/pandatool/src/softegg/softNodeDesc.cxx @@ -454,13 +454,6 @@ get_transform(SAA_Scene *scene, EggGroup *egg_group, bool global) { // Get the model's matrix int scale_joint = 0; - /* - if ( _parentJoint && strstr( _parentJoint->get_name().c_str(), "scale" ) != NULL ) { - scale_joint = 1; - softegg_cat.spam() << "scale joint flag set!\n"; - } - */ - if (!global && _parentJoint && !stec.flatten && !scale_joint) { SAA_modelGetMatrix( scene, get_model(), SAA_COORDSYS_LOCAL, matrix ); @@ -521,13 +514,6 @@ get_joint_transform(SAA_Scene *scene, EggGroup *egg_group, EggXfmSAnim *anim, b float x,y,z; int scale_joint = 0; - /* - if ( _parentJoint && strstr( _parentJoint->get_name().c_str(), "scale" ) != NULL ) { - scale_joint = 1; - softegg_cat.spam() << "scale joint flag set!\n"; - } - */ - softegg_cat.spam() << "\n\nanimating child " << name << endl; if (_parentJoint && !stec.flatten && !scale_joint ) { diff --git a/pandatool/src/softegg/softNodeTree.cxx b/pandatool/src/softegg/softNodeTree.cxx index 1f5332c95d..42e42518b2 100755 --- a/pandatool/src/softegg/softNodeTree.cxx +++ b/pandatool/src/softegg/softNodeTree.cxx @@ -223,13 +223,6 @@ build_complete_hierarchy(SAA_Scene &scene, SAA_Database &database) { // find _parentJoint for each node _root->set_parentJoint(&scene, NULL); - /* - if (stec.flatten) { - softegg_cat.spam() << "rprprprprprprprprprprprprprprprprprprprprprprprprprprprpr\n"; - reparent_flatten(_root); - } - */ - return all_ok; } #if 0 @@ -600,25 +593,13 @@ r_build_node(SoftNodeDesc *parent_node, const string &name) { if (ni != _nodes_by_name.end()) { softegg_cat.spam() << " already built node " << (*ni).first; node_desc = (*ni).second; - - /* - if (stec.flatten) - node_desc->set_parent(_root); - else - */ - node_desc->set_parent(parent_node); - + node_desc->set_parent(parent_node); return node_desc; } // Otherwise, we have to create it. Do this recursively, so we // create each node along the path. - /* - if (stec.flatten) - node_desc = new SoftNodeDesc(_root, name); - else - */ - node_desc = new SoftNodeDesc(parent_node, name); + node_desc = new SoftNodeDesc(parent_node, name); softegg_cat.spam() << " node name : " << name << endl; _nodes.push_back(node_desc); @@ -628,30 +609,6 @@ r_build_node(SoftNodeDesc *parent_node, const string &name) { return node_desc; } -//////////////////////////////////////////////////////////////////// -// Function: SoftNodeTree::reparent_flatten -// Access: Private -// Description: recursively, reparent all nodes to root -//////////////////////////////////////////////////////////////////// -void SoftNodeTree:: -reparent_flatten(SoftNodeDesc *node) { - // get a copy of the current childrens - SoftNodeDesc::Children old_children = node->_children; - // clear the _children to make room for new ones - node->_children.clear(); - - if (node != _root) { - softegg_cat.spam() << "reparenting " << node << ":" << node->get_name(); - node->force_set_parent(_root); - } - - SoftNodeDesc::Children::const_iterator ci; - for (ci = old_children.begin(); ci != old_children.end(); ++ci) { - SoftNodeDesc *child = (*ci); - reparent_flatten(child); - } - -} // // // diff --git a/pandatool/src/softegg/softNodeTree.h b/pandatool/src/softegg/softNodeTree.h index 5b9877253a..a1bcb09ea2 100755 --- a/pandatool/src/softegg/softNodeTree.h +++ b/pandatool/src/softegg/softNodeTree.h @@ -73,7 +73,6 @@ private: EggGroupNode *_skeleton_node; SoftNodeDesc *r_build_node(SoftNodeDesc *parent_node, const string &path); - void reparent_flatten(SoftNodeDesc *node); typedef pmap NodesByName; NodesByName _nodes_by_name;