diff options
Diffstat (limited to 'source/blender/blenkernel/BKE_curves.hh')
| -rw-r--r-- | source/blender/blenkernel/BKE_curves.hh | 37 |
1 files changed, 32 insertions, 5 deletions
diff --git a/source/blender/blenkernel/BKE_curves.hh b/source/blender/blenkernel/BKE_curves.hh index 6e4d4d560f7..dea9c17d159 100644 --- a/source/blender/blenkernel/BKE_curves.hh +++ b/source/blender/blenkernel/BKE_curves.hh @@ -60,6 +60,12 @@ struct BasisCache { class CurvesGeometryRuntime { public: /** + * The cached number of curves with each type. Unlike other caches here, this is not computed + * lazily, since it is needed so often and types are not adjusted much anyway. + */ + std::array<int, CURVE_TYPES_NUM> type_counts; + + /** * Cache of offsets into the evaluated array for each curve, accounting for all previous * evaluated points, Bezier curve vector segments, different resolutions per curve, etc. */ @@ -156,15 +162,23 @@ class CurvesGeometry : public ::CurvesGeometry { /** The type (#CurveType) of each curve, or potentially a single if all are the same type. */ VArray<int8_t> curve_types() const; - /** Mutable access to curve types. Call #tag_topology_changed after changing any type. */ + /** + * Mutable access to curve types. Call #tag_topology_changed and #update_curve_types after + * changing any type. Consider using the other methods to change types below. + * */ MutableSpan<int8_t> curve_types_for_write(); + /** Set all curve types to the value and call #update_curve_types. */ + void fill_curve_types(CurveType type); + /** Set the types for the curves in the selection and call #update_curve_types. */ + void fill_curve_types(IndexMask selection, CurveType type); + /** Update the cached count of curves of each type, necessary after #curve_types_for_write. */ + void update_curve_types(); bool has_curve_with_type(const CurveType type) const; - /** Return the number of curves with each type. */ - std::array<int, CURVE_TYPES_NUM> count_curve_types() const; - /** Return true if all of the curves have the provided type. */ bool is_single_type(CurveType type) const; + /** Return the number of curves with each type. */ + const std::array<int, CURVE_TYPES_NUM> &curve_type_counts() const; Span<float3> positions() const; MutableSpan<float3> positions_for_write(); @@ -624,6 +638,8 @@ Curves *curves_new_nomain(int points_num, int curves_num); */ Curves *curves_new_nomain_single(int points_num, CurveType type); +std::array<int, CURVE_TYPES_NUM> calculate_type_counts(const VArray<int8_t> &types); + /** \} */ /* -------------------------------------------------------------------- */ @@ -649,7 +665,18 @@ inline IndexRange CurvesGeometry::curves_range() const inline bool CurvesGeometry::is_single_type(const CurveType type) const { - return this->count_curve_types()[type] == this->curves_num(); + return this->curve_type_counts()[type] == this->curves_num(); +} + +inline bool CurvesGeometry::has_curve_with_type(const CurveType type) const +{ + return this->curve_type_counts()[type] > 0; +} + +inline const std::array<int, CURVE_TYPES_NUM> &CurvesGeometry::curve_type_counts() const +{ + BLI_assert(this->runtime->type_counts == calculate_type_counts(this->curve_types())); + return this->runtime->type_counts; } inline IndexRange CurvesGeometry::points_for_curve(const int index) const |