summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <remi@verschelde.fr>2021-06-18 18:38:48 +0200
committerGitHub <noreply@github.com>2021-06-18 18:38:48 +0200
commitdf170c8af05c7e81a83ddae4e4d62c65d7086bc3 (patch)
tree4e53c56f71977d74296a973551d1a61026dda817
parentc5e1b23e55c686b90287c23354c6bfe524f4bcfa (diff)
parent2bf145fa5d3efaea6d0e108da19c212ceeff6505 (diff)
Merge pull request #49474 from nekomatata/line-2d-upward
Make LineShape2D normal point upwards by default
-rw-r--r--doc/classes/LineShape2D.xml4
-rw-r--r--scene/resources/line_shape_2d.h3
2 files changed, 4 insertions, 3 deletions
diff --git a/doc/classes/LineShape2D.xml b/doc/classes/LineShape2D.xml
index fed5773583..434e6fba8e 100644
--- a/doc/classes/LineShape2D.xml
+++ b/doc/classes/LineShape2D.xml
@@ -14,8 +14,8 @@
<member name="distance" type="float" setter="set_distance" getter="get_distance" default="0.0">
The line's distance from the origin.
</member>
- <member name="normal" type="Vector2" setter="set_normal" getter="get_normal" default="Vector2(0, 1)">
- The line's normal.
+ <member name="normal" type="Vector2" setter="set_normal" getter="get_normal" default="Vector2(0, -1)">
+ The line's normal. Defaults to [code]Vector2.UP[/code].
</member>
</members>
<constants>
diff --git a/scene/resources/line_shape_2d.h b/scene/resources/line_shape_2d.h
index 9f0405ad29..210a1aa9e6 100644
--- a/scene/resources/line_shape_2d.h
+++ b/scene/resources/line_shape_2d.h
@@ -36,7 +36,8 @@
class LineShape2D : public Shape2D {
GDCLASS(LineShape2D, Shape2D);
- Vector2 normal = Vector2(0, 1);
+ // LineShape2D is often used for one-way platforms, where the normal pointing up makes sense.
+ Vector2 normal = Vector2(0, -1);
real_t distance = 0.0;
void _update_shape();