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

Cleanup: Rename field input class name

This commit is contained in:
Hans Goudey 2022-05-05 12:07:35 +02:00
parent 09f769bde5
commit b4fa74e812
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/nodes/geometry/node_geometry_util.hh
View File

@ -81,9 +81,9 @@ void separate_geometry(GeometrySet &geometry_set,
std::optional<CustomDataType> node_data_type_to_custom_data_type(eNodeSocketDatatype type);
std::optional<CustomDataType> node_socket_to_custom_data_type(const bNodeSocket &socket);
class SplineLengthFieldInput final : public GeometryFieldInput {
class CurveLengthFieldInput final : public GeometryFieldInput {
public:
SplineLengthFieldInput();
CurveLengthFieldInput();
GVArray get_varray_for_context(const GeometryComponent &component,
AttributeDomain domain,
IndexMask mask) const final;

2
source/blender/nodes/geometry/nodes/node_geo_curve_resample.cc
View File

@ -535,7 +535,7 @@ static Field<int> get_curve_count_field(GeoNodeExecParams params,
auto get_count_op = std::make_shared<FieldOperation>(
FieldOperation(get_count_fn,
{Field<float>(std::make_shared<SplineLengthFieldInput>()),
{Field<float>(std::make_shared<CurveLengthFieldInput>()),
params.extract_input<Field<float>>("Length")}));
return Field<int>(std::move(get_count_op));

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

@ -39,15 +39,15 @@ static VArray<float> construct_spline_length_gvarray(const CurveComponent &compo
return {};
}
SplineLengthFieldInput::SplineLengthFieldInput()
CurveLengthFieldInput::CurveLengthFieldInput()
: GeometryFieldInput(CPPType::get<float>(), "Spline Length node")
{
category_ = Category::Generated;
}
GVArray SplineLengthFieldInput::get_varray_for_context(const GeometryComponent &component,
const AttributeDomain domain,
IndexMask UNUSED(mask)) const
GVArray CurveLengthFieldInput::get_varray_for_context(const GeometryComponent &component,
const AttributeDomain domain,
IndexMask UNUSED(mask)) const
{
if (component.type() == GEO_COMPONENT_TYPE_CURVE) {
const CurveComponent &curve_component = static_cast<const CurveComponent &>(component);
@ -56,15 +56,15 @@ GVArray SplineLengthFieldInput::get_varray_for_context(const GeometryComponent &
return {};
}
uint64_t SplineLengthFieldInput::hash() const
uint64_t CurveLengthFieldInput::hash() const
{
/* Some random constant hash. */
return 3549623580;
}
bool SplineLengthFieldInput::is_equal_to(const fn::FieldNode &other) const
bool CurveLengthFieldInput::is_equal_to(const fn::FieldNode &other) const
{
return dynamic_cast<const SplineLengthFieldInput *>(&other) != nullptr;
return dynamic_cast<const CurveLengthFieldInput *>(&other) != nullptr;
}
} // namespace blender::nodes
@ -136,7 +136,7 @@ class SplineCountFieldInput final : public GeometryFieldInput {
static void node_geo_exec(GeoNodeExecParams params)
{
Field<float> spline_length_field{std::make_shared<SplineLengthFieldInput>()};
Field<float> spline_length_field{std::make_shared<CurveLengthFieldInput>()};
Field<int> spline_count_field{std::make_shared<SplineCountFieldInput>()};
params.set_output("Length", std::move(spline_length_field));