asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix draw_multiline_colors usage

Browse source
This commit is contained in:
Danil Alexeev 2023-05-12 07:50:58 +03:00
parent fb10f45efe
commit cc44d75cd8
No known key found for this signature in database
GPG key ID: 124453E157DA8DC7
6 changed files with 65 additions and 78 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
doc/classes/CanvasItem.xml
View file

@ -171,7 +171,7 @@
<param index="1" name="color" type="Color" />
<param index="2" name="width" type="float" default="-1.0" />
<description>
Draws multiple disconnected lines with a uniform [param color]. When drawing large amounts of lines, this is faster than using individual [method draw_line] calls. To draw interconnected lines, use [method draw_polyline] instead.
Draws multiple disconnected lines with a uniform [param width] and [param color]. Each line is defined by two consecutive points from [param points] array, i.e. i-th segment consists of [code]points[2 * i][/code], [code]points[2 * i + 1][/code] endpoints. When drawing large amounts of lines, this is faster than using individual [method draw_line] calls. To draw interconnected lines, use [method draw_polyline] instead.
If [param width] is negative, then two-point primitives will be drawn instead of a four-point ones. This means that when the CanvasItem is scaled, the lines will remain thin. If this behavior is not desired, then pass a positive [param width] like [code]1.0[/code].
</description>
</method>
@ -181,7 +181,7 @@
<param index="1" name="colors" type="PackedColorArray" />
<param index="2" name="width" type="float" default="-1.0" />
<description>
Draws multiple disconnected lines with a uniform [param width] and segment-by-segment coloring. Colors assigned to line segments match by index between [param points] and [param colors]. When drawing large amounts of lines, this is faster than using individual [method draw_line] calls. To draw interconnected lines, use [method draw_polyline_colors] instead.
Draws multiple disconnected lines with a uniform [param width] and segment-by-segment coloring. Each segment is defined by two consecutive points from [param points] array and a corresponding color from [param colors] array, i.e. i-th segment consists of [code]points[2 * i][/code], [code]points[2 * i + 1][/code] endpoints and has [code]colors[i][/code] color. When drawing large amounts of lines, this is faster than using individual [method draw_line] calls. To draw interconnected lines, use [method draw_polyline_colors] instead.
If [param width] is negative, then two-point primitives will be drawn instead of a four-point ones. This means that when the CanvasItem is scaled, the lines will remain thin. If this behavior is not desired, then pass a positive [param width] like [code]1.0[/code].
</description>
</method>
@ -258,7 +258,7 @@
<param index="2" name="width" type="float" default="-1.0" />
<param index="3" name="antialiased" type="bool" default="false" />
<description>
Draws interconnected line segments with a uniform [param width] and segment-by-segment coloring, and optional antialiasing (supported only for positive [param width]). Colors assigned to line segments match by index between [param points] and [param colors]. When drawing large amounts of lines, this is faster than using individual [method draw_line] calls. To draw disconnected lines, use [method draw_multiline_colors] instead. See also [method draw_polygon].
Draws interconnected line segments with a uniform [param width], point-by-point coloring, and optional antialiasing (supported only for positive [param width]). Colors assigned to line points match by index between [param points] and [param colors], i.e. each line segment is filled with a gradient between the colors of the endpoints. When drawing large amounts of lines, this is faster than using individual [method draw_line] calls. To draw disconnected lines, use [method draw_multiline_colors] instead. See also [method draw_polygon].
If [param width] is negative, then the polyline is drawn using [constant RenderingServer.PRIMITIVE_LINE_STRIP]. This means that when the CanvasItem is scaled, the polyline will remain thin. If this behavior is not desired, then pass a positive [param width] like [code]1.0[/code].
</description>
</method>

54
editor/animation_track_editor_plugins.cpp
View file

@ -309,8 +309,8 @@ void AnimationTrackEditAudio::draw_key(int p_index, float p_pixels_sec, int p_x,
Rect2 rect = Rect2(from_x, (get_size().height - fh) / 2, to_x - from_x, fh);
draw_rect(rect, Color(0.25, 0.25, 0.25));
Vector<Vector2> lines;
lines.resize((to_x - from_x + 1) * 2);
Vector<Vector2> points;
points.resize((to_x - from_x) * 2);
preview_len = preview->get_length();
for (int i = from_x; i < to_x; i++) {
@ -320,14 +320,13 @@ void AnimationTrackEditAudio::draw_key(int p_index, float p_pixels_sec, int p_x,
float min = preview->get_min(ofs, ofs_n) * 0.5 + 0.5;
int idx = i - from_x;
lines.write[idx * 2 + 0] = Vector2(i, rect.position.y + min * rect.size.y);
lines.write[idx * 2 + 1] = Vector2(i, rect.position.y + max * rect.size.y);
points.write[idx * 2 + 0] = Vector2(i, rect.position.y + min * rect.size.y);
points.write[idx * 2 + 1] = Vector2(i, rect.position.y + max * rect.size.y);
}
Vector<Color> color;
color.push_back(Color(0.75, 0.75, 0.75));
Vector<Color> colors = { Color(0.75, 0.75, 0.75) };
RS::get_singleton()->canvas_item_add_multiline(get_canvas_item(), lines, color);
RS::get_singleton()->canvas_item_add_multiline(get_canvas_item(), points, colors);
if (p_selected) {
Color accent = get_theme_color(SNAME("accent_color"), SNAME("Editor"));
@ -667,8 +666,8 @@ void AnimationTrackEditSubAnim::draw_key(int p_index, float p_pixels_sec, int p_
bg.b = 1 - color.b;
draw_rect(rect, bg);
Vector<Vector2> lines;
Vector<Color> colorv;
Vector<Vector2> points;
Vector<Color> colors = { color };
{
Ref<Animation> ap_anim = ap->get_animation(anim);
@ -685,16 +684,14 @@ void AnimationTrackEditSubAnim::draw_key(int p_index, float p_pixels_sec, int p_
continue;
}
lines.push_back(Point2(x, y));
lines.push_back(Point2(x + 1, y));
points.push_back(Point2(x, y));
points.push_back(Point2(x + 1, y));
}
}
colorv.push_back(color);
}
if (lines.size() > 2) {
RS::get_singleton()->canvas_item_add_multiline(get_canvas_item(), lines, colorv);
if (points.size() > 2) {
RS::get_singleton()->canvas_item_add_multiline(get_canvas_item(), points, colors);
}
int limit = to_x - from_x - 4;
@ -919,8 +916,8 @@ void AnimationTrackEditTypeAudio::draw_key(int p_index, float p_pixels_sec, int
Rect2 rect = Rect2(from_x, (h - fh) / 2, to_x - from_x, fh);
draw_rect(rect, Color(0.25, 0.25, 0.25));
Vector<Vector2> lines;
lines.resize((to_x - from_x + 1) * 2);
Vector<Vector2> points;
points.resize((to_x - from_x) * 2);
preview_len = preview->get_length();
for (int i = from_x; i < to_x; i++) {
@ -933,14 +930,13 @@ void AnimationTrackEditTypeAudio::draw_key(int p_index, float p_pixels_sec, int
float min = preview->get_min(ofs, ofs_n) * 0.5 + 0.5;
int idx = i - from_x;
lines.write[idx * 2 + 0] = Vector2(i, rect.position.y + min * rect.size.y);
lines.write[idx * 2 + 1] = Vector2(i, rect.position.y + max * rect.size.y);
points.write[idx * 2 + 0] = Vector2(i, rect.position.y + min * rect.size.y);
points.write[idx * 2 + 1] = Vector2(i, rect.position.y + max * rect.size.y);
}
Vector<Color> color;
color.push_back(Color(0.75, 0.75, 0.75));
Vector<Color> colors = { Color(0.75, 0.75, 0.75) };
RS::get_singleton()->canvas_item_add_multiline(get_canvas_item(), lines, color);
RS::get_singleton()->canvas_item_add_multiline(get_canvas_item(), points, colors);
Color cut_color = get_theme_color(SNAME("accent_color"), SNAME("Editor"));
cut_color.a = 0.7;
@ -1279,8 +1275,8 @@ void AnimationTrackEditTypeAnimation::draw_key(int p_index, float p_pixels_sec,
bg.b = 1 - color.b;
draw_rect(rect, bg);
Vector<Vector2> lines;
Vector<Color> colorv;
Vector<Vector2> points;
Vector<Color> colors = { color };
{
Ref<Animation> ap_anim = ap->get_animation(anim);
@ -1297,16 +1293,14 @@ void AnimationTrackEditTypeAnimation::draw_key(int p_index, float p_pixels_sec,
continue;
}
lines.push_back(Point2(x, y));
lines.push_back(Point2(x + 1, y));
points.push_back(Point2(x, y));
points.push_back(Point2(x + 1, y));
}
}
colorv.push_back(color);
}
if (lines.size() > 2) {
RS::get_singleton()->canvas_item_add_multiline(get_canvas_item(), lines, colorv);
if (points.size() > 2) {
RS::get_singleton()->canvas_item_add_multiline(get_canvas_item(), points, colors);
}
int limit = to_x - from_x - 4;

15
editor/editor_resource_picker.cpp
View file

@ -1145,7 +1145,7 @@ void EditorAudioStreamPicker::_preview_draw() {
Rect2 rect(Point2(), size);
if (audio_stream->get_length() > 0) {
if (audio_stream->get_length() > 0 && size.width > 0) {
rect.size.height *= 0.5;
stream_preview_rect->draw_rect(rect, Color(0, 0, 0, 1));
@ -1153,8 +1153,8 @@ void EditorAudioStreamPicker::_preview_draw() {
Ref<AudioStreamPreview> preview = AudioStreamPreviewGenerator::get_singleton()->generate_preview(audio_stream);
float preview_len = preview->get_length();
Vector<Vector2> lines;
lines.resize(size.width * 2);
Vector<Vector2> points;
points.resize(size.width * 2);
for (int i = 0; i < size.width; i++) {
float ofs = i * preview_len / size.width;
@ -1163,14 +1163,13 @@ void EditorAudioStreamPicker::_preview_draw() {
float min = preview->get_min(ofs, ofs_n) * 0.5 + 0.5;
int idx = i;
lines.write[idx * 2 + 0] = Vector2(i + 1, rect.position.y + min * rect.size.y);
lines.write[idx * 2 + 1] = Vector2(i + 1, rect.position.y + max * rect.size.y);
points.write[idx * 2 + 0] = Vector2(i + 1, rect.position.y + min * rect.size.y);
points.write[idx * 2 + 1] = Vector2(i + 1, rect.position.y + max * rect.size.y);
}
Vector<Color> color;
color.push_back(get_theme_color(SNAME("contrast_color_2"), SNAME("Editor")));
Vector<Color> colors = { get_theme_color(SNAME("contrast_color_2"), SNAME("Editor")) };
RS::get_singleton()->canvas_item_add_multiline(stream_preview_rect->get_canvas_item(), lines, color);
RS::get_singleton()->canvas_item_add_multiline(stream_preview_rect->get_canvas_item(), points, colors);
if (tagged_frame_offset_count) {
Color accent = get_theme_color(SNAME("accent_color"), SNAME("Editor"));

21
editor/import/audio_stream_import_settings.cpp
View file

@ -85,13 +85,13 @@ void AudioStreamImportSettings::_draw_preview() {
Ref<Font> beat_font = get_theme_font(SNAME("main"), SNAME("EditorFonts"));
int main_size = get_theme_font_size(SNAME("main_size"), SNAME("EditorFonts"));
Vector<Vector2> lines;
lines.resize(rect_size.width * 2);
Vector<Vector2> points;
points.resize((int)rect_size.width * 2);
Color color_active = get_theme_color(SNAME("contrast_color_2"), SNAME("Editor"));
Color color_inactive = color_active;
color_inactive.a *= 0.5;
Vector<Color> color;
color.resize(lines.size());
Vector<Color> colors;
colors.resize((int)rect_size.width);
float inactive_from = 1e20;
float beat_size = 0;
@ -115,16 +115,15 @@ void AudioStreamImportSettings::_draw_preview() {
float min = preview->get_min(ofs, ofs_n) * 0.5 + 0.5;
int idx = i;
lines.write[idx * 2 + 0] = Vector2(i + 1, rect.position.y + min * rect.size.y);
lines.write[idx * 2 + 1] = Vector2(i + 1, rect.position.y + max * rect.size.y);
points.write[idx * 2 + 0] = Vector2(i + 1, rect.position.y + min * rect.size.y);
points.write[idx * 2 + 1] = Vector2(i + 1, rect.position.y + max * rect.size.y);
Color c = ofs > inactive_from ? color_inactive : color_active;
color.write[idx * 2 + 0] = c;
color.write[idx * 2 + 1] = c;
colors.write[idx] = ofs > inactive_from ? color_inactive : color_active;
}
RS::get_singleton()->canvas_item_add_multiline(_preview->get_canvas_item(), lines, color);
if (!points.is_empty()) {
RS::get_singleton()->canvas_item_add_multiline(_preview->get_canvas_item(), points, colors);
}
if (beat_size) {
Color beat_color = Color(1, 1, 1, 1);

18
editor/plugins/audio_stream_editor_plugin.cpp
View file

@ -74,14 +74,18 @@ void AudioStreamEditor::_notification(int p_what) {
}
void AudioStreamEditor::_draw_preview() {
Rect2 rect = _preview->get_rect();
Size2 size = get_size();
if ((int)size.width <= 0) {
return; // No points to draw.
}
Rect2 rect = _preview->get_rect();
Ref<AudioStreamPreview> preview = AudioStreamPreviewGenerator::get_singleton()->generate_preview(stream);
float preview_len = preview->get_length();
Vector<Vector2> lines;
lines.resize(size.width * 2);
Vector<Vector2> points;
points.resize((int)size.width * 2);
for (int i = 0; i < size.width; i++) {
float ofs = i * preview_len / size.width;
@ -90,11 +94,13 @@ void AudioStreamEditor::_draw_preview() {
float min = preview->get_min(ofs, ofs_n) * 0.5 + 0.5;
int idx = i;
lines.write[idx * 2 + 0] = Vector2(i + 1, rect.position.y + min * rect.size.y);
lines.write[idx * 2 + 1] = Vector2(i + 1, rect.position.y + max * rect.size.y);
points.write[idx * 2 + 0] = Vector2(i + 1, rect.position.y + min * rect.size.y);
points.write[idx * 2 + 1] = Vector2(i + 1, rect.position.y + max * rect.size.y);
}
RS::get_singleton()->canvas_item_add_multiline(_preview->get_canvas_item(), lines, { get_theme_color(SNAME("contrast_color_2"), SNAME("Editor")) });
Vector<Color> colors = { get_theme_color(SNAME("contrast_color_2"), SNAME("Editor")) };
RS::get_singleton()->canvas_item_add_multiline(_preview->get_canvas_item(), points, colors);
}
void AudioStreamEditor::_preview_changed(ObjectID p_which) {

29
scene/2d/marker_2d.cpp
View file

@ -33,19 +33,15 @@
void Marker2D::_draw_cross() {
const real_t extents = get_gizmo_extents();
// Add more points to create a "hard stop" in the color gradient.
PackedVector2Array points_x = {
PackedVector2Array points = {
Point2(+extents, 0),
Point2(),
Point2(),
Point2(-extents, 0)
};
PackedVector2Array points_y = {
Point2(-extents, 0),
Point2(0, +extents),
Point2(),
Point2(),
Point2(0, -extents)
Point2(0, -extents),
};
// Use the axis color which is brighter for the positive axis.
@ -54,22 +50,15 @@ void Marker2D::_draw_cross() {
// (which can be important depending on how it's used).
// Axis colors are taken from `axis_x_color` and `axis_y_color` (defined in `editor/editor_themes.cpp`).
const Color color_x = Color(0.96, 0.20, 0.32);
PackedColorArray colors_x = {
color_x,
color_x,
color_x.lerp(Color(0, 0, 0), 0.5),
color_x.lerp(Color(0, 0, 0), 0.5)
};
draw_multiline_colors(points_x, colors_x);
const Color color_y = Color(0.53, 0.84, 0.01);
PackedColorArray colors_y = {
PackedColorArray colors = {
color_x,
color_x.darkened(0.5),
color_y,
color_y,
color_y.lerp(Color(0, 0, 0), 0.5),
color_y.lerp(Color(0, 0, 0), 0.5)
color_y.darkened(0.5),
};
draw_multiline_colors(points_y, colors_y);
draw_multiline_colors(points, colors);
}
#ifdef TOOLS_ENABLED