blender
/
blender
136
406
Fork 589
Code Issues 6.3k Pull Requests 766 Projects 19 Wiki Activity

Curves: cage overlay for sculpt mode #104467

Merged
Jacques Lucke merged 44 commits from JacquesLucke/blender:sculpt-edit-overlay into main 2023-02-14 18:10:24 +01:00
Conversation 0 Commits 44 Files Changed 11 +13 -17
2 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 2ca2d1cad7 - Show all commits

9
source/blender/draw/engines/overlay/overlay_sculpt_curves.cc
View File

@ -88,17 +88,14 @@ static void populate_selection_overlay(OVERLAY_Data *vedata, Object *object)
static void populate_edit_overlay(OVERLAY_Data *vedata, Object *object)
{
using namespace blender;
using namespace blender::bke;
OVERLAY_PrivateData *pd = vedata->stl->pd;
Curves *curves = static_cast<Curves *>(object->data);
Curves *curves_id_cage = object->runtime.editcurves_eval_cage;
if (curves_id_cage == nullptr) {
if (object->runtime.editcurves_eval_cage == nullptr) {
return;
}
GPUBatch *geom_lines = DRW_curves_batch_cache_get_cage_lines(curves_id_cage);
GPUBatch *geom_lines = DRW_curves_batch_cache_get_cage_lines(curves);
DRW_shgroup_call_no_cull(pd->sculpt_curves_cage_lines_grp, geom_lines, object);
}

21
source/blender/draw/intern/draw_cache_impl_curves.cc
View File

@ -812,21 +812,20 @@ void DRW_curves_batch_cache_create_requested(Object *ob)
Curves *curves_cage_id = ob->runtime.editcurves_eval_cage;
if (curves_cage_id) {
const blender::bke::CurvesGeometry &curves_orig = curves_id_orig->geometry.wrap();
CurvesBatchCache &cage_cache = curves_batch_cache_get(*curves_cage_id);
if (DRW_batch_requested(cage_cache.cage_lines, GPU_PRIM_LINE_STRIP)) {
DRW_ibo_request(cage_cache.cage_lines, &cage_cache.edit_lines_ibo);
DRW_vbo_request(cage_cache.cage_lines, &cage_cache.cage_point_pos);
DRW_vbo_request(cage_cache.cage_lines, &cage_cache.cage_point_color);
if (DRW_batch_requested(cache.cage_lines, GPU_PRIM_LINE_STRIP)) {
DRW_ibo_request(cache.cage_lines, &cache.edit_lines_ibo);
DRW_vbo_request(cache.cage_lines, &cache.cage_point_pos);
DRW_vbo_request(cache.cage_lines, &cache.cage_point_color);
}
if (DRW_ibo_requested(cage_cache.edit_lines_ibo)) {
curves_batch_cache_ensure_edit_lines(*curves_cage_id, cage_cache);
if (DRW_ibo_requested(cache.edit_lines_ibo)) {
curves_batch_cache_ensure_edit_lines(*curves_cage_id, cache);
}
if (DRW_vbo_requested(cage_cache.cage_point_pos)) {
curves_batch_cache_ensure_edit_points_pos(*curves_cage_id, *cage_cache.cage_point_pos);
if (DRW_vbo_requested(cache.cage_point_pos)) {
curves_batch_cache_ensure_edit_points_pos(*curves_cage_id, *cache.cage_point_pos);
}
if (DRW_vbo_requested(cage_cache.cage_point_color)) {
curves_batch_cache_ensure_cage_color(curves_orig, *cage_cache.cage_point_color);
if (DRW_vbo_requested(cache.cage_point_color)) {
curves_batch_cache_ensure_cage_color(curves_orig, *cache.cage_point_color);
}
}
}