diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-02-10 08:19:20 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-10 08:19:20 +0100 |
| commit | 096ff5a2bdc85b9baa93b4b4c8a18defd0689ebe (patch) | |
| tree | a83857fd0a57821b555010098c1d039b9d53fee1 | |
| parent | 8cb2de524373566bd0faffe1c70e9a201b20e6be (diff) | |
| parent | ef9b4ee2e25453fdee555d0a0894e73b8ff391f7 (diff) | |
Merge pull request #33613 from aaronfranke/down
Fix 2D CollisionShape controls pointing the wrong way
| -rw-r--r-- | editor/plugins/collision_shape_2d_editor_plugin.cpp | 8 | ||||
| -rw-r--r-- | scene/resources/line_shape_2d.cpp | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/editor/plugins/collision_shape_2d_editor_plugin.cpp b/editor/plugins/collision_shape_2d_editor_plugin.cpp index be9e5b0e3a..179ebca562 100644 --- a/editor/plugins/collision_shape_2d_editor_plugin.cpp +++ b/editor/plugins/collision_shape_2d_editor_plugin.cpp @@ -448,8 +448,8 @@ void CollisionShape2DEditor::forward_canvas_draw_over_viewport(Control *p_overla float radius = shape->get_radius(); float height = shape->get_height() / 2; - handles.write[0] = Point2(radius, -height); - handles.write[1] = Point2(0, -(height + radius)); + handles.write[0] = Point2(radius, height); + handles.write[1] = Point2(0, height + radius); p_overlay->draw_texture(h, gt.xform(handles[0]) - size); p_overlay->draw_texture(h, gt.xform(handles[1]) - size); @@ -502,8 +502,8 @@ void CollisionShape2DEditor::forward_canvas_draw_over_viewport(Control *p_overla handles.resize(3); Vector2 ext = shape->get_extents(); handles.write[0] = Point2(ext.x, 0); - handles.write[1] = Point2(0, -ext.y); - handles.write[2] = Point2(ext.x, -ext.y); + handles.write[1] = Point2(0, ext.y); + handles.write[2] = Point2(ext.x, ext.y); p_overlay->draw_texture(h, gt.xform(handles[0]) - size); p_overlay->draw_texture(h, gt.xform(handles[1]) - size); diff --git a/scene/resources/line_shape_2d.cpp b/scene/resources/line_shape_2d.cpp index 7f39467403..84da8125ea 100644 --- a/scene/resources/line_shape_2d.cpp +++ b/scene/resources/line_shape_2d.cpp @@ -115,7 +115,7 @@ void LineShape2D::_bind_methods() { LineShape2D::LineShape2D() : Shape2D(Physics2DServer::get_singleton()->line_shape_create()) { - normal = Vector2(0, -1); + normal = Vector2(0, 1); d = 0; _update_shape(); } |