griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Geometry Nodes: output transform matrix from object info node

Browse Source 
This adds a new `Transform` output socket of matrix type to the Object Info node.

This is clearly useful, but we did not do this before for a couple of reasons:
* It's redundant with the location, rotation and scale outputs.
* We might want separate `Object Transform` and `Object Geometry` nodes.

For now just adding the socket is probably useful enough to justify it. Even more
so because it's addition doesn't really block other designs in the future either.

Pull Request: https://projects.blender.org/blender/blender/pulls/121437
This commit is contained in:
Jacques Lucke
2024-05-08 22:03:09 +02:00
parent f4b9ca758a
commit 4dfc1ede58
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
source/blender/nodes/geometry/nodes/node_geo_object_info.cc
View File

@@ -31,6 +31,9 @@ static void node_declare(NodeDeclarationBuilder &b)
.description(
"Output the entire object as single instance. "
"This allows instancing non-geometry object types");
b.add_output<decl::Matrix>("Transform")
.description(
"Transformation matrix containing the location, rotation and scale of the object");
b.add_output<decl::Vector>("Location");
b.add_output<decl::Rotation>("Rotation");
b.add_output<decl::Vector>("Scale");
@@ -63,9 +66,11 @@ static void node_geo_exec(GeoNodeExecParams params)
math::Quaternion rotation;
if (transform_space_relative) {
math::to_loc_rot_scale<true>(transform, location, rotation, scale);
params.set_output("Transform", transform);
}
else {
math::to_loc_rot_scale<true>(object_matrix, location, rotation, scale);
params.set_output("Transform", object_matrix);
}
params.set_output("Location", location);
params.set_output("Rotation", rotation);