Andrew/redot-engine
1
0
Fork 0
mirror of https://github.com/Redot-Engine/redot-engine.git synced 2025-12-06 07:17:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit godotengine/godot@5b52b4b5c4

Browse Source
This commit is contained in:
Spartan322
2025-01-12 06:56:34 -05:00
parent 9c31ef21f3 5b52b4b5c4
commit 5e6a04e752
439 changed files with 8067 additions and 5255 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
modules/csg/csg_shape.cpp
View File

@@ -917,6 +917,13 @@ PackedStringArray CSGShape3D::get_configuration_warnings() const {
return warnings;
}
Ref<TriangleMesh> CSGShape3D::generate_triangle_mesh() const {
if (root_mesh.is_valid()) {
return root_mesh->generate_triangle_mesh();
}
return Ref<TriangleMesh>();
}
void CSGShape3D::_bind_methods() {
ClassDB::bind_method(D_METHOD("_update_shape"), &CSGShape3D::_update_shape);
ClassDB::bind_method(D_METHOD("is_root_shape"), &CSGShape3D::is_root_shape);

2
modules/csg/csg_shape.h
View File

@@ -171,6 +171,8 @@ public:
Ref<ArrayMesh> bake_static_mesh();
Ref<ConcavePolygonShape3D> bake_collision_shape();
virtual Ref<TriangleMesh> generate_triangle_mesh() const override;
CSGShape3D();
~CSGShape3D();
};