blender
/
blender
135
420
Fork 603
Code Issues 6.3k Pull Requests 754 Projects 19 Wiki Activity

Refactor: resolution_scale in graph_draw.cc #111037

Merged
Christoph Lendenfeld merged 5 commits from ChrisLend/blender:reafactor_graph_draw_res_scale into main 2023-08-17 14:25:25 +02:00
Conversation 4 Commits 5 Files Changed 1 +12 -10
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit c4f47ba241 - Show all commits

22
source/blender/editors/space_graph/graph_draw.cc
View File

@ -845,16 +845,19 @@ static void draw_fcurve_curve_samples(bAnimContext *ac,
static int calculate_bezt_draw_resolution(BezTriple *bezt,
BezTriple *prevbezt,
const blender::float2 points_per_unit)
const blender::float2 pixels_per_unit)
{
const int resolution_x = int((bezt->vec[1][0] - prevbezt->vec[1][0]) * points_per_unit[0]);
const float points_per_pixel = 0.25f;
const int resolution_x = int(((bezt->vec[1][0] - prevbezt->vec[1][0]) * pixels_per_unit[0]) *
points_per_pixel);
/* Include the handles in the resolution calculation to cover the case where keys have the same
* y-value, but their handles are offset to create an arc. */
const float min_y = min_ffff(
bezt->vec[1][1], bezt->vec[2][1], prevbezt->vec[1][1], prevbezt->vec[0][1]);
const float max_y = max_ffff(
bezt->vec[1][1], bezt->vec[2][1], prevbezt->vec[1][1], prevbezt->vec[0][1]);
const int resolution_y = int((max_y - min_y) * points_per_unit[1]);
const int resolution_y = int(((max_y - min_y) * pixels_per_unit[1]) * points_per_pixel);
/* Using a simple sum instead of calculating the diagonal. This gives a slightly higher
* resolution but it does compensate for the fact that bezier curves can create long arcs between
* keys. */
@ -1009,19 +1012,18 @@ static void add_extrapolation_point_right(FCurve *fcu,
/** Calculate how many points are needed per unit of the visible range of the View2D based on its
* pixel size. */
nathanvegdahl marked this conversation as resolved Outdated
Nathan Vegdahl commented 2023-08-14 14:36:01 +02:00
Outdated
Review
Copy Link

This doc comment feels out of date to me now. And the name of the function is now pretty self-documenting.
So I'd say just remove the doc comment. (Either that or update it, but I don't think that's necessary.)

This doc comment feels out of date to me now. And the name of the function is now pretty self-documenting. So I'd say just remove the doc comment. (Either that or update it, but I don't think that's necessary.)
static blender::float2 calculate_points_per_unit(View2D *v2d)
static blender::float2 calculate_pixels_per_unit(View2D *v2d)
{
/* The resolution for bezier forward diff in frame/value space. This ensures a constant
* resolution in screen-space. */
nathanvegdahl marked this conversation as resolved Outdated
Nathan Vegdahl commented 2023-08-14 14:36:46 +02:00
Outdated
Review
Copy Link

This comment is also outdated, I think, and can just be removed.

This comment is also outdated, I think, and can just be removed.
const int window_width = BLI_rcti_size_x(&v2d->mask);
const int window_height = BLI_rcti_size_y(&v2d->mask);
const float points_per_pixel = 0.25f;
const float v2d_frame_range = BLI_rctf_size_x(&v2d->cur);
const float v2d_value_range = BLI_rctf_size_y(&v2d->cur);
const blender::float2 points_per_unit = {(window_width * points_per_pixel) / v2d_frame_range,
(window_height * points_per_pixel) / v2d_value_range};
return points_per_unit;
const blender::float2 pixels_per_unit = {window_width / v2d_frame_range,
window_height / v2d_value_range};
return pixels_per_unit;
}
/* Helper function - draw one repeat of an F-Curve (using Bezier curve approximations). */
@ -1057,7 +1059,7 @@ static void draw_fcurve_curve_keys(
curve_vertices.append({bezt->vec[1][0], bezt->vec[1][1]});
}
const blender::float2 points_per_unit = calculate_points_per_unit(v2d);
const blender::float2 pixels_per_unit = calculate_pixels_per_unit(v2d);
const int window_width = BLI_rcti_size_x(&v2d->mask);
const float v2d_frame_range = BLI_rctf_size_x(&v2d->cur);
const float pixel_width = v2d_frame_range / window_width;
@ -1084,7 +1086,7 @@ static void draw_fcurve_curve_keys(
break;
case BEZT_IPO_BEZ: {
const int resolution = calculate_bezt_draw_resolution(bezt, prevbezt, points_per_unit);
const int resolution = calculate_bezt_draw_resolution(bezt, prevbezt, pixels_per_unit);
add_bezt_vertices(bezt, prevbezt, resolution, curve_vertices);
break;
}