diff --git a/config.pyc b/config.pyc index 69767a2..97991bd 100644 Binary files a/config.pyc and b/config.pyc differ diff --git a/meshes/editor_import_collada_mdr.cpp b/meshes/editor_import_collada_mdr.cpp index a912914..cf247c7 100644 --- a/meshes/editor_import_collada_mdr.cpp +++ b/meshes/editor_import_collada_mdr.cpp @@ -66,8 +66,10 @@ Error EditorImportColladaMdr::import(const String &p_source_file, const String & if (mesh.is_valid()) { Ref mdr; mdr.instance(); - - mdr->set_array(apply_transforms(mesh->surface_get_arrays(0), p_options)); + + Array arrays = mesh->surface_get_arrays(0); + + mdr->set_array(apply_transforms(arrays, p_options)); n->queue_delete(); @@ -82,7 +84,11 @@ 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"]); + Vector3 offset = p_options["offset"]; + Vector3 rotation = p_options["rotation"]; + Vector3 scale = p_options["scale"]; + + Transform transform = Transform(Basis(rotation).scaled(scale), offset); Array verts = array.get(Mesh::ARRAY_VERTEX); diff --git a/meshes/editor_import_collada_mdr.h b/meshes/editor_import_collada_mdr.h index 081e5e3..86ab48f 100644 --- a/meshes/editor_import_collada_mdr.h +++ b/meshes/editor_import_collada_mdr.h @@ -8,6 +8,9 @@ #include "scene/resources/mesh.h" #include "scene/3d/mesh_instance.h" #include "core/io/resource_saver.h" +#include "core/array.h" +#include "core/math/basis.h" +#include "core/math/transform.h" #include "mesh_data_resource.h" #include "editor/import/editor_import_collada.h"