blender
/
blender
136
411
Fork 595
Code Issues 6.3k Pull Requests 776 Projects 19 Wiki Activity

Geometry Nodes: Add local/global toggle to Rotate Rotation node #117899

Merged
Hans Goudey merged 1 commits from HooglyBoogly/blender:rotate-rotation-global-local into main 2024-02-06 16:23:35 +01:00
Conversation 1 Commits 1 Files Changed 3 +68 -6
3 changed files with 68 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/blenkernel/BKE_blender_version.h
View File

@ -29,7 +29,7 @@ extern "C" {
/* Blender file format version. */
#define BLENDER_FILE_VERSION BLENDER_VERSION
#define BLENDER_FILE_SUBVERSION 18
#define BLENDER_FILE_SUBVERSION 19
/* Minimum Blender version that supports reading file written with the current
* version. Older Blender versions will test this and cancel loading the file, showing a warning to

9
source/blender/blenloader/intern/versioning_400.cc
View File

@ -2867,6 +2867,15 @@ void blo_do_versions_400(FileData *fd, Library * /*lib*/, Main *bmain)
}
}
if (!MAIN_VERSION_FILE_ATLEAST(bmain, 401, 19)) {
LISTBASE_FOREACH (bNodeTree *, ntree, &bmain->nodetrees) {
if (ntree->type == NTREE_GEOMETRY) {
version_node_socket_name(ntree, FN_NODE_ROTATE_ROTATION, "Rotation 1", "Rotation");
version_node_socket_name(ntree, FN_NODE_ROTATE_ROTATION, "Rotation 2", "Rotate By");
}
}
}
/**
* Always bump subversion in BKE_blender_version.h when adding versioning
* code here, and wrap it inside a MAIN_VERSION_FILE_ATLEAST check.

63
source/blender/nodes/function/nodes/node_fn_rotate_rotation.cc
View File

@ -4,23 +4,73 @@
#include "BLI_math_quaternion.hh"
#include "UI_interface.hh"
#include "UI_resources.hh"
#include "NOD_rna_define.hh"
#include "node_function_util.hh"
namespace blender::nodes::node_fn_rotate_rotation_cc {
enum class RotationSpace {
Global = 0,
Local = 1,
};
static void node_declare(NodeDeclarationBuilder &b)
{
b.is_function_node();
b.add_input<decl::Rotation>("Rotation 1");
b.add_input<decl::Rotation>("Rotation 2");
b.add_input<decl::Rotation>("Rotation");
b.add_input<decl::Rotation>("Rotate By");
b.add_output<decl::Rotation>("Rotation");
};
static void node_layout(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr)
{
uiItemR(layout, ptr, "rotation_space", UI_ITEM_R_EXPAND, nullptr, ICON_NONE);
}
static void node_build_multi_function(NodeMultiFunctionBuilder &builder)
{
static auto fn = mf::build::SI2_SO<math::Quaternion, math::Quaternion, math::Quaternion>(
"Rotate Rotation", [](math::Quaternion a, math::Quaternion b) { return b * a; });
builder.set_matching_fn(fn);
switch (RotationSpace(builder.node().custom1)) {
case RotationSpace::Global: {
static auto fn = mf::build::SI2_SO<math::Quaternion, math::Quaternion, math::Quaternion>(
"Rotate Rotation Global", [](math::Quaternion a, math::Quaternion b) { return b * a; });
builder.set_matching_fn(fn);
break;
}
case RotationSpace::Local: {
static auto fn = mf::build::SI2_SO<math::Quaternion, math::Quaternion, math::Quaternion>(
"Rotate Rotation Local", [](math::Quaternion a, math::Quaternion b) { return a * b; });
builder.set_matching_fn(fn);
break;
}
}
}
static void node_rna(StructRNA *srna)
{
static const EnumPropertyItem space_items[] = {
{int(RotationSpace::Global),
"GLOBAL",
ICON_NONE,
"Global",
"Rotate the input rotation in global space"},
{int(RotationSpace::Local),
"LOCAL",
ICON_NONE,
"Local",
"Rotate the input rotation in its local space"},
{0, nullptr, 0, nullptr, nullptr},
};
RNA_def_node_enum(srna,
"rotation_space",
"Space",
"Base orientation for the rotation",
space_items,
NOD_inline_enum_accessors(custom1));
}
static void node_register()
@ -28,8 +78,11 @@ static void node_register()
static bNodeType ntype;
fn_node_type_base(&ntype, FN_NODE_ROTATE_ROTATION, "Rotate Rotation", NODE_CLASS_CONVERTER);
ntype.declare = node_declare;
ntype.draw_buttons = node_layout;
ntype.build_multi_function = node_build_multi_function;
nodeRegisterType(&ntype);
node_rna(ntype.rna_ext.srna);
}
NOD_REGISTER_NODE(node_register)