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

Remove the global space get_transformed_aabb helper method

Browse Source
This commit is contained in:
Aaron Franke 2022-10-05 11:09:54 -05:00
parent 2e3662acbd
commit 9ebd8c5bb5
No known key found for this signature in database
GPG Key ID: 40A1750B977E56BF
6 changed files with 6 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/classes/Mesh.xml
View File

@ -129,7 +129,7 @@
<method name="get_aabb" qualifiers="const"> <method name="get_aabb" qualifiers="const">
<return type="AABB" /> <return type="AABB" />
<description> <description>
Returns the smallest [AABB] enclosing this mesh in local space. Not affected by [code]custom_aabb[/code]. See also [method VisualInstance3D.get_transformed_aabb]. Returns the smallest [AABB] enclosing this mesh in local space. Not affected by [code]custom_aabb[/code].
[b]Note:[/b] This is only implemented for [ArrayMesh] and [PrimitiveMesh]. [b]Note:[/b] This is only implemented for [ArrayMesh] and [PrimitiveMesh].
</description> </description>
</method> </method>

2
doc/classes/MultiMesh.xml
View File

@ -19,7 +19,7 @@
<method name="get_aabb" qualifiers="const"> <method name="get_aabb" qualifiers="const">
<return type="AABB" /> <return type="AABB" />
<description> <description>
Returns the visibility axis-aligned bounding box in local space. See also [method VisualInstance3D.get_transformed_aabb]. Returns the visibility axis-aligned bounding box in local space.
</description> </description>
</method> </method>
<method name="get_instance_color" qualifiers="const"> <method name="get_instance_color" qualifiers="const">

9
doc/classes/VisualInstance3D.xml
View File

@ -17,7 +17,7 @@
<method name="get_aabb" qualifiers="const"> <method name="get_aabb" qualifiers="const">
<return type="AABB" /> <return type="AABB" />
<description> <description>
Returns the [AABB] (also known as the bounding box) for this [VisualInstance3D]. See also [method get_transformed_aabb]. Returns the [AABB] (also known as the bounding box) for this [VisualInstance3D].
</description> </description>
</method> </method>
<method name="get_base" qualifiers="const"> <method name="get_base" qualifiers="const">
@ -39,13 +39,6 @@
Returns whether or not the specified layer of the [member layers] is enabled, given a [code]layer_number[/code] between 1 and 20. Returns whether or not the specified layer of the [member layers] is enabled, given a [code]layer_number[/code] between 1 and 20.
</description> </description>
</method> </method>
<method name="get_transformed_aabb" qualifiers="const">
<return type="AABB" />
<description>
Returns the transformed [AABB] (also known as the bounding box) for this [VisualInstance3D].
Transformed in this case means the [AABB] plus the position, rotation, and scale of the [Node3D]'s [Transform3D]. See also [method get_aabb].
</description>
</method>
<method name="set_base"> <method name="set_base">
<return type="void" /> <return type="void" />
<param index="0" name="base" type="RID" /> <param index="0" name="base" type="RID" />

5
editor/plugins/node_3d_editor_plugin.cpp
View File

@ -6991,9 +6991,10 @@ void Node3DEditor::_snap_selected_nodes_to_floor() {
} }
} }
if (!found_valid_shape && vi.size()) { if (!found_valid_shape && vi.size()) {
AABB aabb = (*vi.begin())->get_transformed_aabb(); VisualInstance3D *begin = *vi.begin();
AABB aabb = begin->get_global_transform().xform(begin->get_aabb());
for (const VisualInstance3D *I : vi) { for (const VisualInstance3D *I : vi) {
aabb.merge_with(I->get_transformed_aabb()); aabb.merge_with(I->get_global_transform().xform(I->get_aabb()));
} }
Vector3 size = aabb.size * Vector3(0.5, 0.0, 0.5); Vector3 size = aabb.size * Vector3(0.5, 0.0, 0.5);
from = aabb.position + size; from = aabb.position + size;

6
scene/3d/visual_instance_3d.cpp
View File

@ -40,10 +40,6 @@ AABB VisualInstance3D::get_aabb() const {
return AABB(); return AABB();
} }
AABB VisualInstance3D::get_transformed_aabb() const {
return get_global_transform().xform(get_aabb());
}
void VisualInstance3D::_update_visibility() { void VisualInstance3D::_update_visibility() {
if (!is_inside_tree()) { if (!is_inside_tree()) {
return; return;
@ -121,8 +117,6 @@ void VisualInstance3D::_bind_methods() {
ClassDB::bind_method(D_METHOD("set_layer_mask_value", "layer_number", "value"), &VisualInstance3D::set_layer_mask_value); ClassDB::bind_method(D_METHOD("set_layer_mask_value", "layer_number", "value"), &VisualInstance3D::set_layer_mask_value);
ClassDB::bind_method(D_METHOD("get_layer_mask_value", "layer_number"), &VisualInstance3D::get_layer_mask_value); ClassDB::bind_method(D_METHOD("get_layer_mask_value", "layer_number"), &VisualInstance3D::get_layer_mask_value);
ClassDB::bind_method(D_METHOD("get_transformed_aabb"), &VisualInstance3D::get_transformed_aabb);
GDVIRTUAL_BIND(_get_aabb); GDVIRTUAL_BIND(_get_aabb);
ADD_PROPERTY(PropertyInfo(Variant::INT, "layers", PROPERTY_HINT_LAYERS_3D_RENDER), "set_layer_mask", "get_layer_mask"); ADD_PROPERTY(PropertyInfo(Variant::INT, "layers", PROPERTY_HINT_LAYERS_3D_RENDER), "set_layer_mask", "get_layer_mask");
} }

2
scene/3d/visual_instance_3d.h
View File

@ -60,8 +60,6 @@ public:
RID get_instance() const; RID get_instance() const;
virtual AABB get_aabb() const; virtual AABB get_aabb() const;
virtual AABB get_transformed_aabb() const; // helper
void set_base(const RID &p_base); void set_base(const RID &p_base);
RID get_base() const; RID get_base() const;