WIP: GPv3: Compound shapes rendering and operators #116698

Draft

casey-bianco-davis wants to merge 28 commits from casey-bianco-davis/blender:GPv3-Compound-Shapes into main

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.

casey-bianco-davis commented

2024-01-02 00:21:15 +01:00

Member

This adds the following operators:

Join shape operator (Shift J) used to join multiple curves into one shape.
Separate shape operator (Alt P) used to separate a curves into it's own shape.
Select shape operator (Shift L) used to select all curves that make up the shape.

This PR is still WIP and so the following changes should be made:

Add more comments explaining the logic and algorithms.
Use threading everywhere it's possible.
Separate valid mesh checks code out of triangles function
Use BLI_polyfill_calc_arena when a shape is only made of one curve.
Use simplify draw logic when the shape id attribute does not exists.
~~- Create array_utils function for getting the maximum value of an array.~~ used std::max_element instead.
Fix draw order problem.
Create video showing these changes.
Use Array instead of BLI_memarena_alloc for projverts
Use shape vs shape_id consistently

Resolves: #114071

This adds the following operators: - Join shape operator (Shift J) used to join multiple curves into one shape. - Separate shape operator (Alt P) used to separate a curves into it's own shape. - Select shape operator (Shift L) used to select all curves that make up the shape. This PR is still WIP and so the following changes should be made: - [ ] Add more comments explaining the logic and algorithms. - [x] Use threading everywhere it's possible. - [x] Separate valid mesh checks code out of `triangles` function - [ ] Use `BLI_polyfill_calc_arena` when a shape is only made of one curve. - [ ] Use simplify draw logic when the shape id attribute does not exists. ~~- [ ] Create `array_utils` function for getting the maximum value of an array.~~ used `std::max_element` instead. - [x] Fix draw order problem. - [ ] Create video showing these changes. - [x] Use Array instead of `BLI_memarena_alloc` for `projverts` - [x] Use `shape` vs `shape_id` consistently Resolves: #114071

casey-bianco-davis added 11 commits 2024-01-02 00:21:26 +01:00

3267d29033 Cleanup: make triangles offset cache

5cb5e58d1a Merge branch 'main' into GPv3-Compound-Shapes

dfb9216d13 GPv3: Compound shapes start

05ed7ec6a4 GPv3: add `set shape_id` operator.

203dc93d83 GPv3: add `clear shape id` operator

e8d9105bb1 GPv3: add `select shape` operator

564efacc5c GPv3: draw operator make new shape

38ebd2eb0c GPv3: duplicate operator make new curves part of new shapes

a19134ab6f GPv3: `select shape` operator work in both point and curve mode

830b2bd701 Merge branch 'main' into GPv3-Compound-Shapes

78dca20fcd Fix: merge errors

casey-bianco-davis added a new dependency 2024-01-02 00:23:53 +01:00

#116682 GPv3: `reorder` operator

Iliya Katushenock added this to the Grease Pencil project 2024-01-02 00:24:19 +01:00

Iliya Katushenock added the

label 2024-01-02 00:24:45 +01:00

casey-bianco-davis requested review from Falk David 2024-01-02 00:25:18 +01:00

casey-bianco-davis removed a dependency 2024-01-28 00:25:40 +01:00

#116682 GPv3: `reorder` operator

casey-bianco-davis added 17 commits 2024-02-12 07:21:10 +01:00

d5ebdb5fcd Merge branch 'main' into GPv3-Compound-Shapes

a076a04e89 Cleanup: Use `Array<float2>` instead of `BLI_memarena_alloc`

cd7641ab26 Cleanup: Separate valid curves checks code out of triangles function.

919772298e Cleanup: Resize once instead of for every point.

e237696012 Cleanup: Remove single use constants.

42ad5cf728 Fix: Draw order problem

24c2a3827f Cleanup: Rename and change keybinds for shape operators.

833d47a8e4 Cleanup: Use `std::max_element` instead of loop through.

c99f104a32 Cleanup: Use `OffsetIndices` so that loops are independent.

5ba14c3cb4 GPv3: Use parallel threading.

258e7c7842 Cleanup: Remove unused `curves` variable.

fb8ed18d4d Cleanup: Remove unused `group` variable.

5fd7ecea5c Cleanup: Move intersection check to separate function.

cd0726b504 Cleanup: Optimize loop.

7ebbbbc3fa Cleanup: Fix problem.

e61441f8ae Cleanup: Use an Vector of Vectors instead of index in to one long Vector

1d132fda18 GPv3: Use parallel threading.

This pull request has changes conflicting with the target branch.

scripts/presets/keyconfig/keymap_data/blender_default.py
source/blender/blenkernel/intern/grease_pencil.cc
source/blender/draw/intern/draw_cache_impl_grease_pencil.cc
source/blender/editors/grease_pencil/intern/grease_pencil_edit.cc
source/blender/editors/sculpt_paint/grease_pencil_paint.cc

View command line instructions.

Checkout

From your project repository, check out a new branch and test the changes.

git fetch -u GPv3-Compound-Shapes:casey-bianco-davis-GPv3-Compound-Shapes

git checkout casey-bianco-davis-GPv3-Compound-Shapes

Sign in to join this conversation.

No reviewers

No Label

Animation & Rigging

Asset Browser Project Overview

Automated Testing

Blender Asset Bundle

Dependency Graph

Development Management

EEVEE & Viewport

Images & Movies

Motion Tracking

Nodes & Physics

Pipeline, Assets & IO

Platforms, Builds & Tests

Render & Cycles

Render Pipeline

Sculpt, Paint & Texture

Video Sequencer

Virtual Reality

Blender 2.8 Project

Milestone 1: Basic, Local Asset Browser

Good First Issue

Animation & Rigging

Development Management

EEVEE & Viewport

Nodes & Physics

Pipeline, Assets & IO

Platforms, Builds & Tests

Render & Cycles

Sculpt, Paint & Texture

Needs Info from Developers

Needs Information from User

No Milestone

No project

No Assignees

1 Participants

Notifications

Due Date

The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: blender/blender#116698

No description provided.