blender
/
blender
134
398
Fork 580
Code Issues 6.3k Pull Requests 759 Projects 19 Wiki Activity

Cleanup: Use float4x4 type and constructor

This commit is contained in:
Hans Goudey 2021-03-29 22:15:07 -05:00
parent f9eaf93d37
commit d037fef3bd
Notes: blender-bot 2023-02-14 07:36:17 +01:00 
Referenced by commit 46ee9b599a, Fix T87094: Transforming geometry instances component is broken
Referenced by commit a4b6c222fa, Fix unused variable warning caused by recent cleanup
2 changed files with 13 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -188,9 +188,8 @@ static void add_instances_from_geometry_component(InstancesComponent &instances,
for (const int i : IndexRange(domain_size)) {
if (instances_data[i].has_value()) {
float transform[4][4];
loc_eul_size_to_mat4(transform, positions[i], rotations[i], scales[i]);
instances.add_instance(*instances_data[i], transform, ids[i]);
const float4x4 matrix = float4x4::from_loc_eul_scale(positions[i], rotations[i], scales[i]);
instances.add_instance(*instances_data[i], matrix, ids[i]);
}
}
}

26
source/blender/nodes/geometry/nodes/node_geo_transform.cc
View File

@ -18,7 +18,7 @@
# include <openvdb/openvdb.h>
#endif
#include "BLI_math_matrix.h"
#include "BLI_float4x4.hh"
#include "DNA_pointcloud_types.h"
#include "DNA_volume_types.h"
@ -69,9 +69,8 @@ void transform_mesh(Mesh *mesh,
}
}
else {
float mat[4][4];
loc_eul_size_to_mat4(mat, translation, rotation, scale);
BKE_mesh_transform(mesh, mat, false);
const float4x4 matrix = float4x4::from_loc_eul_scale(translation, rotation, scale);
BKE_mesh_transform(mesh, matrix.values, false);
BKE_mesh_calc_normals(mesh);
}
}
@ -83,15 +82,15 @@ static void transform_pointcloud(PointCloud *pointcloud,
{
/* Use only translation if rotation and scale don't apply. */
if (use_translate(rotation, scale)) {
for (int i = 0; i < pointcloud->totpoint; i++) {
for (const int i : IndexRange(pointcloud->totpoint)) {
add_v3_v3(pointcloud->co[i], translation);
}
}
else {
float mat[4][4];
loc_eul_size_to_mat4(mat, translation, rotation, scale);
for (int i = 0; i < pointcloud->totpoint; i++) {
mul_m4_v3(mat, pointcloud->co[i]);
const float4x4 matrix = float4x4::from_loc_eul_scale(translation, rotation, scale);
for (const int i : IndexRange(pointcloud->totpoint)) {
float3 &co = *(float3 *)pointcloud->co[i];
co = matrix * co;
}
}
}
@ -110,11 +109,9 @@ static void transform_instances(InstancesComponent &instances,
}
}
else {
float mat[4][4];
loc_eul_size_to_mat4(mat, translation, rotation, scale);
const float4x4 matrix = float4x4::from_loc_eul_scale(translation, rotation, scale);
for (float4x4 &transform : transforms) {
mul_m4_m4_pre(transform.ptr(), mat);
transform = transform * matrix;
}
}
}
@ -136,8 +133,7 @@ static void transform_volume(Volume *volume,
Main *bmain = DEG_get_bmain(params.depsgraph());
BKE_volume_load(volume, bmain);
float matrix[4][4];
loc_eul_size_to_mat4(matrix, translation, rotation, limited_scale);
const float4x4 matrix = float4x4::from_loc_eul_scale(translation, rotation, scale);
openvdb::Mat4s vdb_matrix;
memcpy(vdb_matrix.asPointer(), matrix, sizeof(float[4][4]));