blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 747 Projects 19 Wiki Activity

Curves: Port length node to the new data-block 

Ref T95443
This commit is contained in:
Hans Goudey 2022-03-29 20:17:35 -05:00
parent f4f89a76a8
commit 62334c6ee4
Notes: blender-bot 2023-02-14 08:49:53 +01:00 
Referenced by issue #95443, Refactor curve nodes to use new data structure
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
source/blender/nodes/geometry/nodes/node_geo_input_spline_length.cc
View File

@ -3,7 +3,6 @@
#include "node_geometry_util.hh"
#include "BKE_curves.hh"
#include "BKE_spline.hh"
namespace blender::nodes::node_geo_input_spline_length_cc {
@ -23,21 +22,24 @@ static VArray<float> construct_spline_length_gvarray(const CurveComponent &compo
if (!component.has_curves()) {
return {};
}
const std::unique_ptr<CurveEval> curve = curves_to_curve_eval(*component.get_for_read());
const Curves &curves_id = *component.get_for_read();
const bke::CurvesGeometry &curves = bke::CurvesGeometry::wrap(curves_id.geometry);
Span<SplinePtr> splines = curve->splines();
Array<float> spline_lenghts(splines.size());
for (const int i : splines.index_range()) {
spline_lenghts[i] = splines[i]->length();
}
curves.ensure_evaluated_lengths();
VArray<bool> cyclic = curves.cyclic();
VArray<float> lengths = VArray<float>::ForFunc(
curves.curves_num(), [&curves, cyclic = std::move(cyclic)](int64_t index) {
return curves.evaluated_length_total_for_curve(index, cyclic[index]);
});
if (domain == ATTR_DOMAIN_CURVE) {
return VArray<float>::ForContainer(std::move(spline_lenghts));
return lengths;
}
if (domain == ATTR_DOMAIN_POINT) {
VArray<float> length = VArray<float>::ForContainer(std::move(spline_lenghts));
return component.attribute_try_adapt_domain<float>(
std::move(length), ATTR_DOMAIN_CURVE, ATTR_DOMAIN_POINT);
std::move(lengths), ATTR_DOMAIN_CURVE, ATTR_DOMAIN_POINT);
}
return {};