diff options
| author | Andrii Symkin <pembem22> | 2022-06-23 15:29:17 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brecht@blender.org> | 2022-06-23 16:02:53 +0300 |
| commit | c2a2f3553aed58ae9e4c165f8bfcad2b31dcf74b (patch) | |
| tree | 236fca0080484dc7e9b1f8816e2770b4422db00d /intern/cycles/scene | |
| parent | b8403b065e222faff3dfb3e2e9aa1b3d3f56c555 (diff) | |
Cycles: unify math functions names
This patch unifies the names of math functions for different data types and uses
overloading instead. The goal is to make it possible to swap out all the float3
variables containing RGB data with something else, with as few as possible
changes to the code. It's a requirement for future spectral rendering patches.
Differential Revision: https://developer.blender.org/D15276
Diffstat (limited to 'intern/cycles/scene')
| -rw-r--r-- | intern/cycles/scene/mesh.cpp | 2 | ||||
| -rw-r--r-- | intern/cycles/scene/mesh_displace.cpp | 2 | ||||
| -rw-r--r-- | intern/cycles/scene/object.cpp | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/intern/cycles/scene/mesh.cpp b/intern/cycles/scene/mesh.cpp index b5c0d9d92fb..110cb439f58 100644 --- a/intern/cycles/scene/mesh.cpp +++ b/intern/cycles/scene/mesh.cpp @@ -94,7 +94,7 @@ float3 Mesh::Triangle::compute_normal(const float3 *verts) const bool Mesh::Triangle::valid(const float3 *verts) const { - return isfinite3_safe(verts[v[0]]) && isfinite3_safe(verts[v[1]]) && isfinite3_safe(verts[v[2]]); + return isfinite_safe(verts[v[0]]) && isfinite_safe(verts[v[1]]) && isfinite_safe(verts[v[2]]); } /* SubdFace */ diff --git a/intern/cycles/scene/mesh_displace.cpp b/intern/cycles/scene/mesh_displace.cpp index 6b109bbb818..e180145daac 100644 --- a/intern/cycles/scene/mesh_displace.cpp +++ b/intern/cycles/scene/mesh_displace.cpp @@ -137,7 +137,7 @@ static void read_shader_output(const Scene *scene, d_output_index += 3; /* Avoid illegal vertex coordinates. */ - off = ensure_finite3(off); + off = ensure_finite(off); mesh_verts[t.v[j]] += off; if (attr_mP != NULL) { for (int step = 0; step < num_motion_steps - 1; step++) { diff --git a/intern/cycles/scene/object.cpp b/intern/cycles/scene/object.cpp index 3a1c177fe3b..2126b23d82e 100644 --- a/intern/cycles/scene/object.cpp +++ b/intern/cycles/scene/object.cpp @@ -340,12 +340,12 @@ float Object::compute_volume_step_size() const if (metadata.use_transform_3d) { voxel_tfm = tfm * transform_inverse(metadata.transform_3d); } - voxel_step_size = min3(fabs(transform_direction(&voxel_tfm, size))); + voxel_step_size = reduce_min(fabs(transform_direction(&voxel_tfm, size))); } else if (volume->get_object_space()) { /* User specified step size in object space. */ float3 size = make_float3(voxel_step_size, voxel_step_size, voxel_step_size); - voxel_step_size = min3(fabs(transform_direction(&tfm, size))); + voxel_step_size = reduce_min(fabs(transform_direction(&tfm, size))); } if (voxel_step_size > 0.0f) { |