Relintai/mesh_data_resource
1
0
Fork 0
mirror of https://github.com/Relintai/mesh_data_resource.git synced 2025-02-22 17:18:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix + improve import type multiple. Also fixed save copy as resource for it.

Browse Source
This commit is contained in:
Relintai 2022-02-12 13:00:26 +01:00
parent 20018b6af9
commit 469a8d0e6c
2 changed files with 38 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
plugin/mdr_import_plugin_base.cpp
View File

@ -121,10 +121,16 @@ Error MDRImportPluginBase::process_node(Node *n, const String &p_source_file, co
Ref<MeshDataResourceCollection> coll; Ref<MeshDataResourceCollection> coll;
coll.instance(); coll.instance();
process_node_multi(n, p_source_file, p_save_path, p_options, r_platform_variants, r_gen_files, r_metadata, coll); Ref<MeshDataResourceCollection> copy_coll;
if (save_copy_as_resource) { if (save_copy_as_resource) {
save_mdrcoll_copy_as_tres(p_source_file, coll); copy_coll.instance();
}
process_node_multi(n, p_source_file, p_save_path, p_options, r_platform_variants, r_gen_files, r_metadata, coll, copy_coll);
if (save_copy_as_resource) {
save_mdrcoll_copy_as_tres(p_source_file, copy_coll);
} }
return ResourceSaver::save(p_save_path + "." + get_save_extension(), coll); return ResourceSaver::save(p_save_path + "." + get_save_extension(), coll);
@ -263,11 +269,19 @@ Error MDRImportPluginBase::process_node_single_separated_bones(Node *n, const St
Ref<MeshDataResource> mdrl = ResourceLoader::load(filename); Ref<MeshDataResource> mdrl = ResourceLoader::load(filename);
if (save_copy_as_resource) {
save_mdr_copy_as_tres(filename, mdrl);
}
coll->add_mdr(mdrl); coll->add_mdr(mdrl);
} }
if (save_copy_as_resource) { if (save_copy_as_resource) {
save_mdrcoll_copy_as_tres(p_source_file, coll); // String node_name = c->get_name();
// node_name = node_name.to_lower();
// String mdr_coll_name = p_source_file.get_basename() + "_mdrcoll_" + node_name + "_" + String::num(j) + "." + get_save_extension();
// save_mdrcoll_copy_as_tres(mdr_coll_name, coll);
} }
return ResourceSaver::save(p_save_path + "." + get_save_extension(), coll); return ResourceSaver::save(p_save_path + "." + get_save_extension(), coll);
@ -281,7 +295,7 @@ Error MDRImportPluginBase::process_node_single_separated_bones(Node *n, const St
return Error::ERR_PARSE_ERROR; return Error::ERR_PARSE_ERROR;
} }
Error MDRImportPluginBase::process_node_multi(Node *n, const String &p_source_file, const String &p_save_path, const Map<StringName, Variant> &p_options, List<String> *r_platform_variants, List<String> *r_gen_files, Variant *r_metadata, Ref<MeshDataResourceCollection> coll) { Error MDRImportPluginBase::process_node_multi(Node *n, const String &p_source_file, const String &p_save_path, const Map<StringName, Variant> &p_options, List<String> *r_platform_variants, List<String> *r_gen_files, Variant *r_metadata, Ref<MeshDataResourceCollection> coll, Ref<MeshDataResourceCollection> copy_coll, int node_count) {
#if MESH_UTILS_PRESENT #if MESH_UTILS_PRESENT
MDRImportPluginBase::MDROptimizationType optimization_type = static_cast<MDRImportPluginBase::MDROptimizationType>(static_cast<int>(p_options["optimization_type"])); MDRImportPluginBase::MDROptimizationType optimization_type = static_cast<MDRImportPluginBase::MDROptimizationType>(static_cast<int>(p_options["optimization_type"]));
#endif #endif
@ -313,14 +327,27 @@ Error MDRImportPluginBase::process_node_multi(Node *n, const String &p_source_fi
} }
#endif #endif
if (copy_coll.is_valid()) {
String node_name = c->get_name(); String node_name = c->get_name();
node_name = node_name.to_lower(); node_name = node_name.to_lower();
String filename = p_source_file.get_basename() + "_" + node_name + "." + get_save_extension(); String filename = p_source_file.get_basename() + "_" + node_name + "_" + String::num(node_count) + ".tres";
Error err = ResourceSaver::save(filename, mdr); Error err = ResourceSaver::save(filename, mdr);
Ref<MeshDataResource> mdrtl = ResourceLoader::load(filename);
copy_coll->add_mdr(mdrtl);
if (err != Error::OK) {
return err;
}
}
String node_name = c->get_name();
node_name = node_name.to_lower();
String filename = p_source_file.get_basename() + "_" + node_name + "_" + String::num(node_count) + +"." + get_save_extension();
++node_count;
Error err = ResourceSaver::save(filename, mdr);
Ref<MeshDataResource> mdrl = ResourceLoader::load(filename); Ref<MeshDataResource> mdrl = ResourceLoader::load(filename);
coll->add_mdr(mdrl); coll->add_mdr(mdrl);
if (err != Error::OK) { if (err != Error::OK) {
@ -328,7 +355,7 @@ Error MDRImportPluginBase::process_node_multi(Node *n, const String &p_source_fi
} }
} }
process_node_multi(c, p_source_file, p_save_path, p_options, r_platform_variants, r_gen_files, r_metadata, coll); process_node_multi(c, p_source_file, p_save_path, p_options, r_platform_variants, r_gen_files, r_metadata, coll, copy_coll, node_count);
} }
return Error::OK; return Error::OK;
@ -907,7 +934,7 @@ void MDRImportPluginBase::save_mdr_copy_as_tres(const String &p_source_file, con
ResourceSaver::save(sp, res); ResourceSaver::save(sp, res);
} }
void MDRImportPluginBase::save_mdrcoll_copy_as_tres(const String &p_source_file, const Ref<MeshDataResource> &res) { void MDRImportPluginBase::save_mdrcoll_copy_as_tres(const String &p_source_file, const Ref<MeshDataResourceCollection> &res) {
String sp = p_source_file; String sp = p_source_file;
String ext = p_source_file.get_extension(); String ext = p_source_file.get_extension();
sp.resize(sp.size() - ext.size()); sp.resize(sp.size() - ext.size());

4
plugin/mdr_import_plugin_base.h
View File

@ -94,7 +94,7 @@ public:
int get_mesh_count(Node *n); int get_mesh_count(Node *n);
Error process_node_single(Node *n, const String &p_source_file, const String &p_save_path, const Map<StringName, Variant> &p_options, List<String> *r_platform_variants, List<String> *r_gen_files, Variant *r_metadata); Error process_node_single(Node *n, const String &p_source_file, const String &p_save_path, const Map<StringName, Variant> &p_options, List<String> *r_platform_variants, List<String> *r_gen_files, Variant *r_metadata);
Error process_node_single_separated_bones(Node *n, const String &p_source_file, const String &p_save_path, const Map<StringName, Variant> &p_options, List<String> *r_platform_variants, List<String> *r_gen_files, Variant *r_metadata); Error process_node_single_separated_bones(Node *n, const String &p_source_file, const String &p_save_path, const Map<StringName, Variant> &p_options, List<String> *r_platform_variants, List<String> *r_gen_files, Variant *r_metadata);
Error process_node_multi(Node *n, const String &p_source_file, const String &p_save_path, const Map<StringName, Variant> &p_options, List<String> *r_platform_variants, List<String> *r_gen_files, Variant *r_metadata, Ref<MeshDataResourceCollection> coll); Error process_node_multi(Node *n, const String &p_source_file, const String &p_save_path, const Map<StringName, Variant> &p_options, List<String> *r_platform_variants, List<String> *r_gen_files, Variant *r_metadata, Ref<MeshDataResourceCollection> coll, Ref<MeshDataResourceCollection> copy_coll, int node_count = 0);
Ref<MeshDataResource> get_mesh(MeshInstance *mi, const Map<StringName, Variant> &p_options, MeshDataResource::ColliderType collider_type, Vector3 scale); Ref<MeshDataResource> get_mesh(MeshInstance *mi, const Map<StringName, Variant> &p_options, MeshDataResource::ColliderType collider_type, Vector3 scale);
Ref<MeshDataResource> get_mesh_arrays(Array &arrs, const Map<StringName, Variant> &p_options, MeshDataResource::ColliderType collider_type, Vector3 scale); Ref<MeshDataResource> get_mesh_arrays(Array &arrs, const Map<StringName, Variant> &p_options, MeshDataResource::ColliderType collider_type, Vector3 scale);
@ -104,7 +104,7 @@ public:
Ref<Shape> scale_shape(Ref<Shape> shape, const Vector3 &scale); Ref<Shape> scale_shape(Ref<Shape> shape, const Vector3 &scale);
void save_mdr_copy_as_tres(const String &p_source_file, const Ref<MeshDataResource> &res); void save_mdr_copy_as_tres(const String &p_source_file, const Ref<MeshDataResource> &res);
void save_mdrcoll_copy_as_tres(const String &p_source_file, const Ref<MeshDataResource> &res); void save_mdrcoll_copy_as_tres(const String &p_source_file, const Ref<MeshDataResourceCollection> &res);
MDRImportPluginBase(); MDRImportPluginBase();
~MDRImportPluginBase(); ~MDRImportPluginBase();