WIP: GPv3: Geometry-based Fill tool #114318

Sietse Brouwer · 2023-10-31T12:09:43+01:00

Sietse Brouwer commented

2023-10-31 12:09:43 +01:00

Work in progress
This is an experimental attempt to implement a vector-based Fill tool
for GPv3. Vector-based means: using the actual points of the edge
strokes, instead of creating new, unrelated geometry points as the
GPv2 flood-fill algorithm does.

_Work in progress_ This is an experimental attempt to implement a vector-based Fill tool for GPv3. Vector-based means: using the actual points of the edge strokes, instead of creating new, unrelated geometry points as the GPv2 flood-fill algorithm does.

Sietse Brouwer added 21 commits 2023-10-31 12:10:02 +01:00

82e9c1539e Initial commit: vector-based Fill operator for GP3

7f53dc8252 Merge branch 'main' into gp3-vector-fill

1e7a3509d9 Merge branch 'main' into gp3-vector-fill

26c437478c UI and keymap entries for vector fill tool

9c9769a38a Create fill geometry, draw gap closure overlay, many bug fixes for edge cases

4dc99a5d72 Handle overlapping curves (from previous fill action)

29a1dd4466 Merge branch 'main' into gp3-vector-fill

0e56f1d8b5 Use material and colors from the tool settings

b856d1b9cc Layer selection based on 'Layers' tool setting

120e172bd1 Avoid duplicate points in 3D fill curve

2ca5ee5f40 Interactive check of intersecting curve end extensions

5021881794 Flag for verbose debug mode

33f9d1e4d7 Fix: consider overlapping curves when checking for closed edge loop

65eebd2dee Use angles of intersections to determine narrowest edge

b996dada55 Use angles for end extension intersections and give priority to 'stroke' materials

d9e958af98 Merge branch 'main' into gp3-vector-fill

7125382435 Skip superfluous end extensions

fa50b118a5 Small bugfixes

022103a5f8 Merge branch 'main' into gp3-vector-fill

cc6832bfae Fixes after merge with main

f5431532aa WIP: Gap closure based on stroke proximity

Sietse Brouwer added this to the Grease Pencil project 2023-10-31 12:10:52 +01:00

Sietse Brouwer reviewed 2023-10-31 12:45:50 +01:00

Sietse Brouwer left a comment

@antoniov I added some notes to give you a starting point for exploring the 'gap closure' code I used for the Fill tool.

source/blender/editors/grease_pencil/intern/grease_pencil_fill_vector.cc Outdated

						
				@ -0,0 +3266,4 @@

				  }

				  /* Convert curves to viewport 2D space. */

				  vf->curves_2d = curves_in_2d_space_get(&vf->vc, vf->vc.obact, drawings, layer_indices, true);

Sietse Brouwer commented

2023-10-31 12:36:54 +01:00

Here a set of GP drawings (layers) is converted to viewport 2D space. The function is declared in editors\include\ED_grease_pencil.hh and defined in editors\grease_pencil\intern\grease_pencil_utils.cc.

In the curves_2d structure all curves of all layers are packed together and accessible through offset indices. E.g. looping over all first and last points of all curves goes this way:

for (const int curve_i : vf->curves_2d.point_offset.index_range()) {
  const int point_first_index = vf->curves_2d.point_offset[curve_i];
  const float2 co_first = vf->curves_2d.points_2d[point_first_index];

  const int point_last_index = vf->curves_2d.point_offset[curve_i] + vf->curves_2d.point_size[curve_i] - 1;
  const float2 co_last = vf->curves_2d.points_2d[point_last_index];
}

Relevant functions for gap closure by stroke end radius are:
init_curve_end_radii()
get_connected_curve_end_radii()

For gap closure by extending the stroke ends:
init_curve_end_extensions()
get_curve_end_extensions()

The drawing of the gap lines in the viewport is done in:
draw_overlay()

Here a set of GP drawings (layers) is converted to viewport 2D space. The function is declared in `editors\include\ED_grease_pencil.hh` and defined in `editors\grease_pencil\intern\grease_pencil_utils.cc`. In the `curves_2d` structure all curves of all layers are packed together and accessible through offset indices. E.g. looping over all first and last points of all curves goes this way: ``` for (const int curve_i : vf->curves_2d.point_offset.index_range()) { const int point_first_index = vf->curves_2d.point_offset[curve_i]; const float2 co_first = vf->curves_2d.points_2d[point_first_index]; const int point_last_index = vf->curves_2d.point_offset[curve_i] + vf->curves_2d.point_size[curve_i] - 1; const float2 co_last = vf->curves_2d.points_2d[point_last_index]; } ``` Relevant functions for gap closure by stroke end **radius** are: `init_curve_end_radii()` `get_connected_curve_end_radii()` For gap closure by **extending** the stroke ends: `init_curve_end_extensions()` `get_curve_end_extensions()` The drawing of the gap lines in the viewport is done in: `draw_overlay()`

Falk David commented

2023-10-31 13:15:41 +01:00

I'm just scanning over the code to get an initial idea. Looks like you put a lot of thought into this!
One thing that I'm seeing is that you're using float2 for your 2d coordinates. And I can see that you're also having to do lots and lots of epsilon checks because of the precision issues.
Since we're already in screen space, I would advise to use int2 for the coordinates instead. That allows for precise intersection checks, without having to deal with floating point arithmetic.
Amelie ended up taking that same route for the eraser.

I'm just scanning over the code to get an initial idea. Looks like you put a lot of thought into this! One thing that I'm seeing is that you're using `float2` for your 2d coordinates. And I can see that you're also having to do lots and lots of epsilon checks because of the precision issues. Since we're already in screen space, I would advise to use `int2` for the coordinates instead. That allows for precise intersection checks, without having to deal with floating point arithmetic. Amelie ended up taking that same route for the eraser.

Sietse Brouwer added 4 commits 2023-11-16 15:49:42 +01:00

0422502132 Merge branch 'main' into gp3-vector-fill

1ff0693e86 Cleanup after merge with main

5ce95c4aa9 Merge branch 'main' into gp3-vector-fill

e528ef3055 Setup for fill operator with two methods: flood fill and geometry fill

Sietse Brouwer added 1 commit 2023-11-16 20:03:58 +01:00

3beb6ebe12 Support for multiframe editing

Sietse Brouwer added 1 commit 2023-11-16 20:51:06 +01:00

a1c01d3989 Cleanup

Antonio Vazquez added 1 commit 2023-11-16 22:48:32 +01:00

e5f41d40d2 Test commit

Just to test the git commit is working

Antonio Vazquez added 2 commits 2023-11-23 13:47:26 +01:00

30102eddca Merge branch 'main' into gp3-vector-fill

Conflicts:
	source/blender/editors/grease_pencil/intern/grease_pencil_ops.cc
	source/blender/editors/grease_pencil/intern/grease_pencil_utils.cc
	source/blender/editors/include/ED_grease_pencil.hh

b4b1caf5c5 GPv3: Fix errors after merge