diff options
author | Jacques Lucke <jacques@blender.org> | 2021-11-14 13:29:00 +0300 |
---|---|---|
committer | Jacques Lucke <jacques@blender.org> | 2021-11-14 13:29:00 +0300 |
commit | 8c404732865662b409581dcf380287d3dff1878f (patch) | |
tree | 40ac5b52675018fd9ab55de28a14a8930a4e4c4c | |
parent | 7e82c840b7a43b0594ba274c745f3049e0148d12 (diff) |
initial nod
-rw-r--r-- | release/scripts/startup/nodeitems_builtins.py | 1 | ||||
-rw-r--r-- | source/blender/blenkernel/BKE_node.h | 1 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/node.cc | 1 | ||||
-rw-r--r-- | source/blender/nodes/CMakeLists.txt | 1 | ||||
-rw-r--r-- | source/blender/nodes/NOD_geometry.h | 1 | ||||
-rw-r--r-- | source/blender/nodes/NOD_static_types.h | 1 | ||||
-rw-r--r-- | source/blender/nodes/geometry/nodes/node_geo_sample_sound.cc | 45 |
7 files changed, 51 insertions, 0 deletions
diff --git a/release/scripts/startup/nodeitems_builtins.py b/release/scripts/startup/nodeitems_builtins.py index 34f447a7108..e9d5c0bb32f 100644 --- a/release/scripts/startup/nodeitems_builtins.py +++ b/release/scripts/startup/nodeitems_builtins.py @@ -754,6 +754,7 @@ geometry_node_categories = [ NodeItem("GeometryNodeSwitch"), NodeItem("FunctionNodeRandomValue"), NodeItem("FunctionNodeAlignEulerToVector"), + NodeItem("GeometryNodeSampleSound"), ]), GeometryNodeCategory("GEO_VECTOR", "Vector", items=[ NodeItem("ShaderNodeVectorCurve"), diff --git a/source/blender/blenkernel/BKE_node.h b/source/blender/blenkernel/BKE_node.h index 645b4410623..d659e3800b1 100644 --- a/source/blender/blenkernel/BKE_node.h +++ b/source/blender/blenkernel/BKE_node.h @@ -1553,6 +1553,7 @@ int ntreeTexExecTree(struct bNodeTree *ntree, #define GEO_NODE_VOLUME_TO_MESH 1133 #define GEO_NODE_INPUT_ID 1134 #define GEO_NODE_SET_ID 1135 +#define GEO_NODE_SAMPLE_SOUND 1136 /** \} */ diff --git a/source/blender/blenkernel/intern/node.cc b/source/blender/blenkernel/intern/node.cc index 85ad233ab4f..e4cf0e3fb3d 100644 --- a/source/blender/blenkernel/intern/node.cc +++ b/source/blender/blenkernel/intern/node.cc @@ -5929,6 +5929,7 @@ static void registerGeometryNodes() register_node_type_geo_raycast(); register_node_type_geo_realize_instances(); register_node_type_geo_rotate_instances(); + register_node_type_geo_sample_sound(); register_node_type_geo_sample_texture(); register_node_type_geo_scale_instances(); register_node_type_geo_separate_components(); diff --git a/source/blender/nodes/CMakeLists.txt b/source/blender/nodes/CMakeLists.txt index 0b4c34d6155..782299bd707 100644 --- a/source/blender/nodes/CMakeLists.txt +++ b/source/blender/nodes/CMakeLists.txt @@ -268,6 +268,7 @@ set(SRC geometry/nodes/node_geo_raycast.cc geometry/nodes/node_geo_realize_instances.cc geometry/nodes/node_geo_rotate_instances.cc + geometry/nodes/node_geo_sample_sound.cc geometry/nodes/node_geo_scale_instances.cc geometry/nodes/node_geo_separate_components.cc geometry/nodes/node_geo_separate_geometry.cc diff --git a/source/blender/nodes/NOD_geometry.h b/source/blender/nodes/NOD_geometry.h index ea3458af065..4502d31e6a0 100644 --- a/source/blender/nodes/NOD_geometry.h +++ b/source/blender/nodes/NOD_geometry.h @@ -140,6 +140,7 @@ void register_node_type_geo_proximity(void); void register_node_type_geo_raycast(void); void register_node_type_geo_realize_instances(void); void register_node_type_geo_rotate_instances(void); +void register_node_type_geo_sample_sound(void); void register_node_type_geo_sample_texture(void); void register_node_type_geo_scale_instances(void); void register_node_type_geo_select_by_handle_type(void); diff --git a/source/blender/nodes/NOD_static_types.h b/source/blender/nodes/NOD_static_types.h index 20ad4d359f1..8d549306cd5 100644 --- a/source/blender/nodes/NOD_static_types.h +++ b/source/blender/nodes/NOD_static_types.h @@ -418,6 +418,7 @@ DefNode(GeometryNode, GEO_NODE_TRIANGULATE, def_geo_triangulate, "TRIANGULATE", DefNode(GeometryNode, GEO_NODE_TRIM_CURVE, def_geo_curve_trim, "TRIM_CURVE", TrimCurve, "Trim Curve", "") DefNode(GeometryNode, GEO_NODE_VIEWER, def_geo_viewer, "VIEWER", Viewer, "Viewer", "") DefNode(GeometryNode, GEO_NODE_VOLUME_TO_MESH, def_geo_volume_to_mesh, "VOLUME_TO_MESH", VolumeToMesh, "Volume to Mesh", "") +DefNode(GeometryNode, GEO_NODE_SAMPLE_SOUND, 0, "SAMPLE_SOUND", SampleSound, "Sample Sound", "") /* undefine macros */ #undef DefNode diff --git a/source/blender/nodes/geometry/nodes/node_geo_sample_sound.cc b/source/blender/nodes/geometry/nodes/node_geo_sample_sound.cc new file mode 100644 index 00000000000..e5a07b22ddc --- /dev/null +++ b/source/blender/nodes/geometry/nodes/node_geo_sample_sound.cc @@ -0,0 +1,45 @@ +/* + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + +#include "node_geometry_util.hh" + +namespace blender::nodes { + +static void geo_node_sample_sound_declare(NodeDeclarationBuilder &b) +{ + b.add_input<decl::Float>(N_("Frame")).supports_field(); + b.add_input<decl::Float>(N_("Min Frequency")).supports_field().default_value(0.0f); + b.add_input<decl::Float>(N_("Max Frequency")).supports_field().default_value(20000.0f); + b.add_output<decl::Float>(N_("Volume")).dependent_field(); +} + +static void geo_node_sample_sound_exec(GeoNodeExecParams params) +{ + params.set_output("Volume", 0.0f); +} + +} // namespace blender::nodes + +void register_node_type_geo_sample_sound() +{ + static bNodeType ntype; + + geo_node_type_base(&ntype, GEO_NODE_SAMPLE_SOUND, "Sample Sound", NODE_CLASS_TEXTURE, 0); + node_type_size(&ntype, 200, 40, 1000); + ntype.declare = blender::nodes::geo_node_sample_sound_declare; + ntype.geometry_node_execute = blender::nodes::geo_node_sample_sound_exec; + nodeRegisterType(&ntype); +} |