summaryrefslogtreecommitdiff
path: root/editor
diff options
context:
space:
mode:
Diffstat (limited to 'editor')
-rw-r--r--editor/import/resource_importer_scene.cpp189
-rw-r--r--editor/import/resource_importer_scene.h202
-rw-r--r--editor/import/scene_import_settings.cpp74
-rw-r--r--editor/import/scene_import_settings.h4
-rw-r--r--editor/import/scene_importer_mesh.cpp4
-rw-r--r--editor/import/scene_importer_mesh.h2
-rw-r--r--editor/plugins/mesh_instance_3d_editor_plugin.cpp3
7 files changed, 41 insertions, 437 deletions
diff --git a/editor/import/resource_importer_scene.cpp b/editor/import/resource_importer_scene.cpp
index f05e14c158..c2244befa1 100644
--- a/editor/import/resource_importer_scene.cpp
+++ b/editor/import/resource_importer_scene.cpp
@@ -233,14 +233,13 @@ static String _fixstr(const String &p_what, const String &p_str) {
return what;
}
-static void _pre_gen_shape_list(Ref<EditorSceneImporterMesh> &mesh, Vector<Ref<Shape3D>> &r_shape_list, bool p_convex) {
+static void _pre_gen_shape_list(const Ref<EditorSceneImporterMesh> &mesh, List<Ref<Shape3D>> &r_shape_list, bool p_convex) {
ERR_FAIL_NULL_MSG(mesh, "Cannot generate shape list with null mesh value");
if (!p_convex) {
Ref<Shape3D> shape = mesh->create_trimesh_shape();
r_shape_list.push_back(shape);
} else {
- Vector<Ref<Shape3D>> cd;
- cd.push_back(mesh->get_mesh()->create_convex_shape(true, /*Passing false, otherwise VHACD will be used to simplify (Decompose) the Mesh.*/ false));
+ Vector<Ref<Shape3D>> cd = mesh->convex_decompose();
if (cd.size()) {
for (int i = 0; i < cd.size(); i++) {
r_shape_list.push_back(cd[i]);
@@ -249,7 +248,7 @@ static void _pre_gen_shape_list(Ref<EditorSceneImporterMesh> &mesh, Vector<Ref<S
}
}
-Node *ResourceImporterScene::_pre_fix_node(Node *p_node, Node *p_root, Map<Ref<EditorSceneImporterMesh>, Vector<Ref<Shape3D>>> &collision_map) {
+Node *ResourceImporterScene::_pre_fix_node(Node *p_node, Node *p_root, Map<Ref<EditorSceneImporterMesh>, List<Ref<Shape3D>>> &collision_map) {
// children first
for (int i = 0; i < p_node->get_child_count(); i++) {
Node *r = _pre_fix_node(p_node->get_child(i), p_root, collision_map);
@@ -336,7 +335,7 @@ Node *ResourceImporterScene::_pre_fix_node(Node *p_node, Node *p_root, Map<Ref<E
Ref<EditorSceneImporterMesh> mesh = mi->get_mesh();
if (mesh.is_valid()) {
- Vector<Ref<Shape3D>> shapes;
+ List<Ref<Shape3D>> shapes;
String fixed_name;
if (collision_map.has(mesh)) {
shapes = collision_map[mesh];
@@ -407,7 +406,7 @@ Node *ResourceImporterScene::_pre_fix_node(Node *p_node, Node *p_root, Map<Ref<E
Ref<EditorSceneImporterMesh> mesh = mi->get_mesh();
if (mesh.is_valid()) {
- Vector<Ref<Shape3D>> shapes;
+ List<Ref<Shape3D>> shapes;
if (collision_map.has(mesh)) {
shapes = collision_map[mesh];
} else {
@@ -432,7 +431,7 @@ Node *ResourceImporterScene::_pre_fix_node(Node *p_node, Node *p_root, Map<Ref<E
Ref<EditorSceneImporterMesh> mesh = mi->get_mesh();
if (mesh.is_valid()) {
- Vector<Ref<Shape3D>> shapes;
+ List<Ref<Shape3D>> shapes;
String fixed_name;
if (collision_map.has(mesh)) {
shapes = collision_map[mesh];
@@ -491,7 +490,7 @@ Node *ResourceImporterScene::_pre_fix_node(Node *p_node, Node *p_root, Map<Ref<E
Ref<EditorSceneImporterMesh> mesh = mi->get_mesh();
if (!mesh.is_null()) {
- Vector<Ref<Shape3D>> shapes;
+ List<Ref<Shape3D>> shapes;
if (collision_map.has(mesh)) {
shapes = collision_map[mesh];
} else if (_teststr(mesh->get_name(), "col")) {
@@ -517,7 +516,7 @@ Node *ResourceImporterScene::_pre_fix_node(Node *p_node, Node *p_root, Map<Ref<E
return p_node;
}
-Node *ResourceImporterScene::_post_fix_node(Node *p_node, Node *p_root, Map<Ref<EditorSceneImporterMesh>, Vector<Ref<Shape3D>>> &collision_map, Set<Ref<EditorSceneImporterMesh>> &r_scanned_meshes, const Dictionary &p_node_data, const Dictionary &p_material_data, const Dictionary &p_animation_data, float p_animation_fps) {
+Node *ResourceImporterScene::_post_fix_node(Node *p_node, Node *p_root, Map<Ref<EditorSceneImporterMesh>, List<Ref<Shape3D>>> &collision_map, Set<Ref<EditorSceneImporterMesh>> &r_scanned_meshes, const Dictionary &p_node_data, const Dictionary &p_material_data, const Dictionary &p_animation_data, float p_animation_fps) {
// children first
for (int i = 0; i < p_node->get_child_count(); i++) {
Node *r = _post_fix_node(p_node->get_child(i), p_root, collision_map, r_scanned_meshes, p_node_data, p_material_data, p_animation_data, p_animation_fps);
@@ -580,35 +579,28 @@ Node *ResourceImporterScene::_post_fix_node(Node *p_node, Node *p_root, Map<Ref<
}
if (node_settings.has("generate/physics")) {
- int mesh_physics_mode = MeshPhysicsMode::MESH_PHYSICS_DISABLED;
-
- const bool generate_collider = node_settings["generate/physics"];
- if (generate_collider) {
- mesh_physics_mode = MeshPhysicsMode::MESH_PHYSICS_MESH_AND_STATIC_COLLIDER;
- if (node_settings.has("physics/body_type")) {
- const BodyType body_type = (BodyType)node_settings["physics/body_type"].operator int();
- switch (body_type) {
- case BODY_TYPE_STATIC:
- mesh_physics_mode = MeshPhysicsMode::MESH_PHYSICS_MESH_AND_STATIC_COLLIDER;
- break;
- case BODY_TYPE_DYNAMIC:
- mesh_physics_mode = MeshPhysicsMode::MESH_PHYSICS_RIGID_BODY_AND_MESH;
- break;
- case BODY_TYPE_AREA:
- mesh_physics_mode = MeshPhysicsMode::MESH_PHYSICS_AREA_ONLY;
- break;
- }
- }
- }
+ int mesh_physics_mode = node_settings["generate/physics"];
+
+ if (mesh_physics_mode != MESH_PHYSICS_DISABLED) {
+ List<Ref<Shape3D>> shapes;
- if (mesh_physics_mode != MeshPhysicsMode::MESH_PHYSICS_DISABLED) {
- Vector<Ref<Shape3D>> shapes;
if (collision_map.has(m)) {
shapes = collision_map[m];
} else {
- shapes = get_collision_shapes(
- m->get_mesh(),
- node_settings);
+ switch (mesh_physics_mode) {
+ case MESH_PHYSICS_MESH_AND_STATIC_COLLIDER: {
+ _pre_gen_shape_list(m, shapes, false);
+ } break;
+ case MESH_PHYSICS_RIGID_BODY_AND_MESH: {
+ _pre_gen_shape_list(m, shapes, true);
+ } break;
+ case MESH_PHYSICS_STATIC_COLLIDER_ONLY: {
+ _pre_gen_shape_list(m, shapes, false);
+ } break;
+ case MESH_PHYSICS_AREA_ONLY: {
+ _pre_gen_shape_list(m, shapes, true);
+ } break;
+ }
}
if (shapes.size()) {
@@ -617,15 +609,13 @@ Node *ResourceImporterScene::_post_fix_node(Node *p_node, Node *p_root, Map<Ref<
case MESH_PHYSICS_MESH_AND_STATIC_COLLIDER: {
StaticBody3D *col = memnew(StaticBody3D);
p_node->add_child(col);
- col->set_owner(p_node->get_owner());
- col->set_transform(get_collision_shapes_transform(node_settings));
base = col;
} break;
case MESH_PHYSICS_RIGID_BODY_AND_MESH: {
RigidBody3D *rigid_body = memnew(RigidBody3D);
rigid_body->set_name(p_node->get_name());
p_node->replace_by(rigid_body);
- rigid_body->set_transform(mi->get_transform() * get_collision_shapes_transform(node_settings));
+ rigid_body->set_transform(mi->get_transform());
p_node = rigid_body;
mi->set_transform(Transform3D());
rigid_body->add_child(mi);
@@ -634,7 +624,7 @@ Node *ResourceImporterScene::_post_fix_node(Node *p_node, Node *p_root, Map<Ref<
} break;
case MESH_PHYSICS_STATIC_COLLIDER_ONLY: {
StaticBody3D *col = memnew(StaticBody3D);
- col->set_transform(mi->get_transform() * get_collision_shapes_transform(node_settings));
+ col->set_transform(mi->get_transform());
col->set_name(p_node->get_name());
p_node->replace_by(col);
memdelete(p_node);
@@ -643,7 +633,7 @@ Node *ResourceImporterScene::_post_fix_node(Node *p_node, Node *p_root, Map<Ref<
} break;
case MESH_PHYSICS_AREA_ONLY: {
Area3D *area = memnew(Area3D);
- area->set_transform(mi->get_transform() * get_collision_shapes_transform(node_settings));
+ area->set_transform(mi->get_transform());
area->set_name(p_node->get_name());
p_node->replace_by(area);
memdelete(p_node);
@@ -943,35 +933,8 @@ void ResourceImporterScene::get_internal_import_options(InternalImportCategory p
} break;
case INTERNAL_IMPORT_CATEGORY_MESH_3D_NODE: {
r_options->push_back(ImportOption(PropertyInfo(Variant::BOOL, "import/skip_import", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_UPDATE_ALL_IF_MODIFIED), false));
- r_options->push_back(ImportOption(PropertyInfo(Variant::BOOL, "generate/physics", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_UPDATE_ALL_IF_MODIFIED), false));
+ r_options->push_back(ImportOption(PropertyInfo(Variant::INT, "generate/physics", PROPERTY_HINT_ENUM, "Disabled,Mesh + Static Collider,Rigid Body + Mesh,Static Collider Only,Area Only"), 0));
r_options->push_back(ImportOption(PropertyInfo(Variant::INT, "generate/navmesh", PROPERTY_HINT_ENUM, "Disabled,Mesh + NavMesh,NavMesh Only"), 0));
- r_options->push_back(ImportOption(PropertyInfo(Variant::INT, "physics/body_type", PROPERTY_HINT_ENUM, "Static,Dynamic,Area"), 0));
- r_options->push_back(ImportOption(PropertyInfo(Variant::INT, "physics/shape_type", PROPERTY_HINT_ENUM, "Decompose Convex,Simple Convex,Trimesh,Box,Sphere,Cylinder,Capsule", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_UPDATE_ALL_IF_MODIFIED), 0));
-
- // Decomposition
- Mesh::ConvexDecompositionSettings decomposition_default;
- r_options->push_back(ImportOption(PropertyInfo(Variant::BOOL, "decomposition/advanced", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_UPDATE_ALL_IF_MODIFIED), false));
- r_options->push_back(ImportOption(PropertyInfo(Variant::INT, "decomposition/precision", PROPERTY_HINT_RANGE, "1,10,1", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_UPDATE_ALL_IF_MODIFIED), 5));
- r_options->push_back(ImportOption(PropertyInfo(Variant::FLOAT, "decomposition/max_concavity", PROPERTY_HINT_RANGE, "0.0,1.0,0.001", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_UPDATE_ALL_IF_MODIFIED), decomposition_default.max_concavity));
- r_options->push_back(ImportOption(PropertyInfo(Variant::FLOAT, "decomposition/symmetry_planes_clipping_bias", PROPERTY_HINT_RANGE, "0.0,1.0,0.001", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_UPDATE_ALL_IF_MODIFIED), decomposition_default.symmetry_planes_clipping_bias));
- r_options->push_back(ImportOption(PropertyInfo(Variant::FLOAT, "decomposition/revolution_axes_clipping_bias", PROPERTY_HINT_RANGE, "0.0,1.0,0.001", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_UPDATE_ALL_IF_MODIFIED), decomposition_default.revolution_axes_clipping_bias));
- r_options->push_back(ImportOption(PropertyInfo(Variant::FLOAT, "decomposition/min_volume_per_convex_hull", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_UPDATE_ALL_IF_MODIFIED), decomposition_default.min_volume_per_convex_hull));
- r_options->push_back(ImportOption(PropertyInfo(Variant::INT, "decomposition/resolution", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_UPDATE_ALL_IF_MODIFIED), decomposition_default.resolution));
- r_options->push_back(ImportOption(PropertyInfo(Variant::INT, "decomposition/max_num_vertices_per_convex_hull", PROPERTY_HINT_RANGE, "5,512,1", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_UPDATE_ALL_IF_MODIFIED), decomposition_default.max_num_vertices_per_convex_hull));
- r_options->push_back(ImportOption(PropertyInfo(Variant::INT, "decomposition/plane_downsampling", PROPERTY_HINT_RANGE, "1,16,1", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_UPDATE_ALL_IF_MODIFIED), decomposition_default.plane_downsampling));
- r_options->push_back(ImportOption(PropertyInfo(Variant::INT, "decomposition/convexhull_downsampling", PROPERTY_HINT_RANGE, "1,16,1", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_UPDATE_ALL_IF_MODIFIED), decomposition_default.convexhull_downsampling));
- r_options->push_back(ImportOption(PropertyInfo(Variant::BOOL, "decomposition/normalize_mesh", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_UPDATE_ALL_IF_MODIFIED), decomposition_default.normalize_mesh));
- r_options->push_back(ImportOption(PropertyInfo(Variant::INT, "decomposition/mode", PROPERTY_HINT_ENUM, "Voxel,Tetrahedron", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_UPDATE_ALL_IF_MODIFIED), static_cast<int>(decomposition_default.mode)));
- r_options->push_back(ImportOption(PropertyInfo(Variant::BOOL, "decomposition/convexhull_approximation", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_UPDATE_ALL_IF_MODIFIED), decomposition_default.convexhull_approximation));
- r_options->push_back(ImportOption(PropertyInfo(Variant::INT, "decomposition/max_convex_hulls", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_UPDATE_ALL_IF_MODIFIED), decomposition_default.max_convex_hulls));
- r_options->push_back(ImportOption(PropertyInfo(Variant::BOOL, "decomposition/project_hull_vertices", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_UPDATE_ALL_IF_MODIFIED), decomposition_default.project_hull_vertices));
-
- // Primitives: Box, Sphere, Cylinder, Capsule.
- r_options->push_back(ImportOption(PropertyInfo(Variant::VECTOR3, "primitive/size", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_UPDATE_ALL_IF_MODIFIED), Vector3(2.0, 2.0, 2.0)));
- r_options->push_back(ImportOption(PropertyInfo(Variant::FLOAT, "primitive/height", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_UPDATE_ALL_IF_MODIFIED), 1.0));
- r_options->push_back(ImportOption(PropertyInfo(Variant::FLOAT, "primitive/radius", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_UPDATE_ALL_IF_MODIFIED), 1.0));
- r_options->push_back(ImportOption(PropertyInfo(Variant::VECTOR3, "primitive/position", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_UPDATE_ALL_IF_MODIFIED), Vector3()));
- r_options->push_back(ImportOption(PropertyInfo(Variant::VECTOR3, "primitive/rotation", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_UPDATE_ALL_IF_MODIFIED), Vector3()));
} break;
case INTERNAL_IMPORT_CATEGORY_MESH: {
r_options->push_back(ImportOption(PropertyInfo(Variant::BOOL, "save_to_file/enabled", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_UPDATE_ALL_IF_MODIFIED), false));
@@ -1022,65 +985,6 @@ bool ResourceImporterScene::get_internal_option_visibility(InternalImportCategor
case INTERNAL_IMPORT_CATEGORY_NODE: {
} break;
case INTERNAL_IMPORT_CATEGORY_MESH_3D_NODE: {
- const bool generate_physics =
- p_options.has("generate/physics") &&
- p_options["generate/physics"].operator bool();
-
- if (
- p_option == "physics/body_type" ||
- p_option == "physics/shape_type") {
- // Show if need to generate collisions.
- return generate_physics;
- }
-
- if (p_option.find("decomposition/") >= 0) {
- // Show if need to generate collisions.
- if (generate_physics &&
- // Show if convex is enabled.
- p_options["physics/shape_type"] == Variant(SHAPE_TYPE_DECOMPOSE_CONVEX)) {
- if (p_option == "decomposition/advanced") {
- return true;
- }
-
- const bool decomposition_advanced =
- p_options.has("decomposition/advanced") &&
- p_options["decomposition/advanced"].operator bool();
-
- if (p_option == "decomposition/precision") {
- return !decomposition_advanced;
- } else {
- return decomposition_advanced;
- }
- }
-
- return false;
- }
-
- if (p_option == "primitive/position" || p_option == "primitive/rotation") {
- const ShapeType physics_shape = (ShapeType)p_options["physics/shape_type"].operator int();
- return generate_physics &&
- physics_shape >= SHAPE_TYPE_BOX;
- }
-
- if (p_option == "primitive/size") {
- const ShapeType physics_shape = (ShapeType)p_options["physics/shape_type"].operator int();
- return generate_physics &&
- physics_shape == SHAPE_TYPE_BOX;
- }
-
- if (p_option == "primitive/radius") {
- const ShapeType physics_shape = (ShapeType)p_options["physics/shape_type"].operator int();
- return generate_physics && (physics_shape == SHAPE_TYPE_SPHERE ||
- physics_shape == SHAPE_TYPE_CYLINDER ||
- physics_shape == SHAPE_TYPE_CAPSULE);
- }
-
- if (p_option == "primitive/height") {
- const ShapeType physics_shape = (ShapeType)p_options["physics/shape_type"].operator int();
- return generate_physics &&
- (physics_shape == SHAPE_TYPE_CYLINDER ||
- physics_shape == SHAPE_TYPE_CAPSULE);
- }
} break;
case INTERNAL_IMPORT_CATEGORY_MESH: {
if (p_option == "save_to_file/path" || p_option == "save_to_file/make_streamable") {
@@ -1117,33 +1021,6 @@ bool ResourceImporterScene::get_internal_option_visibility(InternalImportCategor
return true;
}
-bool ResourceImporterScene::get_internal_option_update_view(InternalImportCategory p_category, const String &p_option, const Map<StringName, Variant> &p_options) const {
- switch (p_category) {
- case INTERNAL_IMPORT_CATEGORY_NODE: {
- } break;
- case INTERNAL_IMPORT_CATEGORY_MESH_3D_NODE: {
- if (
- p_option == "generate/physics" ||
- p_option == "physics/shape_type" ||
- p_option.find("decomposition/") >= 0 ||
- p_option.find("primitive/") >= 0) {
- return true;
- }
- } break;
- case INTERNAL_IMPORT_CATEGORY_MESH: {
- } break;
- case INTERNAL_IMPORT_CATEGORY_MATERIAL: {
- } break;
- case INTERNAL_IMPORT_CATEGORY_ANIMATION: {
- } break;
- case INTERNAL_IMPORT_CATEGORY_ANIMATION_NODE: {
- } break;
- default: {
- }
- }
- return false;
-}
-
void ResourceImporterScene::get_import_options(List<ImportOption> *r_options, int p_preset) const {
r_options->push_back(ImportOption(PropertyInfo(Variant::STRING, "nodes/root_type", PROPERTY_HINT_TYPE_STRING, "Node"), "Node3D"));
r_options->push_back(ImportOption(PropertyInfo(Variant::STRING, "nodes/root_name"), "Scene Root"));
@@ -1398,7 +1275,7 @@ void ResourceImporterScene::_generate_meshes(Node *p_node, const Dictionary &p_m
}
}
-void ResourceImporterScene::_add_shapes(Node *p_node, const Vector<Ref<Shape3D>> &p_shapes) {
+void ResourceImporterScene::_add_shapes(Node *p_node, const List<Ref<Shape3D>> &p_shapes) {
for (const Ref<Shape3D> &E : p_shapes) {
CollisionShape3D *cshape = memnew(CollisionShape3D);
cshape->set_shape(E);
@@ -1439,7 +1316,7 @@ Node *ResourceImporterScene::pre_import(const String &p_source_file) {
return nullptr;
}
- Map<Ref<EditorSceneImporterMesh>, Vector<Ref<Shape3D>>> collision_map;
+ Map<Ref<EditorSceneImporterMesh>, List<Ref<Shape3D>>> collision_map;
_pre_fix_node(scene, scene, collision_map);
@@ -1515,7 +1392,7 @@ Error ResourceImporterScene::import(const String &p_source_file, const String &p
}
Set<Ref<EditorSceneImporterMesh>> scanned_meshes;
- Map<Ref<EditorSceneImporterMesh>, Vector<Ref<Shape3D>>> collision_map;
+ Map<Ref<EditorSceneImporterMesh>, List<Ref<Shape3D>>> collision_map;
_pre_fix_node(scene, scene, collision_map);
_post_fix_node(scene, scene, collision_map, scanned_meshes, node_data, material_data, animation_data, fps);
diff --git a/editor/import/resource_importer_scene.h b/editor/import/resource_importer_scene.h
index a33f2aec8c..542959be02 100644
--- a/editor/import/resource_importer_scene.h
+++ b/editor/import/resource_importer_scene.h
@@ -63,6 +63,7 @@ public:
IMPORT_FAIL_ON_MISSING_DEPENDENCIES = 4,
IMPORT_GENERATE_TANGENT_ARRAYS = 8,
IMPORT_USE_NAMED_SKIN_BINDS = 16,
+
};
virtual uint32_t get_import_flags() const;
@@ -124,25 +125,9 @@ class ResourceImporterScene : public ResourceImporter {
MESH_OVERRIDE_DISABLE,
};
- enum BodyType {
- BODY_TYPE_STATIC,
- BODY_TYPE_DYNAMIC,
- BODY_TYPE_AREA
- };
-
- enum ShapeType {
- SHAPE_TYPE_DECOMPOSE_CONVEX,
- SHAPE_TYPE_SIMPLE_CONVEX,
- SHAPE_TYPE_TRIMESH,
- SHAPE_TYPE_BOX,
- SHAPE_TYPE_SPHERE,
- SHAPE_TYPE_CYLINDER,
- SHAPE_TYPE_CAPSULE,
- };
-
void _replace_owner(Node *p_node, Node *p_scene, Node *p_new_owner);
void _generate_meshes(Node *p_node, const Dictionary &p_mesh_data, bool p_generate_lods, bool p_create_shadow_meshes, LightBakeMode p_light_bake_mode, float p_lightmap_texel_size, const Vector<uint8_t> &p_src_lightmap_cache, Vector<Vector<uint8_t>> &r_lightmap_caches);
- void _add_shapes(Node *p_node, const Vector<Ref<Shape3D>> &p_shapes);
+ void _add_shapes(Node *p_node, const List<Ref<Shape3D>> &p_shapes);
public:
static ResourceImporterScene *get_singleton() { return singleton; }
@@ -174,15 +159,14 @@ public:
void get_internal_import_options(InternalImportCategory p_category, List<ImportOption> *r_options) const;
bool get_internal_option_visibility(InternalImportCategory p_category, const String &p_option, const Map<StringName, Variant> &p_options) const;
- bool get_internal_option_update_view(InternalImportCategory p_category, const String &p_option, const Map<StringName, Variant> &p_options) const;
virtual void get_import_options(List<ImportOption> *r_options, int p_preset = 0) const override;
virtual bool get_option_visibility(const String &p_option, const Map<StringName, Variant> &p_options) const override;
// Import scenes *after* everything else (such as textures).
virtual int get_import_order() const override { return ResourceImporter::IMPORT_ORDER_SCENE; }
- Node *_pre_fix_node(Node *p_node, Node *p_root, Map<Ref<EditorSceneImporterMesh>, Vector<Ref<Shape3D>>> &collision_map);
- Node *_post_fix_node(Node *p_node, Node *p_root, Map<Ref<EditorSceneImporterMesh>, Vector<Ref<Shape3D>>> &collision_map, Set<Ref<EditorSceneImporterMesh>> &r_scanned_meshes, const Dictionary &p_node_data, const Dictionary &p_material_data, const Dictionary &p_animation_data, float p_animation_fps);
+ Node *_pre_fix_node(Node *p_node, Node *p_root, Map<Ref<EditorSceneImporterMesh>, List<Ref<Shape3D>>> &collision_map);
+ Node *_post_fix_node(Node *p_node, Node *p_root, Map<Ref<EditorSceneImporterMesh>, List<Ref<Shape3D>>> &collision_map, Set<Ref<EditorSceneImporterMesh>> &r_scanned_meshes, const Dictionary &p_node_data, const Dictionary &p_material_data, const Dictionary &p_animation_data, float p_animation_fps);
Ref<Animation> _save_animation_to_file(Ref<Animation> anim, bool p_save_to_file, String p_save_to_path, bool p_keep_custom_tracks);
void _create_clips(AnimationPlayer *anim, const Array &p_clips, bool p_bake_all);
@@ -200,12 +184,6 @@ public:
virtual bool can_import_threaded() const override { return false; }
ResourceImporterScene();
-
- template <class M>
- static Vector<Ref<Shape3D>> get_collision_shapes(const Ref<Mesh> &p_mesh, const M &p_options);
-
- template <class M>
- static Transform3D get_collision_shapes_transform(const M &p_options);
};
class EditorSceneImporterESCN : public EditorSceneImporter {
@@ -218,176 +196,4 @@ public:
virtual Ref<Animation> import_animation(const String &p_path, uint32_t p_flags, int p_bake_fps) override;
};
-#include "scene/resources/box_shape_3d.h"
-#include "scene/resources/capsule_shape_3d.h"
-#include "scene/resources/cylinder_shape_3d.h"
-#include "scene/resources/sphere_shape_3d.h"
-
-template <class M>
-Vector<Ref<Shape3D>> ResourceImporterScene::get_collision_shapes(const Ref<Mesh> &p_mesh, const M &p_options) {
- ShapeType generate_shape_type = SHAPE_TYPE_DECOMPOSE_CONVEX;
- if (p_options.has(SNAME("physics/shape_type"))) {
- generate_shape_type = (ShapeType)p_options[SNAME("physics/shape_type")].operator int();
- }
-
- if (generate_shape_type == SHAPE_TYPE_DECOMPOSE_CONVEX) {
- Mesh::ConvexDecompositionSettings decomposition_settings;
- bool advanced = false;
- if (p_options.has(SNAME("decomposition/advanced"))) {
- advanced = p_options[SNAME("decomposition/advanced")];
- }
-
- if (advanced) {
- if (p_options.has(SNAME("decomposition/max_concavity"))) {
- decomposition_settings.max_concavity = p_options[SNAME("decomposition/max_concavity")];
- }
-
- if (p_options.has(SNAME("decomposition/symmetry_planes_clipping_bias"))) {
- decomposition_settings.symmetry_planes_clipping_bias = p_options[SNAME("decomposition/symmetry_planes_clipping_bias")];
- }
-
- if (p_options.has(SNAME("decomposition/revolution_axes_clipping_bias"))) {
- decomposition_settings.revolution_axes_clipping_bias = p_options[SNAME("decomposition/revolution_axes_clipping_bias")];
- }
-
- if (p_options.has(SNAME("decomposition/min_volume_per_convex_hull"))) {
- decomposition_settings.min_volume_per_convex_hull = p_options[SNAME("decomposition/min_volume_per_convex_hull")];
- }
-
- if (p_options.has(SNAME("decomposition/resolution"))) {
- decomposition_settings.resolution = p_options[SNAME("decomposition/resolution")];
- }
-
- if (p_options.has(SNAME("decomposition/max_num_vertices_per_convex_hull"))) {
- decomposition_settings.max_num_vertices_per_convex_hull = p_options[SNAME("decomposition/max_num_vertices_per_convex_hull")];
- }
-
- if (p_options.has(SNAME("decomposition/plane_downsampling"))) {
- decomposition_settings.plane_downsampling = p_options[SNAME("decomposition/plane_downsampling")];
- }
-
- if (p_options.has(SNAME("decomposition/convexhull_downsampling"))) {
- decomposition_settings.convexhull_downsampling = p_options[SNAME("decomposition/convexhull_downsampling")];
- }
-
- if (p_options.has(SNAME("decomposition/normalize_mesh"))) {
- decomposition_settings.normalize_mesh = p_options[SNAME("decomposition/normalize_mesh")];
- }
-
- if (p_options.has(SNAME("decomposition/mode"))) {
- decomposition_settings.mode = (Mesh::ConvexDecompositionSettings::Mode)p_options[SNAME("decomposition/mode")].operator int();
- }
-
- if (p_options.has(SNAME("decomposition/convexhull_approximation"))) {
- decomposition_settings.convexhull_approximation = p_options[SNAME("decomposition/convexhull_approximation")];
- }
-
- if (p_options.has(SNAME("decomposition/max_convex_hulls"))) {
- decomposition_settings.max_convex_hulls = p_options[SNAME("decomposition/max_convex_hulls")];
- }
-
- if (p_options.has(SNAME("decomposition/project_hull_vertices"))) {
- decomposition_settings.project_hull_vertices = p_options[SNAME("decomposition/project_hull_vertices")];
- }
- } else {
- int precision_level = 5;
- if (p_options.has(SNAME("decomposition/precision"))) {
- precision_level = p_options[SNAME("decomposition/precision")];
- }
-
- const real_t precision = real_t(precision_level - 1) / 9.0;
-
- decomposition_settings.max_concavity = Math::lerp(real_t(1.0), real_t(0.001), precision);
- decomposition_settings.min_volume_per_convex_hull = Math::lerp(real_t(0.01), real_t(0.0001), precision);
- decomposition_settings.resolution = Math::lerp(10'000, 100'000, precision);
- decomposition_settings.max_num_vertices_per_convex_hull = Math::lerp(32, 64, precision);
- decomposition_settings.plane_downsampling = Math::lerp(3, 16, precision);
- decomposition_settings.convexhull_downsampling = Math::lerp(3, 16, precision);
- decomposition_settings.max_convex_hulls = Math::lerp(1, 32, precision);
- }
-
- return p_mesh->convex_decompose(decomposition_settings);
- } else if (generate_shape_type == SHAPE_TYPE_SIMPLE_CONVEX) {
- Vector<Ref<Shape3D>> shapes;
- shapes.push_back(p_mesh->create_convex_shape(true, /*Passing false, otherwise VHACD will be used to simplify (Decompose) the Mesh.*/ false));
- return shapes;
- } else if (generate_shape_type == SHAPE_TYPE_TRIMESH) {
- Vector<Ref<Shape3D>> shapes;
- shapes.push_back(p_mesh->create_trimesh_shape());
- return shapes;
- } else if (generate_shape_type == SHAPE_TYPE_BOX) {
- Ref<BoxShape3D> box;
- box.instantiate();
- if (p_options.has(SNAME("primitive/size"))) {
- box->set_size(p_options[SNAME("primitive/size")]);
- }
-
- Vector<Ref<Shape3D>> shapes;
- shapes.push_back(box);
- return shapes;
-
- } else if (generate_shape_type == SHAPE_TYPE_SPHERE) {
- Ref<SphereShape3D> sphere;
- sphere.instantiate();
- if (p_options.has(SNAME("primitive/radius"))) {
- sphere->set_radius(p_options[SNAME("primitive/radius")]);
- }
-
- Vector<Ref<Shape3D>> shapes;
- shapes.push_back(sphere);
- return shapes;
- } else if (generate_shape_type == SHAPE_TYPE_CYLINDER) {
- Ref<CylinderShape3D> cylinder;
- cylinder.instantiate();
- if (p_options.has(SNAME("primitive/height"))) {
- cylinder->set_height(p_options[SNAME("primitive/height")]);
- }
- if (p_options.has(SNAME("primitive/radius"))) {
- cylinder->set_radius(p_options[SNAME("primitive/radius")]);
- }
-
- Vector<Ref<Shape3D>> shapes;
- shapes.push_back(cylinder);
- return shapes;
- } else if (generate_shape_type == SHAPE_TYPE_CAPSULE) {
- Ref<CapsuleShape3D> capsule;
- capsule.instantiate();
- if (p_options.has(SNAME("primitive/height"))) {
- capsule->set_height(p_options[SNAME("primitive/height")]);
- }
- if (p_options.has(SNAME("primitive/radius"))) {
- capsule->set_radius(p_options[SNAME("primitive/radius")]);
- }
-
- Vector<Ref<Shape3D>> shapes;
- shapes.push_back(capsule);
- return shapes;
- }
- return Vector<Ref<Shape3D>>();
-}
-
-template <class M>
-Transform3D ResourceImporterScene::get_collision_shapes_transform(const M &p_options) {
- Transform3D transform;
-
- ShapeType generate_shape_type = SHAPE_TYPE_DECOMPOSE_CONVEX;
- if (p_options.has(SNAME("physics/shape_type"))) {
- generate_shape_type = (ShapeType)p_options[SNAME("physics/shape_type")].operator int();
- }
-
- if (generate_shape_type == SHAPE_TYPE_BOX ||
- generate_shape_type == SHAPE_TYPE_SPHERE ||
- generate_shape_type == SHAPE_TYPE_CYLINDER ||
- generate_shape_type == SHAPE_TYPE_CAPSULE) {
- if (p_options.has(SNAME("primitive/position"))) {
- transform.origin = p_options[SNAME("primitive/position")];
- }
-
- if (p_options.has(SNAME("primitive/rotation"))) {
- transform.basis.set_euler((p_options[SNAME("primitive/rotation")].operator Vector3() / 180.0) * Math_PI);
- }
- }
- return transform;
-}
-
#endif // RESOURCEIMPORTERSCENE_H
diff --git a/editor/import/scene_import_settings.cpp b/editor/import/scene_import_settings.cpp
index 372f73de9c..19a8f209bb 100644
--- a/editor/import/scene_import_settings.cpp
+++ b/editor/import/scene_import_settings.cpp
@@ -53,11 +53,6 @@ class SceneImportSettingsData : public Object {
}
current[p_name] = p_value;
-
- if (ResourceImporterScene::get_singleton()->get_internal_option_update_view(category, p_name, current)) {
- SceneImportSettings::get_singleton()->update_view();
- }
-
return true;
}
return false;
@@ -322,13 +317,6 @@ void SceneImportSettings::_fill_scene(Node *p_node, TreeItem *p_parent_item) {
if (mesh_node && mesh_node->get_mesh().is_valid()) {
_fill_mesh(scene_tree, mesh_node->get_mesh(), item);
- // Add the collider view.
- MeshInstance3D *collider_view = memnew(MeshInstance3D);
- collider_view->set_name("collider_view");
- collider_view->set_visible(false);
- mesh_node->add_child(collider_view);
- collider_view->set_owner(mesh_node);
-
Transform3D accum_xform;
Node3D *base = mesh_node;
while (base) {
@@ -358,54 +346,6 @@ void SceneImportSettings::_update_scene() {
_fill_scene(scene, nullptr);
}
-void SceneImportSettings::_update_view_gizmos() {
- for (const KeyValue<String, NodeData> &e : node_map) {
- bool generate_collider = false;
- if (e.value.settings.has(SNAME("generate/physics"))) {
- generate_collider = e.value.settings[SNAME("generate/physics")];
- }
-
- MeshInstance3D *mesh_node = Object::cast_to<MeshInstance3D>(e.value.node);
- if (mesh_node == nullptr || mesh_node->get_mesh().is_null()) {
- // Nothing to do
- continue;
- }
-
- MeshInstance3D *collider_view = static_cast<MeshInstance3D *>(mesh_node->find_node("collider_view"));
- CRASH_COND_MSG(collider_view == nullptr, "This is unreachable, since the collider view is always created even when the collision is not used! If this is triggered there is a bug on the function `_fill_scene`.");
-
- collider_view->set_visible(generate_collider);
- if (generate_collider) {
- // This collider_view doesn't have a mesh so we need to generate a new one.
-
- // Generate the mesh collider.
- Vector<Ref<Shape3D>> shapes = ResourceImporterScene::get_collision_shapes(mesh_node->get_mesh(), e.value.settings);
- const Transform3D transform = ResourceImporterScene::get_collision_shapes_transform(e.value.settings);
-
- Ref<ArrayMesh> collider_view_mesh;
- collider_view_mesh.instantiate();
- for (Ref<Shape3D> shape : shapes) {
- Ref<ArrayMesh> debug_shape_mesh;
- if (shape.is_valid()) {
- debug_shape_mesh = shape->get_debug_mesh();
- }
- if (debug_shape_mesh.is_valid()) {
- collider_view_mesh->add_surface_from_arrays(
- debug_shape_mesh->surface_get_primitive_type(0),
- debug_shape_mesh->surface_get_arrays(0));
-
- collider_view_mesh->surface_set_material(
- collider_view_mesh->get_surface_count() - 1,
- collider_mat);
- }
- }
-
- collider_view->set_mesh(collider_view_mesh);
- collider_view->set_transform(transform);
- }
- }
-}
-
void SceneImportSettings::_update_camera() {
AABB camera_aabb;
@@ -464,16 +404,11 @@ void SceneImportSettings::_load_default_subresource_settings(Map<StringName, Var
}
}
-void SceneImportSettings::update_view() {
- _update_view_gizmos();
-}
-
void SceneImportSettings::open_settings(const String &p_path) {
if (scene) {
memdelete(scene);
scene = nullptr;
}
- scene_import_settings_data->settings = nullptr;
scene = ResourceImporterScene::get_singleton()->pre_import(p_path);
if (scene == nullptr) {
EditorNode::get_singleton()->show_warning(TTR("Error opening scene"));
@@ -528,7 +463,6 @@ void SceneImportSettings::open_settings(const String &p_path) {
}
popup_centered_ratio();
- _update_view_gizmos();
_update_camera();
set_title(vformat(TTR("Advanced Import Settings for '%s'"), base_path.get_file()));
@@ -695,7 +629,6 @@ void SceneImportSettings::_material_tree_selected() {
_select(material_tree, type, import_id);
}
-
void SceneImportSettings::_mesh_tree_selected() {
if (selecting) {
return;
@@ -707,7 +640,6 @@ void SceneImportSettings::_mesh_tree_selected() {
_select(mesh_tree, type, import_id);
}
-
void SceneImportSettings::_scene_tree_selected() {
if (selecting) {
return;
@@ -1212,12 +1144,6 @@ SceneImportSettings::SceneImportSettings() {
material_preview.instantiate();
}
- {
- collider_mat.instantiate();
- collider_mat->set_shading_mode(StandardMaterial3D::SHADING_MODE_UNSHADED);
- collider_mat->set_albedo(Color(0.5, 0.5, 1.0));
- }
-
inspector = memnew(EditorInspector);
inspector->set_custom_minimum_size(Size2(300 * EDSCALE, 0));
diff --git a/editor/import/scene_import_settings.h b/editor/import/scene_import_settings.h
index c7c94af493..ddcf4a6d5d 100644
--- a/editor/import/scene_import_settings.h
+++ b/editor/import/scene_import_settings.h
@@ -84,8 +84,6 @@ class SceneImportSettings : public ConfirmationDialog {
MeshInstance3D *mesh_preview;
Ref<SphereMesh> material_preview;
- Ref<StandardMaterial3D> collider_mat;
-
float cam_rot_x;
float cam_rot_y;
float cam_zoom;
@@ -147,7 +145,6 @@ class SceneImportSettings : public ConfirmationDialog {
bool selecting = false;
- void _update_view_gizmos();
void _update_camera();
void _select(Tree *p_from, String p_type, String p_id);
void _material_tree_selected();
@@ -193,7 +190,6 @@ protected:
void _notification(int p_what);
public:
- void update_view();
void open_settings(const String &p_path);
static SceneImportSettings *get_singleton();
SceneImportSettings();
diff --git a/editor/import/scene_importer_mesh.cpp b/editor/import/scene_importer_mesh.cpp
index 4e7e0957cf..06f373c54f 100644
--- a/editor/import/scene_importer_mesh.cpp
+++ b/editor/import/scene_importer_mesh.cpp
@@ -508,12 +508,12 @@ Vector<Face3> EditorSceneImporterMesh::get_faces() const {
return faces;
}
-Vector<Ref<Shape3D>> EditorSceneImporterMesh::convex_decompose(const Mesh::ConvexDecompositionSettings &p_settings) const {
+Vector<Ref<Shape3D>> EditorSceneImporterMesh::convex_decompose() const {
ERR_FAIL_COND_V(!Mesh::convex_composition_function, Vector<Ref<Shape3D>>());
const Vector<Face3> faces = get_faces();
- Vector<Vector<Face3>> decomposed = Mesh::convex_composition_function(faces, p_settings);
+ Vector<Vector<Face3>> decomposed = Mesh::convex_composition_function(faces, -1);
Vector<Ref<Shape3D>> ret;
diff --git a/editor/import/scene_importer_mesh.h b/editor/import/scene_importer_mesh.h
index 20f91a4dca..e57e479d8e 100644
--- a/editor/import/scene_importer_mesh.h
+++ b/editor/import/scene_importer_mesh.h
@@ -104,7 +104,7 @@ public:
Ref<EditorSceneImporterMesh> get_shadow_mesh() const;
Vector<Face3> get_faces() const;
- Vector<Ref<Shape3D>> convex_decompose(const Mesh::ConvexDecompositionSettings &p_settings) const;
+ Vector<Ref<Shape3D>> convex_decompose() const;
Ref<Shape3D> create_trimesh_shape() const;
Ref<NavigationMesh> create_navigation_mesh();
Error lightmap_unwrap_cached(const Transform3D &p_base_transform, float p_texel_size, const Vector<uint8_t> &p_src_cache, Vector<uint8_t> &r_dst_cache);
diff --git a/editor/plugins/mesh_instance_3d_editor_plugin.cpp b/editor/plugins/mesh_instance_3d_editor_plugin.cpp
index 574d3ef27e..9a2b222f21 100644
--- a/editor/plugins/mesh_instance_3d_editor_plugin.cpp
+++ b/editor/plugins/mesh_instance_3d_editor_plugin.cpp
@@ -202,8 +202,7 @@ void MeshInstance3DEditor::_menu_option(int p_option) {
return;
}
- Mesh::ConvexDecompositionSettings settings;
- Vector<Ref<Shape3D>> shapes = mesh->convex_decompose(settings);
+ Vector<Ref<Shape3D>> shapes = mesh->convex_decompose();
if (!shapes.size()) {
err_dialog->set_text(TTR("Couldn't create any collision shapes."));
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-19 03:00:32 +0000