From 065dfdc5295ba4c2078f5118588888fd6f3d15c6 Mon Sep 17 00:00:00 2001 From: Hans Goudey Date: Fri, 23 Oct 2020 15:25:38 -0500 Subject: Geometry Nodes: Add transform geometry node --- source/blender/blenkernel/BKE_node.h | 1 + source/blender/blenkernel/intern/node.c | 1 + source/blender/nodes/CMakeLists.txt | 1 + source/blender/nodes/NOD_geometry.h | 1 + source/blender/nodes/NOD_static_types.h | 1 + .../blender/nodes/geometry/node_geometry_util.hh | 1 + .../nodes/geometry/nodes/node_geo_transform.cc | 84 ++++++++++++++++++++++ 7 files changed, 90 insertions(+) create mode 100644 source/blender/nodes/geometry/nodes/node_geo_transform.cc (limited to 'source') diff --git a/source/blender/blenkernel/BKE_node.h b/source/blender/blenkernel/BKE_node.h index da4bcb8a00e..0ae31989a05 100644 --- a/source/blender/blenkernel/BKE_node.h +++ b/source/blender/blenkernel/BKE_node.h @@ -1342,6 +1342,7 @@ int ntreeTexExecTree(struct bNodeTree *ntree, #define GEO_NODE_TRIANGULATE 1000 #define GEO_NODE_EDGE_SPLIT 1001 +#define GEO_NODE_TRANSFORM 1002 /** \} */ diff --git a/source/blender/blenkernel/intern/node.c b/source/blender/blenkernel/intern/node.c index cf06e55814f..f7b5e92d11b 100644 --- a/source/blender/blenkernel/intern/node.c +++ b/source/blender/blenkernel/intern/node.c @@ -4661,6 +4661,7 @@ static void registerGeometryNodes(void) register_node_type_geo_triangulate(); register_node_type_geo_edge_split(); + register_node_type_geo_transform(); } static void registerFunctionNodes(void) diff --git a/source/blender/nodes/CMakeLists.txt b/source/blender/nodes/CMakeLists.txt index 9058ee965a5..ffaabecb406 100644 --- a/source/blender/nodes/CMakeLists.txt +++ b/source/blender/nodes/CMakeLists.txt @@ -139,6 +139,7 @@ set(SRC geometry/nodes/node_geo_common.cc geometry/nodes/node_geo_edge_split.cc + geometry/nodes/node_geo_transform.cc geometry/nodes/node_geo_triangulate.cc geometry/node_geometry_exec.cc geometry/node_geometry_tree.cc diff --git a/source/blender/nodes/NOD_geometry.h b/source/blender/nodes/NOD_geometry.h index 2b561c419a3..27d8f3a898c 100644 --- a/source/blender/nodes/NOD_geometry.h +++ b/source/blender/nodes/NOD_geometry.h @@ -28,6 +28,7 @@ void register_node_type_geo_group(void); void register_node_type_geo_triangulate(void); void register_node_type_geo_edge_split(void); +void register_node_type_geo_transform(void); #ifdef __cplusplus } diff --git a/source/blender/nodes/NOD_static_types.h b/source/blender/nodes/NOD_static_types.h index cd75e8a1ff0..5cfc9148f34 100644 --- a/source/blender/nodes/NOD_static_types.h +++ b/source/blender/nodes/NOD_static_types.h @@ -268,6 +268,7 @@ DefNode(FunctionNode, FN_NODE_RANDOM_FLOAT, 0, "RANDOM_FLOAT", DefNode(GeometryNode, GEO_NODE_TRIANGULATE, 0, "TRIANGULATE", Triangulate, "Triangulate", "") DefNode(GeometryNode, GEO_NODE_EDGE_SPLIT, 0, "EDGE_SPLIT", EdgeSplit, "Edge Split", "") +DefNode(GeometryNode, GEO_NODE_TRANSFORM, 0, "TRANSFORM", Transform, "Transform", "") /* undefine macros */ diff --git a/source/blender/nodes/geometry/node_geometry_util.hh b/source/blender/nodes/geometry/node_geometry_util.hh index e0b170dd6c8..bb26763642b 100644 --- a/source/blender/nodes/geometry/node_geometry_util.hh +++ b/source/blender/nodes/geometry/node_geometry_util.hh @@ -18,6 +18,7 @@ #include +#include "BLI_float3.hh" #include "BLI_utildefines.h" #include "MEM_guardedalloc.h" diff --git a/source/blender/nodes/geometry/nodes/node_geo_transform.cc b/source/blender/nodes/geometry/nodes/node_geo_transform.cc new file mode 100644 index 00000000000..8b6ce9fcb08 --- /dev/null +++ b/source/blender/nodes/geometry/nodes/node_geo_transform.cc @@ -0,0 +1,84 @@ +/* + * 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 "BKE_mesh.h" +#include "BLI_math_matrix.h" + +#include "node_geometry_util.hh" + +static bNodeSocketTemplate geo_node_transform_in[] = { + {SOCK_GEOMETRY, N_("Geometry")}, + {SOCK_VECTOR, N_("Translation"), 0.0f, 0.0f, 0.0f, 1.0f, -FLT_MAX, FLT_MAX, PROP_TRANSLATION}, + {SOCK_VECTOR, N_("Rotation"), 0.0f, 0.0f, 0.0f, 1.0f, -FLT_MAX, FLT_MAX, PROP_EULER}, + {SOCK_VECTOR, N_("Scale"), 1.0f, 1.0f, 1.0f, 1.0f, -FLT_MAX, FLT_MAX, PROP_XYZ}, + {-1, ""}, +}; + +static bNodeSocketTemplate geo_node_transform_out[] = { + {SOCK_GEOMETRY, N_("Geometry")}, + {-1, ""}, +}; + +namespace blender::nodes { +static void geo_transform_exec(bNode *UNUSED(node), GValueByName &inputs, GValueByName &outputs) +{ + GeometryPtr geometry_in = inputs.extract("Geometry"); + GeometryPtr geometry_out; + + if (!geometry_in.has_value()) { + outputs.move_in("Geometry", std::move(geometry_out)); + return; + } + + Mesh *mesh_in = geometry_in->mesh_get_for_read(); + if (mesh_in == nullptr) { + outputs.move_in("Geometry", std::move(geometry_out)); + return; + } + + const float3 translation = inputs.extract("Translation"); + const float3 rotation = inputs.extract("Rotation"); + const float3 scale = inputs.extract("Scale"); + + geometry_out = GeometryPtr{new Geometry()}; + Mesh *mesh_out = BKE_mesh_copy_for_eval(mesh_in, false); + const float translation_c[3] = {translation.x, translation.y, translation.z}; + + /* Use only translation if rotation and scale are zero. */ + if (translation.length() > 0.0f && rotation.length() == 0.0f && scale.length() == 0.0f) { + BKE_mesh_translate(mesh_out, translation, true); + } + else { + float mat[4][4]; + loc_eul_size_to_mat4(mat, translation, rotation, scale); + BKE_mesh_transform(mesh_out, mat, true); + } + + geometry_out->mesh_set_and_transfer_ownership(mesh_out); + + outputs.move_in("Geometry", std::move(geometry_out)); +} +} // namespace blender::nodes + +void register_node_type_geo_transform() +{ + static bNodeType ntype; + + geo_node_type_base(&ntype, GEO_NODE_TRANSFORM, "Transform", 0, 0); + node_type_socket_templates(&ntype, geo_node_transform_in, geo_node_transform_out); + ntype.geometry_node_execute = blender::nodes::geo_transform_exec; + nodeRegisterType(&ntype); +} -- cgit v1.2.3