Merge branch 'master' into soc-2021-uv-edge-select-supportsoc-2021-uv-edge-select-support

1 files changed, 85 insertions, 26 deletions

diff --git a/source/blender/nodes/geometry/nodes/node_geo_input_spline_length.cc b/source/blender/nodes/geometry/nodes/node_geo_input_spline_length.cc
index a976e0b193f..810d6e2fddd 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_input_spline_length.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_input_spline_length.cc
@@ -18,16 +18,20 @@
 
 #include "BKE_spline.hh"
 
-namespace blender::nodes {
+namespace blender::nodes::node_geo_input_spline_length_cc {
 
-static void geo_node_input_spline_length_declare(NodeDeclarationBuilder &b)
+static void node_declare(NodeDeclarationBuilder &b)
 {
   b.add_output<decl::Float>(N_("Length")).field_source();
+  b.add_output<decl::Int>(N_("Point Count")).field_source();
 }
 
+/* --------------------------------------------------------------------
+ * Spline Length
+ */
+
 static VArray<float> construct_spline_length_gvarray(const CurveComponent &component,
-                                                     const AttributeDomain domain,
-                                                     ResourceScope &UNUSED(scope))
+                                                     const AttributeDomain domain)
 {
   const CurveEval *curve = component.get_for_read();
   if (curve == nullptr) {
@@ -46,29 +50,23 @@ static VArray<float> construct_spline_length_gvarray(const CurveComponent &compo
         std::move(length), ATTR_DOMAIN_CURVE, ATTR_DOMAIN_POINT);
   }
 
-  return nullptr;
+  return {};
 }
 
-class SplineLengthFieldInput final : public fn::FieldInput {
+class SplineLengthFieldInput final : public GeometryFieldInput {
  public:
-  SplineLengthFieldInput() : fn::FieldInput(CPPType::get<float>(), "Spline Length node")
+  SplineLengthFieldInput() : GeometryFieldInput(CPPType::get<float>(), "Spline Length node")
   {
     category_ = Category::Generated;
   }
 
-  GVArray get_varray_for_context(const fn::FieldContext &context,
-                                 IndexMask UNUSED(mask),
-                                 ResourceScope &scope) const final
+  GVArray get_varray_for_context(const GeometryComponent &component,
+                                 const AttributeDomain domain,
+                                 IndexMask UNUSED(mask)) const final
   {
-    if (const GeometryComponentFieldContext *geometry_context =
-            dynamic_cast<const GeometryComponentFieldContext *>(&context)) {
-
-      const GeometryComponent &component = geometry_context->geometry_component();
-      const AttributeDomain domain = geometry_context->domain();
-      if (component.type() == GEO_COMPONENT_TYPE_CURVE) {
-        const CurveComponent &curve_component = static_cast<const CurveComponent &>(component);
-        return construct_spline_length_gvarray(curve_component, domain, scope);
-      }
+    if (component.type() == GEO_COMPONENT_TYPE_CURVE) {
+      const CurveComponent &curve_component = static_cast<const CurveComponent &>(component);
+      return construct_spline_length_gvarray(curve_component, domain);
     }
     return {};
   }
@@ -85,20 +83,81 @@ class SplineLengthFieldInput final : public fn::FieldInput {
   }
 };
 
-static void geo_node_input_spline_length_exec(GeoNodeExecParams params)
+/* --------------------------------------------------------------------
+ * Spline Count
+ */
+
+static VArray<int> construct_spline_count_gvarray(const CurveComponent &component,
+                                                  const AttributeDomain domain)
+{
+  const CurveEval *curve = component.get_for_read();
+  if (curve == nullptr) {
+    return {};
+  }
+
+  Span<SplinePtr> splines = curve->splines();
+  auto count_fn = [splines](int i) { return splines[i]->size(); };
+
+  if (domain == ATTR_DOMAIN_CURVE) {
+    return VArray<int>::ForFunc(splines.size(), count_fn);
+  }
+  if (domain == ATTR_DOMAIN_POINT) {
+    VArray<int> count = VArray<int>::ForFunc(splines.size(), count_fn);
+    return component.attribute_try_adapt_domain<int>(
+        std::move(count), ATTR_DOMAIN_CURVE, ATTR_DOMAIN_POINT);
+  }
+
+  return {};
+}
+
+class SplineCountFieldInput final : public GeometryFieldInput {
+ public:
+  SplineCountFieldInput() : GeometryFieldInput(CPPType::get<int>(), "Spline Point Count")
+  {
+    category_ = Category::Generated;
+  }
+
+  GVArray get_varray_for_context(const GeometryComponent &component,
+                                 const AttributeDomain domain,
+                                 IndexMask UNUSED(mask)) const final
+  {
+    if (component.type() == GEO_COMPONENT_TYPE_CURVE) {
+      const CurveComponent &curve_component = static_cast<const CurveComponent &>(component);
+      return construct_spline_count_gvarray(curve_component, domain);
+    }
+    return {};
+  }
+
+  uint64_t hash() const override
+  {
+    /* Some random constant hash. */
+    return 456364322625;
+  }
+
+  bool is_equal_to(const fn::FieldNode &other) const override
+  {
+    return dynamic_cast<const SplineCountFieldInput *>(&other) != nullptr;
+  }
+};
+
+static void node_geo_exec(GeoNodeExecParams params)
 {
-  Field<float> length_field{std::make_shared<SplineLengthFieldInput>()};
-  params.set_output("Length", std::move(length_field));
+  Field<float> spline_length_field{std::make_shared<SplineLengthFieldInput>()};
+  Field<int> spline_count_field{std::make_shared<SplineCountFieldInput>()};
+
+  params.set_output("Length", std::move(spline_length_field));
+  params.set_output("Point Count", std::move(spline_count_field));
 }
 
-}  // namespace blender::nodes
+}  // namespace blender::nodes::node_geo_input_spline_length_cc
 
 void register_node_type_geo_input_spline_length()
 {
-  static bNodeType ntype;
+  namespace file_ns = blender::nodes::node_geo_input_spline_length_cc;
 
+  static bNodeType ntype;
   geo_node_type_base(&ntype, GEO_NODE_INPUT_SPLINE_LENGTH, "Spline Length", NODE_CLASS_INPUT, 0);
-  ntype.geometry_node_execute = blender::nodes::geo_node_input_spline_length_exec;
-  ntype.declare = blender::nodes::geo_node_input_spline_length_declare;
+  ntype.geometry_node_execute = file_ns::node_geo_exec;
+  ntype.declare = file_ns::node_declare;
   nodeRegisterType(&ntype);
 }