[Bf-blender-cvs] [a715aec6a3e] temp-geometry-nodes-fields-prototype: initial sample mesh surface
Jacques Lucke
noreply at git.blender.org
Wed Aug 18 12:53:35 CEST 2021
Commit: a715aec6a3ed15a02c44f48686bd78fd3dc8a9cf
Author: Jacques Lucke
Date: Wed Aug 18 12:53:23 2021 +0200
Branches: temp-geometry-nodes-fields-prototype
https://developer.blender.org/rBa715aec6a3ed15a02c44f48686bd78fd3dc8a9cf
initial sample mesh surface
This is a field based alternative for the attribute transfer node.
The main goal here is to experiment with how attribute transfer
should be done with fields.
===================================================================
M release/scripts/startup/nodeitems_builtins.py
M source/blender/blenkernel/BKE_field.hh
M source/blender/blenkernel/BKE_node.h
M source/blender/blenkernel/intern/node.cc
M source/blender/nodes/CMakeLists.txt
M source/blender/nodes/NOD_geometry.h
M source/blender/nodes/NOD_static_types.h
M source/blender/nodes/geometry/node_geometry_util.cc
M source/blender/nodes/geometry/node_geometry_util.hh
M source/blender/nodes/geometry/nodes/node_geo_attribute_freeze.cc
A source/blender/nodes/geometry/nodes/node_geo_sample_mesh_surface.cc
===================================================================
diff --git a/release/scripts/startup/nodeitems_builtins.py b/release/scripts/startup/nodeitems_builtins.py
index cf0f9c18f8a..a96d63dbdbb 100644
--- a/release/scripts/startup/nodeitems_builtins.py
+++ b/release/scripts/startup/nodeitems_builtins.py
@@ -484,6 +484,7 @@ geometry_node_categories = [
NodeItem("GeometryNodeAttributeTransfer"),
NodeItem("GeometryNodeAttributeExtract"),
NodeItem("GeometryNodeAttributeFreeze"),
+ NodeItem("GeometryNodeSampleMeshSurface"),
]),
GeometryNodeCategory("GEO_COLOR", "Color", items=[
NodeItem("ShaderNodeRGBCurve"),
diff --git a/source/blender/blenkernel/BKE_field.hh b/source/blender/blenkernel/BKE_field.hh
index 0c675ec9a89..801060cc070 100644
--- a/source/blender/blenkernel/BKE_field.hh
+++ b/source/blender/blenkernel/BKE_field.hh
@@ -350,14 +350,16 @@ template<typename KeyT> class GVArrayInputField : public Field {
class MultiFunctionField : public Field {
private:
Vector<FieldPtr> input_fields_;
- const MultiFunction *fn_;
+ optional_ptr<const MultiFunction> fn_;
const int output_param_index_;
public:
MultiFunctionField(Vector<FieldPtr> input_fields,
- const MultiFunction &fn,
+ optional_ptr<const MultiFunction> fn,
const int output_param_index)
- : input_fields_(std::move(input_fields)), fn_(&fn), output_param_index_(output_param_index)
+ : input_fields_(std::move(input_fields)),
+ fn_(std::move(fn)),
+ output_param_index_(output_param_index)
{
}
diff --git a/source/blender/blenkernel/BKE_node.h b/source/blender/blenkernel/BKE_node.h
index 346b5b578d4..7b3321bf70f 100644
--- a/source/blender/blenkernel/BKE_node.h
+++ b/source/blender/blenkernel/BKE_node.h
@@ -1487,6 +1487,7 @@ int ntreeTexExecTree(struct bNodeTree *ntree,
#define GEO_NODE_EXTRUDE_AND_MOVE 1082
#define GEO_NODE_POSITION 1083
#define GEO_NODE_SET_POSITION 1084
+#define GEO_NODE_SAMPLE_MESH_SURFACE 1085
/** \} */
diff --git a/source/blender/blenkernel/intern/node.cc b/source/blender/blenkernel/intern/node.cc
index ae3cff7c79c..33b227ae73d 100644
--- a/source/blender/blenkernel/intern/node.cc
+++ b/source/blender/blenkernel/intern/node.cc
@@ -5189,6 +5189,7 @@ static void registerGeometryNodes()
register_node_type_geo_points_to_volume();
register_node_type_geo_position();
register_node_type_geo_raycast();
+ register_node_type_geo_sample_mesh_surface();
register_node_type_geo_sample_texture();
register_node_type_geo_select_by_handle_type();
register_node_type_geo_select_by_material();
diff --git a/source/blender/nodes/CMakeLists.txt b/source/blender/nodes/CMakeLists.txt
index 5adcd7e006c..9ac8dff68ab 100644
--- a/source/blender/nodes/CMakeLists.txt
+++ b/source/blender/nodes/CMakeLists.txt
@@ -217,6 +217,7 @@ set(SRC
geometry/nodes/node_geo_points_to_volume.cc
geometry/nodes/node_geo_position.cc
geometry/nodes/node_geo_raycast.cc
+ geometry/nodes/node_geo_sample_mesh_surface.cc
geometry/nodes/node_geo_select_by_material.cc
geometry/nodes/node_geo_separate_components.cc
geometry/nodes/node_geo_set_position.cc
diff --git a/source/blender/nodes/NOD_geometry.h b/source/blender/nodes/NOD_geometry.h
index 82fe217df40..b6390825625 100644
--- a/source/blender/nodes/NOD_geometry.h
+++ b/source/blender/nodes/NOD_geometry.h
@@ -102,6 +102,7 @@ void register_node_type_geo_point_translate(void);
void register_node_type_geo_points_to_volume(void);
void register_node_type_geo_position(void);
void register_node_type_geo_raycast(void);
+void register_node_type_geo_sample_mesh_surface(void);
void register_node_type_geo_sample_texture(void);
void register_node_type_geo_select_by_handle_type(void);
void register_node_type_geo_select_by_material(void);
diff --git a/source/blender/nodes/NOD_static_types.h b/source/blender/nodes/NOD_static_types.h
index 94230fc74d6..b29cb1389e0 100644
--- a/source/blender/nodes/NOD_static_types.h
+++ b/source/blender/nodes/NOD_static_types.h
@@ -345,6 +345,7 @@ DefNode(GeometryNode, GEO_NODE_POINT_TRANSLATE, def_geo_point_translate, "POINT_
DefNode(GeometryNode, GEO_NODE_POINTS_TO_VOLUME, def_geo_points_to_volume, "POINTS_TO_VOLUME", PointsToVolume, "Points to Volume", "")
DefNode(GeometryNode, GEO_NODE_POSITION, 0, "POSITION", Position, "Position", "")
DefNode(GeometryNode, GEO_NODE_RAYCAST, def_geo_raycast, "RAYCAST", Raycast, "Raycast", "")
+DefNode(GeometryNode, GEO_NODE_SAMPLE_MESH_SURFACE, 0, "SAMPLE_MESH_SURFACE", SampleMeshSurface, "Sample Mesh Surface", "")
DefNode(GeometryNode, GEO_NODE_SELECT_BY_MATERIAL, 0, "SELECT_BY_MATERIAL", SelectByMaterial, "Select by Material", "")
DefNode(GeometryNode, GEO_NODE_SET_POSITION, 0, "SET_POSITION", SetPosition, "Set Position", "")
DefNode(GeometryNode, GEO_NODE_SEPARATE_COMPONENTS, 0, "SEPARATE_COMPONENTS", SeparateComponents, "Separate Components", "")
diff --git a/source/blender/nodes/geometry/node_geometry_util.cc b/source/blender/nodes/geometry/node_geometry_util.cc
index 4f8842c1f17..f03b1e966e4 100644
--- a/source/blender/nodes/geometry/node_geometry_util.cc
+++ b/source/blender/nodes/geometry/node_geometry_util.cc
@@ -220,6 +220,64 @@ void prepare_field_inputs(bke::FieldInputs &field_inputs,
}
}
+template<typename T>
+void fill_attribute_impl(GeometryComponent &component,
+ OutputAttribute &attribute,
+ const bke::Field &field)
+{
+ const AttributeDomain domain = attribute.domain();
+ const int domain_size = attribute->size();
+ bke::FieldInputs field_inputs = field.prepare_inputs();
+ Vector<std::unique_ptr<bke::FieldInputValue>> input_values;
+ prepare_field_inputs(field_inputs, component, domain, input_values);
+ bke::FieldOutput field_output = field.evaluate(IndexMask(domain_size), field_inputs);
+ for (const int i : IndexRange(domain_size)) {
+ T value;
+ field_output.varray_ref().get(i, &value);
+ attribute->set_by_copy(i, &value);
+ }
+}
+
+void try_freeze_field_on_geometry(GeometryComponent &component,
+ const AnonymousCustomDataLayerID &layer_id,
+ AttributeDomain domain,
+ const bke::Field &field)
+{
+ const CustomDataType data_type = bke::cpp_type_to_custom_data_type(field.output_type());
+ OutputAttribute attribute = component.attribute_try_get_anonymous_for_output(
+ layer_id, domain, data_type);
+ if (!attribute) {
+ return;
+ }
+
+ switch (data_type) {
+ case CD_PROP_FLOAT: {
+ fill_attribute_impl<float>(component, attribute, field);
+ break;
+ }
+ case CD_PROP_FLOAT3: {
+ fill_attribute_impl<float3>(component, attribute, field);
+ break;
+ }
+ case CD_PROP_COLOR: {
+ fill_attribute_impl<ColorGeometry4f>(component, attribute, field);
+ break;
+ }
+ case CD_PROP_BOOL: {
+ fill_attribute_impl<bool>(component, attribute, field);
+ break;
+ }
+ case CD_PROP_INT32: {
+ fill_attribute_impl<int>(component, attribute, field);
+ break;
+ }
+ default:
+ break;
+ }
+
+ attribute.save();
+}
+
} // namespace blender::nodes
bool geo_node_poll_default(bNodeType *UNUSED(ntype),
diff --git a/source/blender/nodes/geometry/node_geometry_util.hh b/source/blender/nodes/geometry/node_geometry_util.hh
index 2aa7276578a..7ffacee88c4 100644
--- a/source/blender/nodes/geometry/node_geometry_util.hh
+++ b/source/blender/nodes/geometry/node_geometry_util.hh
@@ -107,4 +107,9 @@ void prepare_field_inputs(bke::FieldInputs &field_inputs,
const AttributeDomain domain,
Vector<std::unique_ptr<bke::FieldInputValue>> &r_values);
+void try_freeze_field_on_geometry(GeometryComponent &component,
+ const AnonymousCustomDataLayerID &layer_id,
+ AttributeDomain domain,
+ const bke::Field &field);
+
} // namespace blender::nodes
diff --git a/source/blender/nodes/geometry/nodes/node_geo_attribute_freeze.cc b/source/blender/nodes/geometry/nodes/node_geo_attribute_freeze.cc
index 4f4468d8860..8404f884373 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_attribute_freeze.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_attribute_freeze.cc
@@ -17,6 +17,8 @@
#include "UI_interface.h"
#include "UI_resources.h"
+#include "BKE_attribute_math.hh"
+
#include "node_geometry_util.hh"
static bNodeSocketTemplate geo_node_attribute_freeze_in[] = {
@@ -133,74 +135,6 @@ static void set_output_field(GeoNodeExecParams ¶ms,
}
}
-template<typename T>
-void fill_attribute_impl(GeometryComponent &component,
- OutputAttribute &attribute,
- const GeoNodeExecParams ¶ms,
- const StringRef input_name)
-{
- const AttributeDomain domain = attribute.domain();
- const int domain_size = attribute->size();
- bke::FieldRef<T> value_field = params.get_input_field<T>(input_name);
- bke::FieldInputs field_inputs = value_field->prepare_inputs();
- Vector<std::unique_ptr<bke::FieldInputValue>> input_values;
- prepare_field_inputs(field_inputs, component, domain, input_values);
- bke::FieldOutput field_output = value_field->evaluate(IndexMask(domain_size), field_inputs);
- for (const int i : IndexRange(domain_size)) {
- T value;
- field_output.varray_ref().get(i, &value);
- attribute->set_by_copy(i, &value);
- }
-}
-
-static void fill_attribute_data(GeometryComponent &component,
- const GeoNodeExecParams ¶ms,
- OutputAttribute &attribute,
- const CustomDataType data_type)
-{
- switch (data_type) {
- case CD_PROP_FLOAT: {
- fill_attribute_impl<float>(component, attribute, params, "Value_001");
- break;
- }
- case CD_PROP_FLOAT3: {
- fill_attribute_impl<float3>(component, attribute, params, "Value");
- break;
- }
- case CD_PROP_COLOR: {
- fill_attribute_impl<ColorGeometry4f>(component, attribute, params, "Value_002");
- break;
- }
- cas
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list