godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes to import plugin, closes #5318

This commit is contained in:
Juan Linietsky 2016-06-30 22:37:25 -03:00
parent f6725f9768
commit 54571e94ac
1 changed files with 74 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
tools/editor/io_plugins/editor_scene_import_plugin.cpp
View File

@ -2459,7 +2459,7 @@ void EditorSceneImportPlugin::_optimize_animations(Node *scene, float p_max_lin_
void EditorSceneImportPlugin::_find_resources_to_merge(Node *scene, Node *node, bool p_merge_material, Map<String, Ref<Material> > &materials, bool p_merge_anims, Map<String,Ref<Animation> >& merged_anims,Set<Ref<Mesh> > &tested_meshes) { void EditorSceneImportPlugin::_find_resources_to_merge(Node *scene, Node *node, bool p_merge_material, Map<String, Ref<Material> > &materials, bool p_merge_anims, Map<String,Ref<Animation> >& merged_anims,Set<Ref<Mesh> > &tested_meshes) {
if (node->get_owner()!=scene) if (node!=scene && node->get_owner()!=scene)
return; return;
String path = scene->get_path_to(node); String path = scene->get_path_to(node);
@ -2507,11 +2507,43 @@ void EditorSceneImportPlugin::_find_resources_to_merge(Node *scene, Node *node,
for(int i=0;i<mesh->get_surface_count();i++) { for(int i=0;i<mesh->get_surface_count();i++) {
Ref<Material> material = mesh->surface_get_material(i); Ref<Material> material = mesh->surface_get_material(i);
materials[mesh->get_name()+":surf:"+mesh->surface_get_name(i)]=material;
if (material.is_valid()) {
String sname = mesh->surface_get_name(i);
if (sname=="")
sname="surf_"+itos(i);
sname=mesh->get_name()+":surf:"+sname;
materials[sname]=material;
}
} }
tested_meshes.insert(mesh); tested_meshes.insert(mesh);
} }
if (mesh.is_valid()) {
for(int i=0;i<mesh->get_surface_count();i++) {
Ref<Material> material = mi->get_surface_material(i);
if (material.is_valid()) {
String sname = mesh->surface_get_name(i);
if (sname=="")
sname="surf_"+itos(i);
sname=path+":inst_surf:"+sname;
materials[sname]=material;
}
}
}
Ref<Material> override = mi->get_material_override();
if (override.is_valid()) {
materials[path+":override"]=override;
}
} }
@ -2525,11 +2557,13 @@ void EditorSceneImportPlugin::_find_resources_to_merge(Node *scene, Node *node,
void EditorSceneImportPlugin::_merge_found_resources(Node *scene, Node *node, bool p_merge_material, const Map<String, Ref<Material> > &materials, bool p_merge_anims, const Map<String,Ref<Animation> >& merged_anims, Set<Ref<Mesh> > &tested_meshes) { void EditorSceneImportPlugin::_merge_found_resources(Node *scene, Node *node, bool p_merge_material, const Map<String, Ref<Material> > &materials, bool p_merge_anims, const Map<String,Ref<Animation> >& merged_anims, Set<Ref<Mesh> > &tested_meshes) {
if (node->get_owner()!=scene) if (node!=scene && node->get_owner()!=scene)
return; return;
String path = scene->get_path_to(node); String path = scene->get_path_to(node);
print_line("at path: "+path);
if (node->cast_to<AnimationPlayer>()) { if (node->cast_to<AnimationPlayer>()) {
AnimationPlayer *ap = node->cast_to<AnimationPlayer>(); AnimationPlayer *ap = node->cast_to<AnimationPlayer>();
@ -2570,15 +2604,48 @@ void EditorSceneImportPlugin::_merge_found_resources(Node *scene, Node *node, bo
if (mesh.is_valid() && mesh->get_name()!=String() && !tested_meshes.has(mesh)) { if (mesh.is_valid() && mesh->get_name()!=String() && !tested_meshes.has(mesh)) {
for(int i=0;i<mesh->get_surface_count();i++) { for(int i=0;i<mesh->get_surface_count();i++) {
String sname = mesh->get_name()+":surf:"+mesh->surface_get_name(i);
String sname = mesh->surface_get_name(i);
if (sname=="")
sname="surf_"+itos(i);
sname=mesh->get_name()+":surf:"+sname;
if (materials.has(sname)) { if (materials.has(sname)) {
mesh->surface_set_material(i,materials[sname]); mesh->surface_set_material(i,materials[sname]);
} }
} }
tested_meshes.insert(mesh); tested_meshes.insert(mesh);
} }
if (mesh.is_valid()) {
for(int i=0;i<mesh->get_surface_count();i++) {
String sname = mesh->surface_get_name(i);
if (sname=="")
sname="surf_"+itos(i);
sname=path+":inst_surf:"+sname;
if (materials.has(sname)) {
mi->set_surface_material(i,materials[sname]);
}
}
}
String opath = path+":override";
if (materials.has(opath)) {
mi->set_material_override(materials[opath]);
}
} }
@ -2643,6 +2710,7 @@ Error EditorSceneImportPlugin::import2(Node *scene, const String& p_dest_path, c
if (scene_flags&(SCENE_FLAG_MERGE_KEEP_MATERIALS|SCENE_FLAG_MERGE_KEEP_EXTRA_ANIM_TRACKS) && FileAccess::exists(p_dest_path)) { if (scene_flags&(SCENE_FLAG_MERGE_KEEP_MATERIALS|SCENE_FLAG_MERGE_KEEP_EXTRA_ANIM_TRACKS) && FileAccess::exists(p_dest_path)) {
//must merge! //must merge!
print_line("MUST MERGE");
Ref<PackedScene> pscene = ResourceLoader::load(p_dest_path,"PackedScene",true); Ref<PackedScene> pscene = ResourceLoader::load(p_dest_path,"PackedScene",true);
if (pscene.is_valid()) { if (pscene.is_valid()) {
@ -2653,8 +2721,9 @@ Error EditorSceneImportPlugin::import2(Node *scene, const String& p_dest_path, c
Set<Ref<Mesh> > tested_meshes; Set<Ref<Mesh> > tested_meshes;
_find_resources_to_merge(instance,instance,scene_flags&SCENE_FLAG_MERGE_KEEP_MATERIALS,merged_materials,scene_flags&SCENE_FLAG_MERGE_KEEP_EXTRA_ANIM_TRACKS,merged_anims,tested_meshes); _find_resources_to_merge(instance,instance,scene_flags&SCENE_FLAG_MERGE_KEEP_MATERIALS,merged_materials,scene_flags&SCENE_FLAG_MERGE_KEEP_EXTRA_ANIM_TRACKS,merged_anims,tested_meshes);
tested_meshes.clear(); tested_meshes.clear();
_merge_found_resources(instance,instance,scene_flags&SCENE_FLAG_MERGE_KEEP_MATERIALS,merged_materials,scene_flags&SCENE_FLAG_MERGE_KEEP_EXTRA_ANIM_TRACKS,merged_anims,tested_meshes); _merge_found_resources(scene,scene,scene_flags&SCENE_FLAG_MERGE_KEEP_MATERIALS,merged_materials,scene_flags&SCENE_FLAG_MERGE_KEEP_EXTRA_ANIM_TRACKS,merged_anims,tested_meshes);
memdelete(instance); memdelete(instance);
} }