From 15845efb77562479b941736491cafddddfebe406 Mon Sep 17 00:00:00 2001 From: Relintai Date: Fri, 19 Jul 2019 17:28:12 +0200 Subject: [PATCH] Now the MeshDataResource Importer can scale, rotate, and offset the imported mesh. --- meshes/editor_import_collada_mdr.cpp | 52 ++++++++++++++++++++++++++-- meshes/editor_import_collada_mdr.h | 2 ++ 2 files changed, 52 insertions(+), 2 deletions(-) diff --git a/meshes/editor_import_collada_mdr.cpp b/meshes/editor_import_collada_mdr.cpp index ce358e6..a912914 100644 --- a/meshes/editor_import_collada_mdr.cpp +++ b/meshes/editor_import_collada_mdr.cpp @@ -33,7 +33,9 @@ String EditorImportColladaMdr::get_preset_name(int p_idx) const { } void EditorImportColladaMdr::get_import_options(List *r_options, int p_preset) const { - + r_options->push_back(ImportOption(PropertyInfo(Variant::VECTOR3, "offset"), Vector3(0, 0, 0))); + r_options->push_back(ImportOption(PropertyInfo(Variant::VECTOR3, "rotation"), Vector3(0, 0, -(3.141592 / 2.0)))); + r_options->push_back(ImportOption(PropertyInfo(Variant::VECTOR3, "scale"), Vector3(0.011, 0.011, 0.011))); } bool EditorImportColladaMdr::get_option_visibility(const String &p_option, const Map &p_options) const { @@ -65,7 +67,7 @@ Error EditorImportColladaMdr::import(const String &p_source_file, const String & Ref mdr; mdr.instance(); - mdr->set_array(mesh->surface_get_arrays(0)); + mdr->set_array(apply_transforms(mesh->surface_get_arrays(0), p_options)); n->queue_delete(); @@ -79,6 +81,52 @@ Error EditorImportColladaMdr::import(const String &p_source_file, const String & } +Array EditorImportColladaMdr::apply_transforms(Array &array, const Map &p_options) { + Transform transform = Transform(Basis(p_options["rotation"]).scaled(p_options["scale"]), p_options["offset"]); + + Array verts = array.get(Mesh::ARRAY_VERTEX); + + for (int i = 0; i < verts.size(); ++i) { + Vector3 vert = verts[i]; + + vert = transform.xform(vert); + + verts.set(i, (vert)); + } + + Array normals = array.get(Mesh::ARRAY_NORMAL); + + for (int i = 0; i < normals.size(); ++i) { + Vector3 normal = normals[i]; + + normal = transform.basis.xform(normal); + + normals.set(i, normal); + } + + Array tangents = array.get(Mesh::ARRAY_TANGENT); + + if (tangents.size() == verts.size() * 4) { + + for (int i = 0; i < verts.size(); ++i) { + + Plane p(tangents[i * 4 + 0], tangents[i * 4 + 1], tangents[i * 4 + 2], tangents[i * 4 + 3]); + + Vector3 tangent = p.normal; + + tangent = transform.basis.xform(tangent); + + tangents.set(i, tangent); + } + } + + array.set(Mesh::ARRAY_VERTEX, verts); + array.set(Mesh::ARRAY_NORMAL, normals); + array.set(Mesh::ARRAY_TANGENT, tangents); + + return array; +} + EditorImportColladaMdr::EditorImportColladaMdr() { _importer.instance(); } diff --git a/meshes/editor_import_collada_mdr.h b/meshes/editor_import_collada_mdr.h index 17f393a..081e5e3 100644 --- a/meshes/editor_import_collada_mdr.h +++ b/meshes/editor_import_collada_mdr.h @@ -32,6 +32,8 @@ public: virtual Error import(const String &p_source_file, const String &p_save_path, const Map &p_options, List *r_platform_variants, List *r_gen_files = NULL, Variant *r_metadata = NULL); + Array apply_transforms(Array &array, const Map &p_options); + EditorImportColladaMdr(); ~EditorImportColladaMdr();