blender
/
blender
133
398
Fork 579
Code Issues 6.3k Pull Requests 747 Projects 19 Wiki Activity

Initial Grease Pencil 3.0 stage #106848

Merged
Falk David merged 224 commits from filedescriptor/blender:grease-pencil-v3 into main 2023-05-30 11:14:22 +02:00
Conversation 8 Commits 224 Files Changed 94 +14 -7
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 8ae7836a7f - Show all commits

4
source/blender/blenkernel/intern/grease_pencil.cc
View File

@ -321,6 +321,10 @@ static void grease_pencil_drawing_calculate_fill_triangles(GreasePencilDrawing &
for (int curve_i : curves.curves_range()) {
IndexRange points = points_by_curve[curve_i];
if (points.size() < 3) {
continue;
}
int tot_verts = points.size();
int tot_tris = tot_verts - 2;

17
source/blender/draw/intern/draw_cache_impl_grease_pencil.cc
View File

@ -305,18 +305,21 @@ static void grease_pencil_batches_ensure(GreasePencil &grease_pencil, int cfra)
IndexRange points = points_by_curve[curve_i];
const bool is_cyclic = cyclic[curve_i];
Sergey Sharybin commented 2023-04-25 10:01:46 +02:00
Outdated
Review
Copy Link

Add details about TODO. Something that helps others to pick up a task, or to understand that specific case is not expected to be yet working.

Add details about TODO. Something that helps others to pick up a task, or to understand that specific case is not expected to be yet working.
const int v_start = v;
const int num_triangles = points.size() - 2;
int num_triangles = 0;
/* First point is not drawn. */
verts[v].mat = -1;
v++;
for (const int tri_i : IndexRange(num_triangles)) {
uint3 tri = drawing.runtime->triangles_cache[t + tri_i];
GPU_indexbuf_add_tri_verts(&ibo,
(v + tri.x) << GP_VERTEX_ID_SHIFT,
(v + tri.y) << GP_VERTEX_ID_SHIFT,
(v + tri.z) << GP_VERTEX_ID_SHIFT);
if (points.size() > 3) {
num_triangles = points.size() - 2;
for (const int tri_i : IndexRange(num_triangles)) {
uint3 tri = drawing.runtime->triangles_cache[t + tri_i];
GPU_indexbuf_add_tri_verts(&ibo,
(v + tri.x) << GP_VERTEX_ID_SHIFT,
(v + tri.y) << GP_VERTEX_ID_SHIFT,
(v + tri.z) << GP_VERTEX_ID_SHIFT);
}
}
for (const int point_i : points) {