blender
/
blender
133
398
Fork 579
Code Issues 6.3k Pull Requests 747 Projects 19 Wiki Activity

Initial Grease Pencil 3.0 stage #106848

Merged
Falk David merged 224 commits from filedescriptor/blender:grease-pencil-v3 into main 2023-05-30 11:14:22 +02:00
Conversation 8 Commits 224 Files Changed 94 +17 -21
1 changed files with 17 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit dcec69e18f - Show all commits

38
source/blender/blenkernel/intern/grease_pencil.cc
View File

@ -1034,32 +1034,28 @@ blender::Span<blender::bke::StrokePoint> GreasePencilDrawing::stroke_buffer() co
/** \name Grease Pencil data-block API
* \{ */
static void grease_pencil_grow_drawing_array_by(GreasePencil &self, const int add_capacity)
template<typename T> static void grow_array(T **array, int *size, const int add_size)
Hans Goudey commented 2023-04-25 04:24:39 +02:00
Outdated
Review
Copy Link

What about replacing these with slightly more generic functions like this?

template<typename T> static void grow_array(T **array,  int *size, const int add_size) {}
template<typename T> static void shring_array(T **array,  int *size, const int shrink_size) {}

That would allow for simpler variable naming inside, and would tell the reader "there's nothing special going on here, just resizing some arrays" which makes it easier to skim

What about replacing these with slightly more generic functions like this? ``` template<typename T> static void grow_array(T **array, int *size, const int add_size) {} template<typename T> static void shring_array(T **array, int *size, const int shrink_size) {} ``` That would allow for simpler variable naming inside, and would tell the reader "there's nothing special going on here, just resizing some arrays" which makes it easier to skim
{
BLI_assert(add_capacity > 0);
const int new_drawing_array_size = self.drawing_array_size + add_capacity;
GreasePencilDrawingBase **new_drawing_array = reinterpret_cast<GreasePencilDrawingBase **>(
MEM_cnew_array<GreasePencilDrawingBase *>(new_drawing_array_size, __func__));
BLI_assert(add_size > 0);
const int new_array_size = *size + add_size;
T *new_array = reinterpret_cast<T *>(MEM_cnew_array<T *>(new_array_size, __func__));
blender::uninitialized_relocate_n(
self.drawing_array, self.drawing_array_size, new_drawing_array);
blender::uninitialized_relocate_n(*array, *size, new_array);
self.drawing_array = new_drawing_array;
self.drawing_array_size = new_drawing_array_size;
*array = new_array;
*size = new_array_size;
}
static void grease_pencil_shrink_drawing_array_by(GreasePencil &self, const int remove_capacity)
template<typename T> static void shrink_array(T **array, int *size, const int shrink_size)
{
BLI_assert(remove_capacity > 0);
const int new_drawing_array_size = self.drawing_array_size - remove_capacity;
GreasePencilDrawingBase **new_drawing_array = reinterpret_cast<GreasePencilDrawingBase **>(
MEM_cnew_array<GreasePencilDrawingBase *>(new_drawing_array_size, __func__));
BLI_assert(shrink_size > 0);
const int new_array_size = *size - shrink_size;
T *new_array = reinterpret_cast<T *>(MEM_cnew_array<T *>(new_array_size, __func__));
blender::uninitialized_move_n(self.drawing_array, new_drawing_array_size, new_drawing_array);
MEM_freeN(self.drawing_array);
blender::uninitialized_move_n(*array, new_array_size, new_array);
MEM_freeN(*array);
self.drawing_array = new_drawing_array;
self.drawing_array_size = new_drawing_array_size;
*array = new_array;
*size = new_array_size;
}
blender::Span<GreasePencilDrawingBase *> GreasePencil::drawings() const
@ -1078,7 +1074,7 @@ void GreasePencil::add_empty_drawings(int n)
using namespace blender;
BLI_assert(n > 0);
const int prev_size = this->drawings().size();
Hans Goudey commented 2023-04-25 04:26:00 +02:00
Outdated
Review
Copy Link

int n -> const int add_size

`int n` -> `const int add_size`
grease_pencil_grow_drawing_array_by(*this, n);
grow_array<GreasePencilDrawingBase *>(&this->drawing_array, &this->drawing_array_size, add_size);
MutableSpan<GreasePencilDrawingBase *> new_drawings = this->drawings_for_write().drop_front(
prev_size);
for (const int i : IndexRange(new_drawings.size())) {
@ -1156,7 +1152,7 @@ void GreasePencil::remove_drawing(int index_to_remove)
}
/* Shrink drawing array. */
grease_pencil_shrink_drawing_array_by(*this, 1);
shrink_array<GreasePencilDrawingBase *>(&this->drawing_array, &this->drawing_array_size, 1);
}
void GreasePencil::foreach_visible_drawing(