diff --git a/plugin_collada/editor_import_collada_mdr.cpp b/plugin_collada/editor_import_collada_mdr.cpp index e0922aa..b39cda1 100644 --- a/plugin_collada/editor_import_collada_mdr.cpp +++ b/plugin_collada/editor_import_collada_mdr.cpp @@ -62,298 +62,17 @@ String EditorImportColladaMdr::get_preset_name(int p_idx) const { return ""; } -void EditorImportColladaMdr::get_import_options(List *r_options, int p_preset) const { - r_options->push_back(ImportOption(PropertyInfo(Variant::INT, "collider_type", PROPERTY_HINT_ENUM, MeshDataResource::BINDING_STRING_COLLIDER_TYPE), MeshDataResource::COLLIDER_TYPE_NONE)); - - 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 { - return true; -} - Error EditorImportColladaMdr::import(const String &p_source_file, const String &p_save_path, const Map &p_options, List *r_platform_variants, List *r_gen_files, Variant *r_metadata) { - MeshDataResource::ColliderType collider_type = static_cast(static_cast(p_options["collider_type"])); + //MeshDataResource::ColliderType collider_type = static_cast(static_cast(p_options["collider_type"])); Node *n = _importer->import_scene(p_source_file, 0, 15); - Vector3 scale = p_options["scale"]; + ERR_FAIL_COND_V(!n, Error::ERR_PARSE_ERROR); - if (n == NULL) { - n->queue_delete(); - return Error::ERR_PARSE_ERROR; - } - - for (int i = 0; i < n->get_child_count(); ++i) { - Node *c = n->get_child(i); - - if (c == NULL) { - continue; - } - - if (Object::cast_to(c)) { - MeshInstance *mi = Object::cast_to(c); - - Ref mesh = mi->get_mesh(); - - if (mesh.is_valid()) { - Ref mdr; - mdr.instance(); - - Array arrays = mesh->surface_get_arrays(0); - - mdr->set_array(apply_transforms(arrays, p_options)); - - if (collider_type == MeshDataResource::COLLIDER_TYPE_TRIMESH_COLLISION_SHAPE) { - Ref m; - m.instance(); - m->add_surface_from_arrays(Mesh::PRIMITIVE_TRIANGLES, mdr->get_array()); - - Ref shape = m->create_trimesh_shape(); - - if (!shape.is_null()) { - mdr->add_collision_shape(Transform(), scale_shape(shape, scale)); - } - } else if (collider_type == MeshDataResource::COLLIDER_TYPE_SINGLE_CONVEX_COLLISION_SHAPE) { - Ref m; - m.instance(); - m->add_surface_from_arrays(Mesh::PRIMITIVE_TRIANGLES, mdr->get_array()); - - Ref shape = mesh->create_convex_shape(); - - if (!shape.is_null()) { - } - } else if (collider_type == MeshDataResource::COLLIDER_TYPE_MULTIPLE_CONVEX_COLLISION_SHAPES) { - Ref m; - m.instance(); - m->add_surface_from_arrays(Mesh::PRIMITIVE_TRIANGLES, mdr->get_array()); - - Vector > shapes = mesh->convex_decompose(); - - for (int j = 0; j < shapes.size(); ++j) { - scale_shape(shapes[j], scale); - } - - for (int j = 0; j < shapes.size(); ++j) { - mdr->add_collision_shape(Transform(), shapes[j]); - } - } else if (collider_type == MeshDataResource::COLLIDER_TYPE_APPROXIMATED_BOX) { - Ref m; - m.instance(); - m->add_surface_from_arrays(Mesh::PRIMITIVE_TRIANGLES, mdr->get_array()); - - Ref shape; - shape.instance(); - - AABB aabb = m->get_aabb(); - Vector3 size = aabb.get_size(); - - shape->set_extents(size * 0.5); - - Vector3 pos = aabb.position; - pos += size / 2.0; - - Transform t; - t.origin = pos; - - mdr->add_collision_shape(t, shape); - } else if (collider_type == MeshDataResource::COLLIDER_TYPE_APPROXIMATED_CAPSULE) { - Ref m; - m.instance(); - m->add_surface_from_arrays(Mesh::PRIMITIVE_TRIANGLES, mdr->get_array()); - - Ref shape; - shape.instance(); - - AABB aabb = m->get_aabb(); - Vector3 size = aabb.get_size(); - - shape->set_height(size.y * 0.5); - shape->set_radius(MIN(size.x, size.z) * 0.5); - - Vector3 pos = aabb.position; - pos += size / 2.0; - - Transform t = Transform(Basis().rotated(Vector3(1, 0, 0), M_PI_2)); - t.origin = pos; - - mdr->add_collision_shape(t, shape); - } else if (collider_type == MeshDataResource::COLLIDER_TYPE_APPROXIMATED_CYLINDER) { - Ref m; - m.instance(); - m->add_surface_from_arrays(Mesh::PRIMITIVE_TRIANGLES, mdr->get_array()); - - Ref shape; - shape.instance(); - - AABB aabb = m->get_aabb(); - Vector3 size = aabb.get_size(); - - shape->set_height(size.y * 0.5); - shape->set_radius(MIN(size.x, size.z) * 0.5); - - Vector3 pos = aabb.position; - pos += size / 2.0; - - Transform t; - t.origin = pos; - - mdr->add_collision_shape(t, shape); - } else if (collider_type == MeshDataResource::COLLIDER_TYPE_APPROXIMATED_SPHERE) { - Ref m; - m.instance(); - m->add_surface_from_arrays(Mesh::PRIMITIVE_TRIANGLES, mdr->get_array()); - - Ref shape; - shape.instance(); - - AABB aabb = m->get_aabb(); - Vector3 size = aabb.get_size(); - - shape->set_radius(MIN(size.x, MIN(size.y, size.z)) * 0.5); - - Vector3 mid = aabb.get_size() / 2.0; - - Transform t; - t.origin = aabb.position + mid; - - mdr->add_collision_shape(t, shape); - } - - n->queue_delete(); - - return ResourceSaver::save(p_save_path + "." + get_save_extension(), mdr); - } - } - } + Error err = process_node(n, p_source_file, p_save_path, p_options, r_platform_variants, r_gen_files, r_metadata); n->queue_delete(); - return Error::ERR_PARSE_ERROR; -} - -Array EditorImportColladaMdr::apply_transforms(Array &array, const Map &p_options) { - Vector3 offset = p_options["offset"]; - Vector3 rotation = p_options["rotation"]; - Vector3 scale = p_options["scale"]; - - Transform transform = Transform(Basis(rotation).scaled(scale), offset); - - ERR_FAIL_COND_V(array.size() != Mesh::ARRAY_MAX, Array()); - - PoolVector3Array 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)); - } - - PoolVector3Array 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; -} - -Ref EditorImportColladaMdr::scale_shape(Ref shape, const Vector3 &scale) { - - if (shape.is_null()) - return shape; - - if (Object::cast_to(*shape)) { - - Ref ss = shape; - - ss->set_radius(ss->get_radius() * MAX(scale.x, MAX(scale.y, scale.z))); - } - - if (Object::cast_to(*shape)) { - - Ref bs = shape; - - bs->set_extents(bs->get_extents() * scale); - } - - if (Object::cast_to(*shape)) { - - Ref cs = shape; - - float sc = MAX(scale.x, MAX(scale.y, scale.z)); - - cs->set_radius(cs->get_radius() * sc); - cs->set_height(cs->get_height() * sc); - } - - if (Object::cast_to(*shape)) { - - Ref cs = shape; - - float sc = MAX(scale.x, MAX(scale.y, scale.z)); - - cs->set_radius(cs->get_radius() * sc); - cs->set_height(cs->get_height() * sc); - } - - if (Object::cast_to(*shape)) { - - Ref cps = shape; - - PoolVector3Array arr = cps->get_faces(); - - Basis b = Basis().scaled(scale); - - for (int i = 0; i < arr.size(); ++i) { - arr.set(i, b.xform(arr[i])); - } - - cps->set_faces(arr); - } - - if (Object::cast_to(*shape)) { - - Ref cps = shape; - - PoolVector3Array arr = cps->get_points(); - - Basis b = Basis().scaled(scale); - - for (int i = 0; i < arr.size(); ++i) { - arr.set(i, b.xform(arr[i])); - } - - cps->set_points(arr); - } - - return shape; + return err; } EditorImportColladaMdr::EditorImportColladaMdr() { diff --git a/plugin_collada/editor_import_collada_mdr.h b/plugin_collada/editor_import_collada_mdr.h index 6968fd1..8d5535c 100644 --- a/plugin_collada/editor_import_collada_mdr.h +++ b/plugin_collada/editor_import_collada_mdr.h @@ -23,6 +23,8 @@ SOFTWARE. #ifndef EDITOR_IMPORT_COLLADA_MDR #define EDITOR_IMPORT_COLLADA_MDR +#include "../plugin/mdr_import_plugin_base.h" + #include "core/array.h" #include "core/io/resource_saver.h" #include "core/math/basis.h" @@ -45,9 +47,8 @@ SOFTWARE. #define MeshInstance MeshInstance3D #endif -class EditorImportColladaMdr : public EditorImportPlugin { - - GDCLASS(EditorImportColladaMdr, EditorImportPlugin); +class EditorImportColladaMdr : public MDRImportPluginBase { + GDCLASS(EditorImportColladaMdr, MDRImportPluginBase); public: virtual String get_importer_name() const; @@ -60,14 +61,8 @@ public: virtual int get_preset_count() const; virtual String get_preset_name(int p_idx) const; - virtual void get_import_options(List *r_options, int p_preset = 0) const; - virtual bool get_option_visibility(const String &p_option, const Map &p_options) const; - 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); - Ref scale_shape(Ref shape, const Vector3 &scale); - EditorImportColladaMdr(); ~EditorImportColladaMdr();