griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix #129567: GPv3: Incorrect wireframe for strokes

Browse Source 
First this make the wire batch use the same set of drawing that the main
gpencil batch uses (as they share the same VBO data, they need to use
the same drawings).

Then we skip drawing the onion frames by nullifying the indices in the
index buffer. A better way would be to skip these strokes or drawing
but that can be done later and seems more bug prone.

Pull Request: https://projects.blender.org/blender/blender/pulls/129920
This commit is contained in:
Clément Foucault
2024-11-07 12:01:36 +01:00
committed by Falk David
parent a114534295
commit a43a209959
1 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1349,10 +1349,11 @@ static void grease_pencil_wire_batch_ensure(Object &object,
/* Get the visible drawings. */
const Vector<ed::greasepencil::DrawingInfo> drawings =
ed::greasepencil::retrieve_visible_drawings(scene, grease_pencil, false);
ed::greasepencil::retrieve_visible_drawings(scene, grease_pencil, true);
Vector<int> index_start_per_curve;
Vector<bool> cyclic_per_curve;
Vector<bool> is_onion_per_curve;
int index_len = 0;
for (const ed::greasepencil::DrawingInfo &info : drawings) {
@@ -1370,8 +1371,10 @@ static void grease_pencil_wire_batch_ensure(Object &object,
const bool is_cyclic = cyclic[curve_i] && (point_len > 2);
/* Count the primitive restart. */
index_len += point_len + (is_cyclic ? 1 : 0) + 1;
/* Don't draw the onion frames in wireframe mode. */
index_start_per_curve.append(point_start);
cyclic_per_curve.append(is_cyclic);
is_onion_per_curve.append(info.onion_id != 0);
});
}
index_start_per_curve.append(index_len);
@@ -1389,11 +1392,21 @@ static void grease_pencil_wire_batch_ensure(Object &object,
/* Shift the range by `curve` to account for the second padding vertices.
* The first one is already accounted for during counting (as primitive restart). */
const IndexRange index_range = offset_range.shift(curve + 1);
for (const int i : offset_range.index_range()) {
indices[offset_range[i]] = index_range[i];
if (is_onion_per_curve[curve]) {
for (const int i : offset_range.index_range()) {
indices[offset_range[i]] = gpu::RESTART_INDEX;
}
if (cyclic_per_curve[curve]) {
indices[offset_range.last()] = gpu::RESTART_INDEX;
}
}
if (cyclic_per_curve[curve]) {
indices[offset_range.last()] = index_range.first();
else {
for (const int i : offset_range.index_range()) {
indices[offset_range[i]] = index_range[i];
}
if (cyclic_per_curve[curve]) {
indices[offset_range.last()] = index_range.first();
}
}
indices[offset_range.one_after_last()] = gpu::RESTART_INDEX;
}