blender
/
blender
136
406
Fork 589
Code Issues 6.3k Pull Requests 766 Projects 19 Wiki Activity

Geometry Nodes: Support Transform socket in Mix node #120643

Open
Iliya Katushenock wants to merge 1 commits from mod_moder/blender:mix_transformation into main
pull from: mod_moder/blender:mix_transformation
merge into: blender:main

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Conversation 0 Commits 1 Files Changed 2 +65 -3
2 changed files with 65 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
source/blender/makesrna/intern/rna_nodetree.cc
View File

@ -497,6 +497,7 @@ static const EnumPropertyItem rna_enum_mix_data_type_items[] = {
{SOCK_VECTOR, "VECTOR", 0, "Vector", ""},
{SOCK_RGBA, "RGBA", 0, "Color", ""},
{SOCK_ROTATION, "ROTATION", 0, "Rotation", ""},
{SOCK_MATRIX, "MATRIX", 0, "Matrix", ""},
{0, nullptr, 0, nullptr, nullptr},
};
@ -2824,7 +2825,7 @@ static const EnumPropertyItem *rna_ShaderNodeMix_data_type_itemf(bContext * /*C*
const auto rotation_supported_mix = [&](const EnumPropertyItem *item) -> bool {
const eNodeSocketDatatype data_type = eNodeSocketDatatype(item->value);
if (data_type == SOCK_ROTATION) {
if (ELEM(data_type, SOCK_ROTATION, SOCK_MATRIX)) {
const bNodeTree *tree = reinterpret_cast<const bNodeTree *>(ptr->owner_id);
if (tree->type == NTREE_GEOMETRY) {
return true;

65
source/blender/nodes/shader/nodes/node_shader_mix.cc
View File

@ -10,6 +10,7 @@
#include "BKE_material.h"
#include "BLI_math_matrix.hh"
#include "BLI_math_quaternion.hh"
#include "BLI_math_vector.h"
#include "BLI_string_utf8.h"
@ -79,10 +80,16 @@ static void sh_node_mix_declare(NodeDeclarationBuilder &b)
.translation_context(BLT_I18NCONTEXT_ID_NODETREE);
b.add_input<decl::Rotation>("B", "B_Rotation").translation_context(BLT_I18NCONTEXT_ID_NODETREE);
b.add_input<decl::Matrix>("A", "A_Matrix")
.is_default_link_socket()
.translation_context(BLT_I18NCONTEXT_ID_NODETREE);
b.add_input<decl::Matrix>("B", "B_Matrix").translation_context(BLT_I18NCONTEXT_ID_NODETREE);
b.add_output<decl::Float>("Result", "Result_Float");
b.add_output<decl::Vector>("Result", "Result_Vector");
b.add_output<decl::Color>("Result", "Result_Color");
b.add_output<decl::Rotation>("Result", "Result_Rotation");
b.add_output<decl::Matrix>("Result", "Result_Matrix");
};
static void sh_node_mix_layout(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr)
@ -100,6 +107,7 @@ static void sh_node_mix_layout(uiLayout *layout, bContext * /*C*/, PointerRNA *p
uiItemR(layout, ptr, "clamp_result", UI_ITEM_NONE, nullptr, ICON_NONE);
break;
case SOCK_ROTATION:
case SOCK_MATRIX:
break;
default:
BLI_assert_unreachable();
@ -193,6 +201,9 @@ static void node_mix_gather_link_searches(GatherLinkSearchOpParams &params)
case SOCK_ROTATION:
type = SOCK_ROTATION;
break;
case SOCK_MATRIX:
type = SOCK_MATRIX;
break;
default:
return;
}
@ -236,7 +247,7 @@ static void node_mix_gather_link_searches(GatherLinkSearchOpParams &params)
weight);
weight--;
}
if (type != SOCK_ROTATION) {
if (!ELEM(type, SOCK_ROTATION, SOCK_MATRIX)) {
params.add_item(
IFACE_("Factor"),
[type](LinkSearchOpParams &params) {
@ -249,7 +260,7 @@ static void node_mix_gather_link_searches(GatherLinkSearchOpParams &params)
}
}
if (type == SOCK_ROTATION) {
if (ELEM(type, SOCK_ROTATION, SOCK_MATRIX)) {
return;
}
@ -523,6 +534,56 @@ static const mf::MultiFunction *get_multi_function(const bNode &node)
return &fn;
}
}
case SOCK_MATRIX: {
if (clamp_factor) {
static auto fn = mf::build::SI3_SO<float, float4x4, float4x4, float4x4>(
"Clamp Mix Matrix", [](const float t, const float4x4 &a, const float4x4 &b) {
float3 a_location;
math::Quaternion a_rotation;
float3 a_scale;
math::to_loc_rot_scale(a, a_location, a_rotation, a_scale);
float3 b_location;
math::Quaternion b_rotation;
float3 b_scale;
math::to_loc_rot_scale(b, b_location, b_rotation, b_scale);
const float3 result_location = math::interpolate(
a_location, b_location, math::clamp(t, 0.0f, 1.0f));
const math::Quaternion result_rotation = math::interpolate(
a_rotation, b_rotation, math::clamp(t, 0.0f, 1.0f));
const float3 result_scale = math::interpolate(
a_scale, b_scale, math::clamp(t, 0.0f, 1.0f));
return math::from_loc_rot_scale<float4x4>(
result_location, result_rotation, result_scale);
});
return &fn;
}
else {
static auto fn = mf::build::SI3_SO<float, float4x4, float4x4, float4x4>(
"Mix Matrix", [](const float t, const float4x4 &a, const float4x4 &b) {
float3 a_location;
math::Quaternion a_rotation;
float3 a_scale;
math::to_loc_rot_scale(a, a_location, a_rotation, a_scale);
float3 b_location;
math::Quaternion b_rotation;
float3 b_scale;
math::to_loc_rot_scale(b, b_location, b_rotation, b_scale);
const float3 result_location = math::interpolate(a_location, b_location, t);
const math::Quaternion result_rotation = math::interpolate(
a_rotation, b_rotation, t);
const float3 result_scale = math::interpolate(a_scale, b_scale, t);
return math::from_loc_rot_scale<float4x4>(
result_location, result_rotation, result_scale);
});
return &fn;
}
}
}
BLI_assert_unreachable();
return nullptr;