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

Preserve the original node names

Browse Source
This commit is contained in:
rdb 2010-10-18 15:39:32 +00:00
parent 7f11bd2d74
commit e9bda02475
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pandatool/src/daeegg/daeToEggConverter.cxx
View File

@ -249,7 +249,7 @@ void DAEToEggConverter::process_node(PT(EggGroupNode) parent, const FCDSceneNode
return; return;
} }
// Create an egg group for this node // Create an egg group for this node
PT(EggGroup) node_group = new EggGroup(node_id); PT(EggGroup) node_group = new EggGroup(FROM_FSTRING(node->GetName()));
process_extra(node_group, node->GetExtra()); process_extra(node_group, node->GetExtra());
parent->add_child(node_group); parent->add_child(node_group);
// Check if its a joint // Check if its a joint
@ -290,7 +290,7 @@ void DAEToEggConverter::process_instance(PT(EggGroup) parent, const FCDEntityIns
process_mesh(parent, geometry->GetMesh(), new DaeMaterials((const FCDGeometryInstance*) instance)); process_mesh(parent, geometry->GetMesh(), new DaeMaterials((const FCDGeometryInstance*) instance));
} }
if (geometry->IsSpline()) { if (geometry->IsSpline()) {
process_spline(parent, FROM_FSTRING(geometry->GetDaeId()), const_cast<FCDGeometrySpline*> (geometry->GetSpline())); process_spline(parent, FROM_FSTRING(geometry->GetName()), const_cast<FCDGeometrySpline*> (geometry->GetSpline()));
} }
break; } break; }
case FCDEntityInstance::CONTROLLER: { case FCDEntityInstance::CONTROLLER: {
@ -558,7 +558,7 @@ void DAEToEggConverter::process_controller(PT(EggGroup) parent, const FCDControl
} }
} }
if (geometry->IsSpline()) { if (geometry->IsSpline()) {
process_spline(parent, FROM_FSTRING(geometry->GetDaeId()), const_cast<FCDGeometrySpline*> (geometry->GetSpline())); process_spline(parent, FROM_FSTRING(geometry->GetName()), const_cast<FCDGeometrySpline*> (geometry->GetSpline()));
} }
} }
// Add the joint hierarchy // Add the joint hierarchy
@ -618,7 +618,7 @@ void DAEToEggConverter::process_controller(PT(EggGroup) parent, const FCDControl
for (size_t mt = 0; mt < morph_controller->GetTargetCount(); ++mt) { for (size_t mt = 0; mt < morph_controller->GetTargetCount(); ++mt) {
const FCDMorphTarget* morph_target = morph_controller->GetTarget(mt); const FCDMorphTarget* morph_target = morph_controller->GetTarget(mt);
assert(morph_target != NULL); assert(morph_target != NULL);
PT(EggSAnimData) target = new EggSAnimData(FROM_FSTRING(morph_target->GetGeometry()->GetDaeId())); PT(EggSAnimData) target = new EggSAnimData(FROM_FSTRING(morph_target->GetGeometry()->GetName()));
if (morph_target->IsAnimated()) { if (morph_target->IsAnimated()) {
//TODO //TODO
} else { } else {