Change curve_line_segments property name to min_curve_line_segments

chryan · Aug 31, 2024 · 831c0b7 · 831c0b7
1 parent a781ac4
commit 831c0b7
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/doc/classes/Line2D.xml b/doc/classes/Line2D.xml
@@ -70,8 +70,8 @@
  [b]Note:[/b] The shape of the closing segment is not guaranteed to be seamless if a [member width_curve] is provided.
  [b]Note:[/b] The joint between the closing segment and the first segment is drawn first and it samples the [member gradient] and the [member width_curve] at the beginning. This is an implementation detail that might change in a future version.
  </member>
- <member name="curve_line_segments" type="int" setter="set_curve_line_segments" getter="get_curve_line_segments" default="1">
- Subdivide the line into the number of [member curve_line_segments] at minimum. The resulting segment count varies depending on the use of a fill gradient and the distances between points.
+ <member name="min_curve_line_segments" type="int" setter="set_min_curve_line_segments" getter="get_min_curve_line_segments" default="1">
+ Subdivide the line into the number of at least [member min_curve_line_segments] segments. The resulting segment count varies depending on the use of a fill gradient and the distances between points.
  [b]Note:[/b] Using higher values results in more segments (and vertices/indices) that need to be generated which can degrade performance, particularly if you are animating properties on your line.
  </member>
  <member name="curve_offset" type="float" setter="set_curve_offset" getter="get_curve_offset" default="0.0">

diff --git a/scene/2d/line_2d.cpp b/scene/2d/line_2d.cpp
@@ -119,8 +119,8 @@ Ref<Curve> Line2D::get_curve() const {
  return _curve;
 }
 
-void Line2D::set_curve_line_segments(int curve_line_segments) {
- _curve_line_segments = curve_line_segments;
+void Line2D::set_min_curve_line_segments(int min_curve_line_segments) {
+ _min_curve_line_segments = min_curve_line_segments;
  queue_redraw();
 }
 
@@ -352,7 +352,7 @@ void Line2D::_draw() {
  }
 
  int subline_count = static_cast<int>(gradient_inclusive_points.size()) - 1;
- int num_segments = _curve.is_valid() ? _curve_line_segments : -1;
+ int num_segments = _curve.is_valid() ? _min_curve_line_segments : -1;
  num_segments = MAX(subline_count, num_segments);
  generated_draw_points.reserve(num_segments);
  generated_draw_points.clear();
@@ -475,8 +475,8 @@ void Line2D::_bind_methods() {
  ClassDB::bind_method(D_METHOD("set_curve", "curve"), &Line2D::set_curve);
  ClassDB::bind_method(D_METHOD("get_curve"), &Line2D::get_curve);
 
- ClassDB::bind_method(D_METHOD("set_curve_line_segments", "curve_offset"), &Line2D::set_curve_line_segments);
- ClassDB::bind_method(D_METHOD("get_curve_line_segments"), &Line2D::get_curve_line_segments);
+ ClassDB::bind_method(D_METHOD("set_min_curve_line_segments", "curve_offset"), &Line2D::set_min_curve_line_segments);
+ ClassDB::bind_method(D_METHOD("get_min_curve_line_segments"), &Line2D::get_min_curve_line_segments);
 
  ClassDB::bind_method(D_METHOD("set_curve_offset", "curve_offset"), &Line2D::set_curve_offset);
  ClassDB::bind_method(D_METHOD("get_curve_offset"), &Line2D::get_curve_offset);
@@ -515,7 +515,7 @@ void Line2D::_bind_methods() {
  ADD_PROPERTY(PropertyInfo(Variant::BOOL, "closed"), "set_closed", "is_closed");
  ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "width", PROPERTY_HINT_NONE, "suffix:px"), "set_width", "get_width");
  ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "width_curve", PROPERTY_HINT_RESOURCE_TYPE, "Curve"), "set_curve", "get_curve");
- ADD_PROPERTY(PropertyInfo(Variant::INT, "curve_line_segments", PROPERTY_HINT_RANGE, "1,64,1,or_greater"), "set_curve_line_segments", "get_curve_line_segments");
+ ADD_PROPERTY(PropertyInfo(Variant::INT, "min_curve_line_segments", PROPERTY_HINT_RANGE, "1,64,1,or_greater"), "set_min_curve_line_segments", "get_min_curve_line_segments");
  ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "curve_offset", PROPERTY_HINT_RANGE, "-1.0,1.0,0.01"), "set_curve_offset", "get_curve_offset");
  ADD_PROPERTY(PropertyInfo(Variant::COLOR, "default_color"), "set_default_color", "get_default_color");
  ADD_GROUP("Fill", "");

diff --git a/scene/2d/line_2d.h b/scene/2d/line_2d.h
@@ -85,8 +85,8 @@ class Line2D : public Node2D {
  void set_curve(const Ref<Curve> &curve);
  Ref<Curve> get_curve() const;
 
- void set_curve_line_segments(int curve_line_segments);
- int get_curve_line_segments() const { return _curve_line_segments; }
+ void set_min_curve_line_segments(int min_curve_line_segments);
+ int get_min_curve_line_segments() const { return _min_curve_line_segments; }
 
  void set_curve_offset(float curve_offset);
  float get_curve_offset() const { return _curve_offset; }
@@ -139,7 +139,7 @@ class Line2D : public Node2D {
  bool _closed = false;
  float _width = 10.0;
  Ref<Curve> _curve;
- int _curve_line_segments = 1;
+ int _min_curve_line_segments = 1;
  float _curve_offset = 0.0f;
  Color _default_color = Color(1, 1, 1);
  Ref<Gradient> _gradient;