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

CanvasItem::draw_arc Clamp angle difference so arc won't overlap itself

This commit is contained in:
kleonc 2023-01-18 14:51:17 +01:00
parent e514e3732a
commit 43fc483e6c
3 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
doc/classes/CanvasItem.xml
View File

@ -45,7 +45,8 @@
<param index="6" name="width" type="float" default="1.0" /> <param index="6" name="width" type="float" default="1.0" />
<param index="7" name="antialiased" type="bool" default="false" /> <param index="7" name="antialiased" type="bool" default="false" />
<description> <description>
Draws a unfilled arc between the given angles. The larger the value of [param point_count], the smoother the curve. See also [method draw_circle]. Draws an unfilled arc between the given angles. The larger the value of [param point_count], the smoother the curve. See also [method draw_circle].
The arc is drawn from [param start_angle] towards the value of [param end_angle] so in clockwise direction if [code]start_angle &lt; end_angle[/code] and counter-clockwise otherwise. Passing the same angles but in reversed order will produce the same arc. If absolute difference of [param start_angle] and [param end_angle] is greater than [constant @GDScript.TAU] radians, then a full circle arc is drawn (i.e. arc will not overlap itself).
</description> </description>
</method> </method>
<method name="draw_char" qualifiers="const"> <method name="draw_char" qualifiers="const">

7
scene/main/canvas_item.cpp
View File

@ -531,10 +531,13 @@ void CanvasItem::draw_polyline_colors(const Vector<Point2> &p_points, const Vect
void CanvasItem::draw_arc(const Vector2 &p_center, real_t p_radius, real_t p_start_angle, real_t p_end_angle, int p_point_count, const Color &p_color, real_t p_width, bool p_antialiased) { void CanvasItem::draw_arc(const Vector2 &p_center, real_t p_radius, real_t p_start_angle, real_t p_end_angle, int p_point_count, const Color &p_color, real_t p_width, bool p_antialiased) {
Vector<Point2> points; Vector<Point2> points;
points.resize(p_point_count); points.resize(p_point_count);
const real_t delta_angle = p_end_angle - p_start_angle; Point2 *points_ptr = points.ptrw();
// Clamp angle difference to full circle so arc won't overlap itself.
const real_t delta_angle = CLAMP(p_end_angle - p_start_angle, -Math_TAU, Math_TAU);
for (int i = 0; i < p_point_count; i++) { for (int i = 0; i < p_point_count; i++) {
real_t theta = (i / (p_point_count - 1.0f)) * delta_angle + p_start_angle; real_t theta = (i / (p_point_count - 1.0f)) * delta_angle + p_start_angle;
points.set(i, p_center + Vector2(Math::cos(theta), Math::sin(theta)) * p_radius); points_ptr[i] = p_center + Vector2(Math::cos(theta), Math::sin(theta)) * p_radius;
} }
draw_polyline(points, p_color, p_width, p_antialiased); draw_polyline(points, p_color, p_width, p_antialiased);

15
servers/rendering/renderer_canvas_cull.cpp
View File

@ -1207,20 +1207,23 @@ void RendererCanvasCull::canvas_item_add_circle(RID p_item, const Point2 &p_pos,
static const int circle_points = 64; static const int circle_points = 64;
points.resize(circle_points); points.resize(circle_points);
Vector2 *points_ptr = points.ptrw();
const real_t circle_point_step = Math_TAU / circle_points; const real_t circle_point_step = Math_TAU / circle_points;
for (int i = 0; i < circle_points; i++) { for (int i = 0; i < circle_points; i++) {
float angle = i * circle_point_step; float angle = i * circle_point_step;
points.write[i].x = Math::cos(angle) * p_radius; points_ptr[i].x = Math::cos(angle) * p_radius;
points.write[i].y = Math::sin(angle) * p_radius; points_ptr[i].y = Math::sin(angle) * p_radius;
points.write[i] += p_pos; points_ptr[i] += p_pos;
} }
indices.resize((circle_points - 2) * 3); indices.resize((circle_points - 2) * 3);
int *indices_ptr = indices.ptrw();
for (int i = 0; i < circle_points - 2; i++) { for (int i = 0; i < circle_points - 2; i++) {
indices.write[i * 3 + 0] = 0; indices_ptr[i * 3 + 0] = 0;
indices.write[i * 3 + 1] = i + 1; indices_ptr[i * 3 + 1] = i + 1;
indices.write[i * 3 + 2] = i + 2; indices_ptr[i * 3 + 2] = i + 2;
} }
Vector<Color> color; Vector<Color> color;