blender
/
blender
135
420
Fork 601
Code Issues 6.3k Pull Requests 767 Projects 19 Wiki Activity

WIP: Rewrite Graph Editor drawing code #118662

Draft
Christoph Lendenfeld wants to merge 18 commits from ChrisLend/blender:ge_gpu_batch into main
pull from: ChrisLend/blender:ge_gpu_batch
merge into: blender:main

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Conversation 7 Commits 18 Files Changed 12 +7 -38
1 changed files with 7 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 94a5a0812d - Show all commits

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

@ -25,6 +25,7 @@
#include "BKE_anim_data.hh"
#include "BKE_curve.hh"
#include "BKE_curves.hh"
#include "BKE_fcurve.hh"
#include "BKE_nla.h"
@ -598,45 +599,13 @@ static void add_bezt_vertices(BezTriple *bezt,
* accumulating floating point issues in BKE_curve_forward_diff_bezier.*/
resolution = min_ii(64, resolution);
float prev_key[2], prev_handle[2], bez_handle[2], bez_key[2];
/* Allocation needs +1 on resolution because BKE_curve_forward_diff_bezier uses it to iterate
* inclusively. */
float *bezier_diff_points = static_cast<float *>(
MEM_mallocN(sizeof(float) * ((resolution + 1) * 2), "Draw bezt data"));
curve_vertices.resize(curve_vertices.size() + resolution);
prev_key[0] = prevbezt->vec[1][0];
prev_key[1] = prevbezt->vec[1][1];
prev_handle[0] = prevbezt->vec[2][0];
prev_handle[1] = prevbezt->vec[2][1];
bez_handle[0] = bezt->vec[0][0];
bez_handle[1] = bezt->vec[0][1];
bez_key[0] = bezt->vec[1][0];
bez_key[1] = bezt->vec[1][1];
BKE_fcurve_correct_bezpart(prev_key, prev_handle, bez_handle, bez_key);
BKE_curve_forward_diff_bezier(prev_key[0],
prev_handle[0],
bez_handle[0],
bez_key[0],
bezier_diff_points,
resolution,
sizeof(float[2]));
BKE_curve_forward_diff_bezier(prev_key[1],
prev_handle[1],
bez_handle[1],
bez_key[1],
bezier_diff_points + 1,
resolution,
sizeof(float[2]));
for (float *fp = bezier_diff_points; resolution; resolution--, fp += 2) {
const float x = *fp;
const float y = *(fp + 1);
curve_vertices.append({x, y});
}
MEM_freeN(bezier_diff_points);
bke::curves::bezier::evaluate_segment(float2(prevbezt->vec[1][0], prevbezt->vec[1][1]),
float2(prevbezt->vec[2][0], prevbezt->vec[2][1]),
float2(bezt->vec[0][0], bezt->vec[0][1]),
float2(bezt->vec[1][0], bezt->vec[1][1]),
curve_vertices.as_mutable_span().take_back(resolution));
}
static void add_extrapolation_point_left(const FCurve *fcu,