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

Unbind CSGShape::_update_shape() and make it public

Browse Source
This commit is contained in:
kobewi
2025-03-15 23:47:24 +01:00
parent 0028fd625e
commit e64a07cc57
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
modules/csg/csg_shape.cpp
View File

@ -208,13 +208,13 @@ float CSGShape3D::get_snap() const {
void CSGShape3D::_make_dirty(bool p_parent_removing) { void CSGShape3D::_make_dirty(bool p_parent_removing) {
if ((p_parent_removing || is_root_shape()) && !dirty) { if ((p_parent_removing || is_root_shape()) && !dirty) {
callable_mp(this, &CSGShape3D::_update_shape).call_deferred(); // Must be deferred; otherwise, is_root_shape() will use the previous parent. callable_mp(this, &CSGShape3D::update_shape).call_deferred(); // Must be deferred; otherwise, is_root_shape() will use the previous parent.
} }
if (!is_root_shape()) { if (!is_root_shape()) {
parent_shape->_make_dirty(); parent_shape->_make_dirty();
} else if (!dirty) { } else if (!dirty) {
callable_mp(this, &CSGShape3D::_update_shape).call_deferred(); callable_mp(this, &CSGShape3D::update_shape).call_deferred();
} }
dirty = true; dirty = true;
@ -550,7 +550,7 @@ void CSGShape3D::mikktSetTSpaceDefault(const SMikkTSpaceContext *pContext, const
surface.tansw[i++] = d < 0 ? -1 : 1; surface.tansw[i++] = d < 0 ? -1 : 1;
} }
void CSGShape3D::_update_shape() { void CSGShape3D::update_shape() {
if (!is_root_shape()) { if (!is_root_shape()) {
return; return;
} }
@ -969,13 +969,13 @@ Ref<TriangleMesh> CSGShape3D::generate_triangle_mesh() const {
} }
void CSGShape3D::_bind_methods() { 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); ClassDB::bind_method(D_METHOD("is_root_shape"), &CSGShape3D::is_root_shape);
ClassDB::bind_method(D_METHOD("set_operation", "operation"), &CSGShape3D::set_operation); ClassDB::bind_method(D_METHOD("set_operation", "operation"), &CSGShape3D::set_operation);
ClassDB::bind_method(D_METHOD("get_operation"), &CSGShape3D::get_operation); ClassDB::bind_method(D_METHOD("get_operation"), &CSGShape3D::get_operation);
#ifndef DISABLE_DEPRECATED #ifndef DISABLE_DEPRECATED
ClassDB::bind_method(D_METHOD("_update_shape"), &CSGShape3D::update_shape);
ClassDB::bind_method(D_METHOD("set_snap", "snap"), &CSGShape3D::set_snap); ClassDB::bind_method(D_METHOD("set_snap", "snap"), &CSGShape3D::set_snap);
ClassDB::bind_method(D_METHOD("get_snap"), &CSGShape3D::get_snap); ClassDB::bind_method(D_METHOD("get_snap"), &CSGShape3D::get_snap);
#endif // DISABLE_DEPRECATED #endif // DISABLE_DEPRECATED

2
modules/csg/csg_shape.h
View File

@ -109,7 +109,6 @@ private:
static void mikktSetTSpaceDefault(const SMikkTSpaceContext *pContext, const float fvTangent[], const float fvBiTangent[], const float fMagS, const float fMagT, static void mikktSetTSpaceDefault(const SMikkTSpaceContext *pContext, const float fvTangent[], const float fvBiTangent[], const float fMagS, const float fMagT,
const tbool bIsOrientationPreserving, const int iFace, const int iVert); const tbool bIsOrientationPreserving, const int iFace, const int iVert);
void _update_shape();
void _update_collision_faces(); void _update_collision_faces();
bool _is_debug_collision_shape_visible(); bool _is_debug_collision_shape_visible();
void _update_debug_collision_shape(); void _update_debug_collision_shape();
@ -132,6 +131,7 @@ protected:
public: public:
Array get_meshes() const; Array get_meshes() const;
void update_shape();
void set_operation(Operation p_operation); void set_operation(Operation p_operation);
Operation get_operation() const; Operation get_operation() const;

2
modules/gltf/gltf_document.cpp
View File

@ -5926,7 +5926,7 @@ void GLTFDocument::_convert_csg_shape_to_gltf(CSGShape3D *p_current, GLTFNodeInd
ERR_FAIL_MSG("csg module is disabled."); ERR_FAIL_MSG("csg module is disabled.");
#else #else
CSGShape3D *csg = p_current; CSGShape3D *csg = p_current;
csg->call("_update_shape"); csg->update_shape();
Array meshes = csg->get_meshes(); Array meshes = csg->get_meshes();
if (meshes.size() != 2) { if (meshes.size() != 2) {
return; return;