godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add Additional Physics Options to Scene Importer.

This commit is contained in:
Hannah Crawford 2023-05-26 23:33:01 +01:00
parent 2210111eb5
commit adb86dda82
1 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
editor/import/resource_importer_scene.cpp
View File

@ -1245,6 +1245,10 @@ Node *ResourceImporterScene::_post_fix_node(Node *p_node, Node *p_root, HashMap<
col->set_owner(p_node->get_owner()); col->set_owner(p_node->get_owner());
col->set_transform(get_collision_shapes_transform(node_settings)); col->set_transform(get_collision_shapes_transform(node_settings));
col->set_position(p_applied_root_scale * col->get_position()); col->set_position(p_applied_root_scale * col->get_position());
const Ref<PhysicsMaterial> &pmo = node_settings["physics/physics_material_override"];
if (!pmo.is_null()) {
col->set_physics_material_override(pmo);
}
base = col; base = col;
} break; } break;
case MESH_PHYSICS_RIGID_BODY_AND_MESH: { case MESH_PHYSICS_RIGID_BODY_AND_MESH: {
@ -1257,6 +1261,10 @@ Node *ResourceImporterScene::_post_fix_node(Node *p_node, Node *p_root, HashMap<
mi->set_transform(Transform3D()); mi->set_transform(Transform3D());
rigid_body->add_child(mi, true); rigid_body->add_child(mi, true);
mi->set_owner(rigid_body->get_owner()); mi->set_owner(rigid_body->get_owner());
const Ref<PhysicsMaterial> &pmo = node_settings["physics/physics_material_override"];
if (!pmo.is_null()) {
rigid_body->set_physics_material_override(pmo);
}
base = rigid_body; base = rigid_body;
} break; } break;
case MESH_PHYSICS_STATIC_COLLIDER_ONLY: { case MESH_PHYSICS_STATIC_COLLIDER_ONLY: {
@ -1268,6 +1276,10 @@ Node *ResourceImporterScene::_post_fix_node(Node *p_node, Node *p_root, HashMap<
p_node->set_owner(nullptr); p_node->set_owner(nullptr);
memdelete(p_node); memdelete(p_node);
p_node = col; p_node = col;
const Ref<PhysicsMaterial> &pmo = node_settings["physics/physics_material_override"];
if (!pmo.is_null()) {
col->set_physics_material_override(pmo);
}
base = col; base = col;
} break; } break;
case MESH_PHYSICS_AREA_ONLY: { case MESH_PHYSICS_AREA_ONLY: {
@ -1284,6 +1296,9 @@ Node *ResourceImporterScene::_post_fix_node(Node *p_node, Node *p_root, HashMap<
} break; } break;
} }
base->set_collision_layer(node_settings["physics/layer"]);
base->set_collision_mask(node_settings["physics/mask"]);
for (const Ref<Shape3D> &E : shapes) { for (const Ref<Shape3D> &E : shapes) {
CollisionShape3D *cshape = memnew(CollisionShape3D); CollisionShape3D *cshape = memnew(CollisionShape3D);
cshape->set_shape(E); cshape->set_shape(E);
@ -1602,6 +1617,9 @@ void ResourceImporterScene::get_internal_import_options(InternalImportCategory p
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, "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/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)); 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));
r_options->push_back(ImportOption(PropertyInfo(Variant::OBJECT, "physics/physics_material_override", PROPERTY_HINT_RESOURCE_TYPE, "PhysicsMaterial"), Variant()));
r_options->push_back(ImportOption(PropertyInfo(Variant::INT, "physics/layer", PROPERTY_HINT_LAYERS_3D_PHYSICS), 1));
r_options->push_back(ImportOption(PropertyInfo(Variant::INT, "physics/mask", PROPERTY_HINT_LAYERS_3D_PHYSICS), 1));
// Decomposition // Decomposition
Ref<MeshConvexDecompositionSettings> decomposition_default = Ref<MeshConvexDecompositionSettings>(); Ref<MeshConvexDecompositionSettings> decomposition_default = Ref<MeshConvexDecompositionSettings>();
@ -1700,9 +1718,7 @@ bool ResourceImporterScene::get_internal_option_visibility(InternalImportCategor
p_options.has("generate/physics") && p_options.has("generate/physics") &&
p_options["generate/physics"].operator bool(); p_options["generate/physics"].operator bool();
if ( if (p_option.find("physics/") >= 0) {
p_option == "physics/body_type" ||
p_option == "physics/shape_type") {
// Show if need to generate collisions. // Show if need to generate collisions.
return generate_physics; return generate_physics;
} }