godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-11 13:10:58 +00:00
Code Releases Wiki Activity

Allow multiple EditorNode3DGizmo collision meshes

Browse Source 
Allows to add multiple TriangleMesh collision meshes to a 3D gizmo.
This commit is contained in:
smix8
2025-03-26 01:20:43 +01:00
parent 594d64ec24
commit ab917da71e
2 changed files with 29 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
editor/plugins/node_3d_editor_gizmos.cpp
View File

@@ -67,7 +67,7 @@ void EditorNode3DGizmo::clear() {
billboard_handle = false; billboard_handle = false;
collision_segments.clear(); collision_segments.clear();
collision_mesh = Ref<TriangleMesh>(); collision_meshes.clear();
instances.clear(); instances.clear();
handles.clear(); handles.clear();
handle_ids.clear(); handle_ids.clear();
@@ -259,6 +259,8 @@ void EditorNode3DGizmo::_update_bvh() {
aabb.expand_to(transform.xform(segment_end)); aabb.expand_to(transform.xform(segment_end));
} }
if (!collision_meshes.is_empty()) {
for (Ref<TriangleMesh> collision_mesh : collision_meshes) {
if (collision_mesh.is_valid()) { if (collision_mesh.is_valid()) {
for (const Face3 &face : collision_mesh->get_faces()) { for (const Face3 &face : collision_mesh->get_faces()) {
aabb.expand_to(transform.xform(face.vertex[0])); aabb.expand_to(transform.xform(face.vertex[0]));
@@ -266,6 +268,8 @@ void EditorNode3DGizmo::_update_bvh() {
aabb.expand_to(transform.xform(face.vertex[2])); aabb.expand_to(transform.xform(face.vertex[2]));
} }
} }
}
}
Node3DEditor::get_singleton()->update_gizmo_bvh_node( Node3DEditor::get_singleton()->update_gizmo_bvh_node(
bvh_node_id, bvh_node_id,
@@ -384,7 +388,7 @@ void EditorNode3DGizmo::add_unscaled_billboard(const Ref<Material> &p_material,
} }
void EditorNode3DGizmo::add_collision_triangles(const Ref<TriangleMesh> &p_tmesh) { void EditorNode3DGizmo::add_collision_triangles(const Ref<TriangleMesh> &p_tmesh) {
collision_mesh = p_tmesh; collision_meshes.push_back(p_tmesh);
} }
void EditorNode3DGizmo::add_collision_segments(const Vector<Vector3> &p_lines) { void EditorNode3DGizmo::add_collision_segments(const Vector<Vector3> &p_lines) {
@@ -553,7 +557,7 @@ bool EditorNode3DGizmo::intersect_frustum(const Camera3D *p_camera, const Vector
} }
} }
if (collision_mesh.is_valid()) { if (!collision_meshes.is_empty()) {
Transform3D t = spatial_node->get_global_transform(); Transform3D t = spatial_node->get_global_transform();
Vector3 mesh_scale = t.get_basis().get_scale(); Vector3 mesh_scale = t.get_basis().get_scale();
@@ -570,10 +574,15 @@ bool EditorNode3DGizmo::intersect_frustum(const Camera3D *p_camera, const Vector
} }
Vector<Vector3> convex_points = Geometry3D::compute_convex_mesh_points(transformed_frustum.ptr(), plane_count); Vector<Vector3> convex_points = Geometry3D::compute_convex_mesh_points(transformed_frustum.ptr(), plane_count);
for (Ref<TriangleMesh> collision_mesh : collision_meshes) {
if (collision_mesh.is_valid()) {
if (collision_mesh->inside_convex_shape(transformed_frustum.ptr(), plane_count, convex_points.ptr(), convex_points.size(), mesh_scale)) { if (collision_mesh->inside_convex_shape(transformed_frustum.ptr(), plane_count, convex_points.ptr(), convex_points.size(), mesh_scale)) {
return true; return true;
} }
} }
}
}
return false; return false;
} }
@@ -741,7 +750,7 @@ bool EditorNode3DGizmo::intersect_ray(Camera3D *p_camera, const Point2 &p_point,
} }
} }
if (collision_mesh.is_valid()) { if (!collision_meshes.is_empty()) {
Transform3D gt = spatial_node->get_global_transform(); Transform3D gt = spatial_node->get_global_transform();
if (billboard_handle) { if (billboard_handle) {
@@ -753,12 +762,16 @@ bool EditorNode3DGizmo::intersect_ray(Camera3D *p_camera, const Point2 &p_point,
Vector3 ray_dir = ai.basis.xform(p_camera->project_ray_normal(p_point)).normalized(); Vector3 ray_dir = ai.basis.xform(p_camera->project_ray_normal(p_point)).normalized();
Vector3 rpos, rnorm; Vector3 rpos, rnorm;
for (Ref<TriangleMesh> collision_mesh : collision_meshes) {
if (collision_mesh.is_valid()) {
if (collision_mesh->intersect_ray(ray_from, ray_dir, rpos, rnorm)) { if (collision_mesh->intersect_ray(ray_from, ray_dir, rpos, rnorm)) {
r_pos = gt.xform(rpos); r_pos = gt.xform(rpos);
r_normal = gt.basis.xform(rnorm).normalized(); r_normal = gt.basis.xform(rnorm).normalized();
return true; return true;
} }
} }
}
}
return false; return false;
} }

2
editor/plugins/node_3d_editor_gizmos.h
View File

@@ -56,7 +56,7 @@ class EditorNode3DGizmo : public Node3DGizmo {
bool selected; bool selected;
Vector<Vector3> collision_segments; Vector<Vector3> collision_segments;
Ref<TriangleMesh> collision_mesh; LocalVector<Ref<TriangleMesh>> collision_meshes;
Vector<Vector3> handles; Vector<Vector3> handles;
Vector<int> handle_ids; Vector<int> handle_ids;