diff options
author | RĂ©mi Verschelde <rverschelde@gmail.com> | 2020-05-14 23:09:03 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-05-14 23:09:03 +0200 |
commit | 00949f0c5fcc6a4f8382a4a97d5591fd9ec380f8 (patch) | |
tree | 2b1c31f45add24085b64425ce440f577424c16a1 /scene/resources/box_shape_3d.cpp | |
parent | 5046f666a1181675b39f156c38346525dc1c444e (diff) | |
parent | 0ee0fa42e6639b6fa474b7cf6afc6b1a78142185 (diff) |
Merge pull request #38738 from akien-mga/cause-we-never-go-out-of-style
Style: Remove new line at block start, enforce line between functions, enforce braces in if and loop blocks
Diffstat (limited to 'scene/resources/box_shape_3d.cpp')
-rw-r--r-- | scene/resources/box_shape_3d.cpp | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/scene/resources/box_shape_3d.cpp b/scene/resources/box_shape_3d.cpp index 64c821a011..69339faf76 100644 --- a/scene/resources/box_shape_3d.cpp +++ b/scene/resources/box_shape_3d.cpp @@ -32,7 +32,6 @@ #include "servers/physics_server_3d.h" Vector<Vector3> BoxShape3D::get_debug_mesh_lines() { - Vector<Vector3> lines; AABB aabb; aabb.position = -get_extents(); @@ -53,13 +52,11 @@ real_t BoxShape3D::get_enclosing_radius() const { } void BoxShape3D::_update_shape() { - PhysicsServer3D::get_singleton()->shape_set_data(get_shape(), extents); Shape3D::_update_shape(); } void BoxShape3D::set_extents(const Vector3 &p_extents) { - extents = p_extents; _update_shape(); notify_change_to_owners(); @@ -67,12 +64,10 @@ void BoxShape3D::set_extents(const Vector3 &p_extents) { } Vector3 BoxShape3D::get_extents() const { - return extents; } void BoxShape3D::_bind_methods() { - ClassDB::bind_method(D_METHOD("set_extents", "extents"), &BoxShape3D::set_extents); ClassDB::bind_method(D_METHOD("get_extents"), &BoxShape3D::get_extents); @@ -81,6 +76,5 @@ void BoxShape3D::_bind_methods() { BoxShape3D::BoxShape3D() : Shape3D(PhysicsServer3D::get_singleton()->shape_create(PhysicsServer3D::SHAPE_BOX)) { - set_extents(Vector3(1, 1, 1)); } |