griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Geometry Nodes: Add preferred domain to many field inputs

Browse Source 
The preferred domain is used to decide which domain the viewer node
should use when set to "Auto" domain. This commit adds it to some curve
input nodes and the curve and mesh topology nodes. This makes debugging
node setups with these nodes a bit faster and less frustrating.
This commit is contained in:
Hans Goudey
2022-11-08 13:33:58 -06:00
parent da41f11a29
commit d80d7b8f70
13 changed files with 92 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
source/blender/blenkernel/BKE_geometry_fields.hh
View File

@@ -306,6 +306,7 @@ class CurveLengthFieldInput final : public CurvesFieldInput {
IndexMask mask) const final;
uint64_t hash() const override;
bool is_equal_to(const fn::FieldNode &other) const override;
std::optional<eAttrDomain> preferred_domain(const bke::CurvesGeometry &curves) const final;
};
bool try_capture_field_on_geometry(GeometryComponent &component,

6
source/blender/blenkernel/intern/geometry_component_curves.cc
View File

@@ -282,6 +282,12 @@ bool CurveLengthFieldInput::is_equal_to(const fn::FieldNode &other) const
return dynamic_cast<const CurveLengthFieldInput *>(&other) != nullptr;
}
std::optional<eAttrDomain> CurveLengthFieldInput::preferred_domain(
const bke::CurvesGeometry & /*curves*/) const
{
return ATTR_DOMAIN_CURVE;
}
/** \} */
} // namespace blender::bke

10
source/blender/nodes/geometry/nodes/node_geo_curve_topology_curve_of_point.cc
View File

@@ -48,6 +48,11 @@ class CurveOfPointInput final : public bke::CurvesFieldInput {
}
return false;
}
std::optional<eAttrDomain> preferred_domain(const bke::CurvesGeometry & /*curves*/)const final
{
return ATTR_DOMAIN_POINT;
}
};
class PointIndexInCurveInput final : public bke::CurvesFieldInput {
@@ -86,6 +91,11 @@ class PointIndexInCurveInput final : public bke::CurvesFieldInput {
}
return false;
}
std::optional<eAttrDomain> preferred_domain(const bke::CurvesGeometry & /*curves*/)
{
return ATTR_DOMAIN_POINT;
}
};
static void node_geo_exec(GeoNodeExecParams params)

10
source/blender/nodes/geometry/nodes/node_geo_curve_topology_points_of_curve.cc
View File

@@ -113,6 +113,11 @@ class PointsOfCurveInput final : public bke::CurvesFieldInput {
}
return false;
}
std::optional<eAttrDomain> preferred_domain(const bke::CurvesGeometry & /*curves*/)const final
{
return ATTR_DOMAIN_CURVE;
}
};
class CurvePointCountInput final : public bke::CurvesFieldInput {
@@ -146,6 +151,11 @@ class CurvePointCountInput final : public bke::CurvesFieldInput {
}
return false;
}
std::optional<eAttrDomain> preferred_domain(const bke::CurvesGeometry & /*curves*/)const final
{
return ATTR_DOMAIN_CURVE;
}
};
static void node_geo_exec(GeoNodeExecParams params)

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

@@ -56,6 +56,11 @@ class SplineCountFieldInput final : public bke::CurvesFieldInput {
{
return dynamic_cast<const SplineCountFieldInput *>(&other) != nullptr;
}
std::optional<eAttrDomain> preferred_domain(const bke::CurvesGeometry & /*curves*/) const final
{
return ATTR_DOMAIN_CURVE;
}
};
static void node_geo_exec(GeoNodeExecParams params)

5
source/blender/nodes/geometry/nodes/node_geo_input_tangent.cc
View File

@@ -110,6 +110,11 @@ class TangentFieldInput final : public bke::CurvesFieldInput {
{
return dynamic_cast<const TangentFieldInput *>(&other) != nullptr;
}
std::optional<eAttrDomain> preferred_domain(const bke::CurvesGeometry & /*curves*/) const final
{
return ATTR_DOMAIN_POINT;
}
};
static void node_geo_exec(GeoNodeExecParams params)

10
source/blender/nodes/geometry/nodes/node_geo_mesh_topology_corners_of_face.cc
View File

@@ -117,6 +117,11 @@ class CornersOfFaceInput final : public bke::MeshFieldInput {
}
return false;
}
std::optional<eAttrDomain> preferred_domain(const Mesh & /*mesh*/)const final
{
return ATTR_DOMAIN_FACE;
}
};
static int get_poly_totloop(const MPoly &poly)
@@ -153,6 +158,11 @@ class CornersOfFaceCountInput final : public bke::MeshFieldInput {
}
return false;
}
std::optional<eAttrDomain> preferred_domain(const Mesh & /*mesh*/)const final
{
return ATTR_DOMAIN_FACE;
}
};
static void node_geo_exec(GeoNodeExecParams params)

10
source/blender/nodes/geometry/nodes/node_geo_mesh_topology_corners_of_vertex.cc
View File

@@ -138,6 +138,11 @@ class CornersOfVertInput final : public bke::MeshFieldInput {
}
return false;
}
std::optional<eAttrDomain> preferred_domain(const Mesh & /*mesh*/)const final
{
return ATTR_DOMAIN_POINT;
}
};
class CornersOfVertCountInput final : public bke::MeshFieldInput {
@@ -174,6 +179,11 @@ class CornersOfVertCountInput final : public bke::MeshFieldInput {
}
return false;
}
std::optional<eAttrDomain> preferred_domain(const Mesh & /*mesh*/)const final
{
return ATTR_DOMAIN_POINT;
}
};
static void node_geo_exec(GeoNodeExecParams params)

10
source/blender/nodes/geometry/nodes/node_geo_mesh_topology_edges_of_corner.cc
View File

@@ -59,6 +59,11 @@ class CornerNextEdgeFieldInput final : public bke::MeshFieldInput {
}
return false;
}
std::optional<eAttrDomain> preferred_domain(const Mesh & /*mesh*/)const final
{
return ATTR_DOMAIN_CORNER;
}
};
class CornerPreviousEdgeFieldInput final : public bke::MeshFieldInput {
@@ -100,6 +105,11 @@ class CornerPreviousEdgeFieldInput final : public bke::MeshFieldInput {
}
return false;
}
std::optional<eAttrDomain> preferred_domain(const Mesh & /*mesh*/)const final
{
return ATTR_DOMAIN_CORNER;
}
};
static void node_geo_exec(GeoNodeExecParams params)

10
source/blender/nodes/geometry/nodes/node_geo_mesh_topology_edges_of_vertex.cc
View File

@@ -138,6 +138,11 @@ class EdgesOfVertInput final : public bke::MeshFieldInput {
}
return false;
}
std::optional<eAttrDomain> preferred_domain(const Mesh & /*mesh*/)const final
{
return ATTR_DOMAIN_POINT;
}
};
class EdgesOfVertCountInput final : public bke::MeshFieldInput {
@@ -175,6 +180,11 @@ class EdgesOfVertCountInput final : public bke::MeshFieldInput {
}
return false;
}
std::optional<eAttrDomain> preferred_domain(const Mesh & /*mesh*/)const final
{
return ATTR_DOMAIN_POINT;
}
};
static void node_geo_exec(GeoNodeExecParams params)

5
source/blender/nodes/geometry/nodes/node_geo_mesh_topology_face_of_corner.cc
View File

@@ -85,6 +85,11 @@ class CornerIndexInFaceInput final : public bke::MeshFieldInput {
}
return false;
}
std::optional<eAttrDomain> preferred_domain(const Mesh & /*mesh*/) const final
{
return ATTR_DOMAIN_CORNER;
}
};
static void node_geo_exec(GeoNodeExecParams params)

5
source/blender/nodes/geometry/nodes/node_geo_mesh_topology_offset_corner_in_face.cc
View File

@@ -86,6 +86,11 @@ class OffsetCornerInFaceFieldInput final : public bke::MeshFieldInput {
}
return false;
}
std::optional<eAttrDomain> preferred_domain(const Mesh & /*mesh*/)const final
{
return ATTR_DOMAIN_CORNER;
}
};
static void node_geo_exec(GeoNodeExecParams params)

5
source/blender/nodes/geometry/nodes/node_geo_mesh_topology_vertex_of_corner.cc
View File

@@ -53,6 +53,11 @@ class CornerVertFieldInput final : public bke::MeshFieldInput {
}
return false;
}
std::optional<eAttrDomain> preferred_domain(const Mesh & /*mesh*/) const final
{
return ATTR_DOMAIN_CORNER;
}
};
static void node_geo_exec(GeoNodeExecParams params)