diff options
author | Hans Goudey <h.goudey@me.com> | 2021-12-15 18:34:13 +0300 |
---|---|---|
committer | Hans Goudey <h.goudey@me.com> | 2021-12-15 18:34:13 +0300 |
commit | 474adc6f883c2d5a854d7324364f7996044d83cb (patch) | |
tree | 7ed0cf70d7195526e389c586fdd87af193c8215b /source/blender/functions | |
parent | d79868c4e678b22f7f277d98ae3ce729893fdfb7 (diff) |
Refactor: Simplify spreadsheet handling of cell values
Previously we used a `CellValue` class to hold the data for a cell,
and called a function to fill it whenever necessary. This is an
unnecessary complication when we have virtual generic arrays
and most data is already easily accessible that way anyway.
This patch removes `CellValue` and uses `fn::GVArray` to provide
access to data instead.
In the future, if rows have different types within a single column,
we can use a `GVArray` of `blender::Any` to interface with the drawing.
Along with that, the use of virtual arrays made it easy to do a
few other cleanups:
- Use selection domain interpolations from rB5841f8656d95
for the mesh selection filter.
- Change the row filter to only calculate for necessary indices.
Differential Revision: https://developer.blender.org/D13478
Diffstat (limited to 'source/blender/functions')
-rw-r--r-- | source/blender/functions/FN_generic_virtual_array.hh | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/source/blender/functions/FN_generic_virtual_array.hh b/source/blender/functions/FN_generic_virtual_array.hh index 03e81b13714..fc8612d6f87 100644 --- a/source/blender/functions/FN_generic_virtual_array.hh +++ b/source/blender/functions/FN_generic_virtual_array.hh @@ -174,6 +174,11 @@ class GVArrayCommon { void get_internal_single_to_uninitialized(void *r_value) const; void get(const int64_t index, void *r_value) const; + /** + * Returns a copy of the value at the given index. Usually a typed virtual array should + * be used instead, but sometimes this is simpler when only a few indices are needed. + */ + template<typename T> T get(const int64_t index) const; void get_to_uninitialized(const int64_t index, void *r_value) const; }; @@ -691,6 +696,16 @@ inline void GVArrayCommon::get(const int64_t index, void *r_value) const impl_->get(index, r_value); } +template<typename T> inline T GVArrayCommon::get(const int64_t index) const +{ + BLI_assert(index >= 0); + BLI_assert(index < this->size()); + BLI_assert(this->type().is<T>()); + T value{}; + impl_->get(index, &value); + return value; +} + /* Same as `get`, but `r_value` is expected to point to uninitialized memory. */ inline void GVArrayCommon::get_to_uninitialized(const int64_t index, void *r_value) const { |