GPv3: Add remove_frame function to layers #110679

Merged
Falk David merged 6 commits from filedescriptor/blender:gpv3-layers-remove-frame into main 2023-08-01 14:09:19 +02:00
Member

This core function removes a frame at a specific start frame_number.
It also handles both implicit holds and fixed duration frames.

This core function removes a frame at a specific start `frame_number`. It also handles both implicit holds and fixed duration frames.
Falk David added 2 commits 2023-08-01 12:30:51 +02:00
Falk David added 1 commit 2023-08-01 12:33:28 +02:00
Falk David added this to the Grease Pencil project 2023-08-01 12:33:37 +02:00
Falk David requested review from Amélie Fondevilla 2023-08-01 12:33:44 +02:00
Amélie Fondevilla approved these changes 2023-08-01 12:47:46 +02:00
Amélie Fondevilla left a comment
Member

Looks good. I only have a few questions.

Looks good. I only have a few questions.
@ -288,2 +300,4 @@
GreasePencilFrame *add_frame_internal(int frame_number, int drawing_index);
int frame_index_at(int frame_number) const;
/**
* Removes null frames starting from \a begin until \a end or a non-null frame is reached.

Maybe a bit more clear : "Removes null frames starting from \a begin to \a end (excluded), or until a non-null frame is reached."

Maybe a bit more clear : "Removes null frames starting from \a begin to \a end (excluded), or until a non-null frame is reached."
filedescriptor marked this conversation as resolved
@ -603,1 +603,4 @@
const int *Layer::remove_leading_null_frames_in_range(const int *begin, const int *end)
{
auto next_it = begin;

Just curious, why use auto instead of int *next_it = begin; here ?
Is it gonna compute some more fancy iterator type ?

Just curious, why use `auto` instead of `int *next_it = begin;` here ? Is it gonna compute some more fancy iterator type ?
Author
Member

I cleaned this up by defining an alias SortedKeysIterator for const int *. That way the whole function (and other parts of the Layer class functions) should read better.

I cleaned this up by defining an alias `SortedKeysIterator ` for `const int *`. That way the whole function (and other parts of the `Layer` class functions) should read better.
filedescriptor marked this conversation as resolved
@ -665,0 +694,4 @@
/* If the previous frame is not an implicit hold (e.g. it has a fixed duration) and it's not a
* null frame, we cannot just delete the frame. We need to replace it with a null frame. */
if (!prev_frame.is_implicit_hold() && !prev_frame.is_null()) {
this->frames_for_write().lookup(start_frame_number) = GreasePencilFrame::null();

Is there something to be done with the drawing here ? Like remove the drawing or decrease user count ? Or is it done at a higher level ?

Is there something to be done with the drawing here ? Like remove the drawing or decrease user count ? Or is it done at a higher level ?
Author
Member

Good point. I changed it to return true when the frame is replaced.

Good point. I changed it to return true when the frame is replaced.
filedescriptor marked this conversation as resolved
Falk David added 1 commit 2023-08-01 12:51:55 +02:00
Iliya Katushenock reviewed 2023-08-01 12:55:32 +02:00
@ -290,0 +304,4 @@
* \param begin, end: Iterators into the `sorted_keys` span.
* \returns an iterator to the element after the last null-frame that was removed.
*/
const int *remove_leading_null_frames_in_range(const int *begin, const int *end);

Why this is not a IndexMask, IndexRange, Span<int>, ... ?

Why this is not a `IndexMask`, `IndexRange`, `Span<int>`, ... ?
Author
Member

Because we're using start and end iterators here. I committed a cleanup for this.

Because we're using start and end iterators here. I committed a cleanup for this.

I mean, why are there pointer iterators at all?

I mean, why are there pointer iterators at all?
Author
Member

See Layer::add_frame or Layer::remove_frame for how it's used.

See `Layer::add_frame` or `Layer::remove_frame` for how it's used.

Oh yeah, I see you didn't do it all with indexes and ranges...

Oh yeah, I see you didn't do it all with indexes and ranges...
Falk David added 1 commit 2023-08-01 12:58:23 +02:00
Falk David added 1 commit 2023-08-01 13:56:45 +02:00
Falk David merged commit 8df5968603 into main 2023-08-01 14:09:19 +02:00
Falk David deleted branch gpv3-layers-remove-frame 2023-08-01 14:09:21 +02:00
Sign in to join this conversation.
No reviewers
No Label
Interest
Alembic
Interest
Animation & Rigging
Interest
Asset Browser
Interest
Asset Browser Project Overview
Interest
Audio
Interest
Automated Testing
Interest
Blender Asset Bundle
Interest
BlendFile
Interest
Collada
Interest
Compatibility
Interest
Compositing
Interest
Core
Interest
Cycles
Interest
Dependency Graph
Interest
Development Management
Interest
EEVEE
Interest
EEVEE & Viewport
Interest
Freestyle
Interest
Geometry Nodes
Interest
Grease Pencil
Interest
ID Management
Interest
Images & Movies
Interest
Import Export
Interest
Line Art
Interest
Masking
Interest
Metal
Interest
Modeling
Interest
Modifiers
Interest
Motion Tracking
Interest
Nodes & Physics
Interest
OpenGL
Interest
Overlay
Interest
Overrides
Interest
Performance
Interest
Physics
Interest
Pipeline, Assets & IO
Interest
Platforms, Builds & Tests
Interest
Python API
Interest
Render & Cycles
Interest
Render Pipeline
Interest
Sculpt, Paint & Texture
Interest
Text Editor
Interest
Translations
Interest
Triaging
Interest
Undo
Interest
USD
Interest
User Interface
Interest
UV Editing
Interest
VFX & Video
Interest
Video Sequencer
Interest
Virtual Reality
Interest
Vulkan
Interest
Wayland
Interest
Workbench
Interest: X11
Legacy
Blender 2.8 Project
Legacy
Milestone 1: Basic, Local Asset Browser
Legacy
OpenGL Error
Meta
Good First Issue
Meta
Papercut
Meta
Retrospective
Meta
Security
Module
Animation & Rigging
Module
Core
Module
Development Management
Module
EEVEE & Viewport
Module
Grease Pencil
Module
Modeling
Module
Nodes & Physics
Module
Pipeline, Assets & IO
Module
Platforms, Builds & Tests
Module
Python API
Module
Render & Cycles
Module
Sculpt, Paint & Texture
Module
Triaging
Module
User Interface
Module
VFX & Video
Platform
FreeBSD
Platform
Linux
Platform
macOS
Platform
Windows
Priority
High
Priority
Low
Priority
Normal
Priority
Unbreak Now!
Status
Archived
Status
Confirmed
Status
Duplicate
Status
Needs Info from Developers
Status
Needs Information from User
Status
Needs Triage
Status
Resolved
Type
Bug
Type
Design
Type
Known Issue
Type
Patch
Type
Report
Type
To Do
No Milestone
No project
No Assignees
3 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#110679
No description provided.