[Bf-blender-cvs] [ea43a2873e0] gpencil-new-data-proposal: Small refactor
Falk David
noreply at git.blender.org
Tue May 10 12:25:33 CEST 2022
Commit: ea43a2873e03832646f5bd27f8151139703081f3
Author: Falk David
Date: Tue May 10 11:45:22 2022 +0200
Branches: gpencil-new-data-proposal
https://developer.blender.org/rBea43a2873e03832646f5bd27f8151139703081f3
Small refactor
===================================================================
M source/blender/blenkernel/intern/gpencil_new_proposal_test.cc
===================================================================
diff --git a/source/blender/blenkernel/intern/gpencil_new_proposal_test.cc b/source/blender/blenkernel/intern/gpencil_new_proposal_test.cc
index 0c3a5656b4a..6ca3f0db51c 100644
--- a/source/blender/blenkernel/intern/gpencil_new_proposal_test.cc
+++ b/source/blender/blenkernel/intern/gpencil_new_proposal_test.cc
@@ -51,6 +51,10 @@ class GPDataRuntime {
}
};
+/**
+ * A wrapper class around a single curve in GPFrame.strokes (CurvesGeometry). It holds the offset
+ * of where to find the stroke in the frame and it's size.
+ */
class GPStroke {
public:
GPStroke(int num_points, int offset_index)
@@ -63,6 +67,11 @@ class GPStroke {
return num_points_;
}
+ int point_offset() const
+ {
+ return offset_index_;
+ }
+
private:
int num_points_;
int offset_index_;
@@ -311,7 +320,7 @@ class GPData : public ::GPData {
int add_layer(GPLayer &new_layer)
{
/* Ensure that the layer array has enough space. */
- if (!ensure_layer_array_has_size_at_least(this->layers_size + 1)) {
+ if (!ensure_layers_array_has_size_at_least(this->layers_size + 1)) {
return -1;
}
@@ -324,7 +333,7 @@ class GPData : public ::GPData {
{
/* TODO: Check for collisions. */
- if (!ensure_frame_array_has_size_at_least(this->frames_size + 1)) {
+ if (!ensure_frames_array_has_size_at_least(this->frames_size + 1)) {
return nullptr;
}
@@ -364,7 +373,7 @@ class GPData : public ::GPData {
}
private:
- const bool ensure_layer_array_has_size_at_least(int64_t size)
+ const bool ensure_layers_array_has_size_at_least(int64_t size)
{
if (this->layers_size > size) {
return true;
@@ -380,6 +389,7 @@ class GPData : public ::GPData {
}
if (this->layers_array != nullptr) {
+ /* Since the layers have default move constructors, we just use memcpy here. */
memcpy(new_array, this->layers_array, old_size * sizeof(::GPLayer));
MEM_SAFE_FREE(this->layers_array);
}
@@ -388,7 +398,7 @@ class GPData : public ::GPData {
return true;
}
- const bool ensure_frame_array_has_size_at_least(int64_t size)
+ const bool ensure_frames_array_has_size_at_least(int64_t size)
{
if (this->frames_size > size) {
return true;
More information about the Bf-blender-cvs
mailing list