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

Cleanup: C++ changes for subdiv_displacement_multires.cc

Browse Source 
* Uses references where possible
* Adds const where appropriate

This commit only modifies the internal methods, and does not touch any
of the function signatures or areas that interface with other parts of
the codebase.

Pull Request: https://projects.blender.org/blender/blender/pulls/140326
This commit is contained in:
Sean Kim
2025-06-15 23:09:18 +02:00
committed by Sean Kim
parent e0f075fc35
commit 23cc842319
1 changed files with 101 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

202
source/blender/blenkernel/intern/subdiv_displacement_multires.cc
View File

@@ -62,60 +62,60 @@ enum class AverageWith : int8_t {
Next,
};
static int displacement_get_grid_and_coord(Displacement *displacement,
static int displacement_get_grid_and_coord(const Displacement &displacement,
const int ptex_face_index,
const float u,
const float v,
const MDisps **r_displacement_grid,
float *grid_u,
float *grid_v)
float &r_grid_u,
float &r_grid_v)
{
MultiresDisplacementData *data = static_cast<MultiresDisplacementData *>(
displacement->user_data);
const PolyCornerIndex *face_corner = &data->ptex_face_corner[ptex_face_index];
const IndexRange face = data->faces[face_corner->face_index];
const int start_grid_index = face.start() + face_corner->corner;
const MultiresDisplacementData &data = *static_cast<MultiresDisplacementData *>(
displacement.user_data);
const PolyCornerIndex &face_corner = data.ptex_face_corner[ptex_face_index];
const IndexRange face = data.faces[face_corner.face_index];
const int start_grid_index = face.start() + face_corner.corner;
int corner = 0;
if (face.size() == 4) {
float corner_u, corner_v;
corner = rotate_quad_to_corner(u, v, &corner_u, &corner_v);
*r_displacement_grid = &data->mdisps[start_grid_index + corner];
ptex_face_uv_to_grid_uv(corner_u, corner_v, grid_u, grid_v);
*r_displacement_grid = &data.mdisps[start_grid_index + corner];
ptex_face_uv_to_grid_uv(corner_u, corner_v, &r_grid_u, &r_grid_v);
}
else {
*r_displacement_grid = &data->mdisps[start_grid_index];
ptex_face_uv_to_grid_uv(u, v, grid_u, grid_v);
*r_displacement_grid = &data.mdisps[start_grid_index];
ptex_face_uv_to_grid_uv(u, v, &r_grid_u, &r_grid_v);
}
return corner;
}
static const MDisps *displacement_get_other_grid(Displacement *displacement,
static const MDisps *displacement_get_other_grid(const Displacement &displacement,
const int ptex_face_index,
const int corner,
const int corner_delta)
{
MultiresDisplacementData *data = static_cast<MultiresDisplacementData *>(
displacement->user_data);
const PolyCornerIndex *face_corner = &data->ptex_face_corner[ptex_face_index];
const IndexRange face = data->faces[face_corner->face_index];
const int effective_corner = (face.size() == 4) ? corner : face_corner->corner;
MultiresDisplacementData &data = *static_cast<MultiresDisplacementData *>(
displacement.user_data);
const PolyCornerIndex &face_corner = data.ptex_face_corner[ptex_face_index];
const IndexRange face = data.faces[face_corner.face_index];
const int effective_corner = (face.size() == 4) ? corner : face_corner.corner;
const int next_corner = (effective_corner + corner_delta + face.size()) % face.size();
return &data->mdisps[face[next_corner]];
return &data.mdisps[face[next_corner]];
}
BLI_INLINE AverageWith read_displacement_grid(const MDisps *displacement_grid,
BLI_INLINE AverageWith read_displacement_grid(const MDisps &displacement_grid,
const int grid_size,
const float grid_u,
const float grid_v,
float r_tangent_D[3])
{
if (displacement_grid->disps == nullptr) {
if (displacement_grid.disps == nullptr) {
zero_v3(r_tangent_D);
return AverageWith::None;
}
const int x = roundf(grid_u * (grid_size - 1));
const int y = roundf(grid_v * (grid_size - 1));
copy_v3_v3(r_tangent_D, displacement_grid->disps[y * grid_size + x]);
copy_v3_v3(r_tangent_D, displacement_grid.disps[y * grid_size + x]);
if (x == 0 && y == 0) {
return AverageWith::All;
}
@@ -132,18 +132,18 @@ static void average_convert_grid_coord_to_ptex(const int num_corners,
const int corner,
const float grid_u,
const float grid_v,
float *r_ptex_face_u,
float *r_ptex_face_v)
float &r_ptex_face_u,
float &r_ptex_face_v)
{
if (num_corners == 4) {
rotate_grid_to_quad(corner, grid_u, grid_v, r_ptex_face_u, r_ptex_face_v);
rotate_grid_to_quad(corner, grid_u, grid_v, &r_ptex_face_u, &r_ptex_face_v);
}
else {
grid_uv_to_ptex_face_uv(grid_u, grid_v, r_ptex_face_u, r_ptex_face_v);
grid_uv_to_ptex_face_uv(grid_u, grid_v, &r_ptex_face_u, &r_ptex_face_v);
}
}
static void average_construct_tangent_matrix(Subdiv *subdiv,
static void average_construct_tangent_matrix(Subdiv &subdiv,
const int num_corners,
const int ptex_face_index,
const int corner,
@@ -156,38 +156,38 @@ static void average_construct_tangent_matrix(Subdiv *subdiv,
float3 dummy_P;
float3 dPdu;
float3 dPdv;
eval_limit_point_and_derivatives(subdiv, ptex_face_index, u, v, dummy_P, dPdu, dPdv);
eval_limit_point_and_derivatives(&subdiv, ptex_face_index, u, v, dummy_P, dPdu, dPdv);
BKE_multires_construct_tangent_matrix(r_tangent_matrix, dPdu, dPdv, quad_corner);
}
static void average_read_displacement_tangent(MultiresDisplacementData *data,
const MDisps *other_displacement_grid,
static void average_read_displacement_tangent(const MultiresDisplacementData &data,
const MDisps &other_displacement_grid,
const float grid_u,
const float grid_v,
float r_tangent_D[3])
{
read_displacement_grid(other_displacement_grid, data->grid_size, grid_u, grid_v, r_tangent_D);
read_displacement_grid(other_displacement_grid, data.grid_size, grid_u, grid_v, r_tangent_D);
}
static void average_read_displacement_object(MultiresDisplacementData *data,
const MDisps *displacement_grid,
static void average_read_displacement_object(const MultiresDisplacementData &data,
const MDisps &displacement_grid,
const float grid_u,
const float grid_v,
const int ptex_face_index,
const int corner_index,
float r_D[3])
{
const PolyCornerIndex *face_corner = &data->ptex_face_corner[ptex_face_index];
const int num_corners = data->faces[face_corner->face_index].size();
const PolyCornerIndex &face_corner = data.ptex_face_corner[ptex_face_index];
const int num_corners = data.faces[face_corner.face_index].size();
/* Get (u, v) coordinate within the other PTEX face which corresponds to
* the grid coordinates. */
float u, v;
average_convert_grid_coord_to_ptex(num_corners, corner_index, grid_u, grid_v, &u, &v);
average_convert_grid_coord_to_ptex(num_corners, corner_index, grid_u, grid_v, u, v);
/* Construct tangent matrix which corresponds to partial derivatives
* calculated for the other PTEX face. */
float tangent_matrix[3][3];
average_construct_tangent_matrix(
data->subdiv, num_corners, ptex_face_index, corner_index, u, v, tangent_matrix);
*data.subdiv, num_corners, ptex_face_index, corner_index, u, v, tangent_matrix);
/* Read displacement from other grid in a tangent space. */
float tangent_D[3];
average_read_displacement_tangent(data, displacement_grid, grid_u, grid_v, tangent_D);
@@ -195,25 +195,25 @@ static void average_read_displacement_object(MultiresDisplacementData *data,
mul_v3_m3v3(r_D, tangent_matrix, tangent_D);
}
static void average_get_other_ptex_and_corner(MultiresDisplacementData *data,
static void average_get_other_ptex_and_corner(const MultiresDisplacementData &data,
const int ptex_face_index,
const int corner,
const int corner_delta,
int *r_other_ptex_face_index,
int *r_other_corner_index)
int &r_other_ptex_face_index,
int &r_other_corner_index)
{
const PolyCornerIndex *face_corner = &data->ptex_face_corner[ptex_face_index];
const int face_index = face_corner->face_index;
const int num_corners = data->faces[face_corner->face_index].size();
const PolyCornerIndex &face_corner = data.ptex_face_corner[ptex_face_index];
const int face_index = face_corner.face_index;
const int num_corners = data.faces[face_corner.face_index].size();
const bool is_quad = (num_corners == 4);
const int start_ptex_face_index = data->face_ptex_offset[face_index];
*r_other_corner_index = (corner + corner_delta + num_corners) % num_corners;
*r_other_ptex_face_index = is_quad ? start_ptex_face_index :
start_ptex_face_index + *r_other_corner_index;
const int start_ptex_face_index = data.face_ptex_offset[face_index];
r_other_corner_index = (corner + corner_delta + num_corners) % num_corners;
r_other_ptex_face_index = is_quad ? start_ptex_face_index :
start_ptex_face_index + r_other_corner_index;
}
/* NOTE: Grid coordinates are relative to the other grid already. */
static void average_with_other(Displacement *displacement,
static void average_with_other(const Displacement &displacement,
const int ptex_face_index,
const int corner,
const float grid_u,
@@ -221,13 +221,13 @@ static void average_with_other(Displacement *displacement,
const int corner_delta,
float r_D[3])
{
MultiresDisplacementData *data = static_cast<MultiresDisplacementData *>(
displacement->user_data);
const MDisps *other_displacement_grid = displacement_get_other_grid(
const MultiresDisplacementData &data = *static_cast<MultiresDisplacementData *>(
displacement.user_data);
const MDisps other_displacement_grid = *displacement_get_other_grid(
displacement, ptex_face_index, corner, corner_delta);
int other_ptex_face_index, other_corner_index;
average_get_other_ptex_and_corner(
data, ptex_face_index, corner, corner_delta, &other_ptex_face_index, &other_corner_index);
data, ptex_face_index, corner, corner_delta, other_ptex_face_index, other_corner_index);
/* Get displacement in object space. */
float other_D[3];
average_read_displacement_object(data,
@@ -242,23 +242,23 @@ static void average_with_other(Displacement *displacement,
mul_v3_fl(r_D, 0.5f);
}
static void average_with_all(Displacement *displacement,
static void average_with_all(const Displacement &displacement,
const int ptex_face_index,
const int corner,
const float /*grid_u*/,
const float /*grid_v*/,
float r_D[3])
{
MultiresDisplacementData *data = static_cast<MultiresDisplacementData *>(
displacement->user_data);
const PolyCornerIndex *face_corner = &data->ptex_face_corner[ptex_face_index];
const int num_corners = data->faces[face_corner->face_index].size();
const MultiresDisplacementData &data = *static_cast<MultiresDisplacementData *>(
displacement.user_data);
const PolyCornerIndex &face_corner = data.ptex_face_corner[ptex_face_index];
const int num_corners = data.faces[face_corner.face_index].size();
for (int corner_delta = 1; corner_delta < num_corners; corner_delta++) {
average_with_other(displacement, ptex_face_index, corner, 0.0f, 0.0f, corner_delta, r_D);
}
}
static void average_with_next(Displacement *displacement,
static void average_with_next(const Displacement &displacement,
const int ptex_face_index,
const int corner,
const float grid_u,
@@ -268,7 +268,7 @@ static void average_with_next(Displacement *displacement,
average_with_other(displacement, ptex_face_index, corner, 0.0f, grid_u, 1, r_D);
}
static void average_with_prev(Displacement *displacement,
static void average_with_prev(const Displacement &displacement,
const int ptex_face_index,
const int corner,
const float /*grid_u*/,
@@ -278,8 +278,8 @@ static void average_with_prev(Displacement *displacement,
average_with_other(displacement, ptex_face_index, corner, grid_v, 0.0f, -1, r_D);
}
static void average_displacement(Displacement *displacement,
AverageWith average_with,
static void average_displacement(const Displacement &displacement,
const AverageWith average_with,
const int ptex_face_index,
const int corner,
const float grid_u,
@@ -301,28 +301,28 @@ static void average_displacement(Displacement *displacement,
}
}
static int displacement_get_face_corner(MultiresDisplacementData *data,
static int displacement_get_face_corner(const MultiresDisplacementData &data,
const int ptex_face_index,
const float u,
const float v)
{
const PolyCornerIndex *face_corner = &data->ptex_face_corner[ptex_face_index];
const int num_corners = data->faces[face_corner->face_index].size();
const PolyCornerIndex &face_corner = data.ptex_face_corner[ptex_face_index];
const int num_corners = data.faces[face_corner.face_index].size();
const bool is_quad = (num_corners == 4);
if (is_quad) {
float dummy_corner_u, dummy_corner_v;
return rotate_quad_to_corner(u, v, &dummy_corner_u, &dummy_corner_v);
}
return face_corner->corner;
return face_corner.corner;
}
static void initialize(Displacement *displacement)
{
MultiresDisplacementData *data = static_cast<MultiresDisplacementData *>(
MultiresDisplacementData &data = *static_cast<MultiresDisplacementData *>(
displacement->user_data);
multiresModifier_ensure_external_read(data->mesh, data->mmd);
data->is_initialized = true;
multiresModifier_ensure_external_read(data.mesh, data.mmd);
data.is_initialized = true;
}
static void eval_displacement(Displacement *displacement,
@@ -333,27 +333,27 @@ static void eval_displacement(Displacement *displacement,
const float dPdv[3],
float r_D[3])
{
MultiresDisplacementData *data = static_cast<MultiresDisplacementData *>(
MultiresDisplacementData &data = *static_cast<MultiresDisplacementData *>(
displacement->user_data);
BLI_assert(data->is_initialized);
const int grid_size = data->grid_size;
BLI_assert(data.is_initialized);
const int grid_size = data.grid_size;
/* Get displacement in tangent space. */
const MDisps *displacement_grid;
float grid_u, grid_v;
const int corner_of_quad = displacement_get_grid_and_coord(
displacement, ptex_face_index, u, v, &displacement_grid, &grid_u, &grid_v);
*displacement, ptex_face_index, u, v, &displacement_grid, grid_u, grid_v);
/* Read displacement from the current displacement grid and see if any
* averaging is needed. */
float tangent_D[3];
AverageWith average_with = read_displacement_grid(
displacement_grid, grid_size, grid_u, grid_v, tangent_D);
const AverageWith average_with = read_displacement_grid(
*displacement_grid, grid_size, grid_u, grid_v, tangent_D);
/* Convert it to the object space. */
float tangent_matrix[3][3];
BKE_multires_construct_tangent_matrix(tangent_matrix, dPdu, dPdv, corner_of_quad);
mul_v3_m3v3(r_D, tangent_matrix, tangent_D);
/* For the boundary points of grid average two (or all) neighbor grids. */
const int corner = displacement_get_face_corner(data, ptex_face_index, u, v);
average_displacement(displacement, average_with, ptex_face_index, corner, grid_u, grid_v, r_D);
average_displacement(*displacement, average_with, ptex_face_index, corner, grid_u, grid_v, r_D);
}
static void free_displacement(Displacement *displacement)
@@ -366,29 +366,29 @@ static void free_displacement(Displacement *displacement)
/* TODO(sergey): This seems to be generally used information, which almost
* worth adding to a subdiv itself, with possible cache of the value. */
static int count_num_ptex_faces(const Mesh *mesh)
static int count_num_ptex_faces(const Mesh &mesh)
{
int num_ptex_faces = 0;
const OffsetIndices faces = mesh->faces();
for (int face_index = 0; face_index < mesh->faces_num; face_index++) {
const OffsetIndices faces = mesh.faces();
for (int face_index = 0; face_index < mesh.faces_num; face_index++) {
num_ptex_faces += (faces[face_index].size() == 4) ? 1 : faces[face_index].size();
}
return num_ptex_faces;
}
static void displacement_data_init_mapping(Displacement *displacement, const Mesh *mesh)
static void displacement_data_init_mapping(Displacement &displacement, const Mesh &mesh)
{
MultiresDisplacementData *data = static_cast<MultiresDisplacementData *>(
displacement->user_data);
const OffsetIndices faces = mesh->faces();
MultiresDisplacementData &data = *static_cast<MultiresDisplacementData *>(
displacement.user_data);
const OffsetIndices faces = mesh.faces();
const int num_ptex_faces = count_num_ptex_faces(mesh);
/* Allocate memory. */
data->ptex_face_corner = MEM_malloc_arrayN<PolyCornerIndex>(size_t(num_ptex_faces),
"PTEX face corner");
data.ptex_face_corner = MEM_malloc_arrayN<PolyCornerIndex>(size_t(num_ptex_faces),
"PTEX face corner");
/* Fill in offsets. */
int ptex_face_index = 0;
PolyCornerIndex *ptex_face_corner = data->ptex_face_corner;
for (int face_index = 0; face_index < mesh->faces_num; face_index++) {
PolyCornerIndex *ptex_face_corner = data.ptex_face_corner;
for (int face_index = 0; face_index < mesh.faces_num; face_index++) {
const IndexRange face = faces[face_index];
if (face.size() == 4) {
ptex_face_corner[ptex_face_index].face_index = face_index;
@@ -405,21 +405,21 @@ static void displacement_data_init_mapping(Displacement *displacement, const Mes
}
}
static void displacement_init_data(Displacement *displacement,
Subdiv *subdiv,
Mesh *mesh,
const MultiresModifierData *mmd)
static void displacement_init_data(Displacement &displacement,
Subdiv &subdiv,
Mesh &mesh,
const MultiresModifierData &mmd)
{
MultiresDisplacementData *data = static_cast<MultiresDisplacementData *>(
displacement->user_data);
data->subdiv = subdiv;
data->grid_size = grid_size_from_level(mmd->totlvl);
data->mesh = mesh;
data->mmd = mmd;
data->faces = mesh->faces();
data->mdisps = static_cast<const MDisps *>(CustomData_get_layer(&mesh->corner_data, CD_MDISPS));
data->face_ptex_offset = face_ptex_offset_get(subdiv);
data->is_initialized = false;
MultiresDisplacementData &data = *static_cast<MultiresDisplacementData *>(
displacement.user_data);
data.subdiv = &subdiv;
data.grid_size = grid_size_from_level(mmd.totlvl);
data.mesh = &mesh;
data.mmd = &mmd;
data.faces = mesh.faces();
data.mdisps = static_cast<const MDisps *>(CustomData_get_layer(&mesh.corner_data, CD_MDISPS));
data.face_ptex_offset = face_ptex_offset_get(&subdiv);
data.is_initialized = false;
displacement_data_init_mapping(displacement, mesh);
}
@@ -442,7 +442,7 @@ void displacement_attach_from_multires(Subdiv *subdiv, Mesh *mesh, const Multire
/* Allocate all required memory. */
Displacement *displacement = MEM_callocN<Displacement>("multires displacement");
displacement->user_data = MEM_new<MultiresDisplacementData>("multires displacement data");
displacement_init_data(displacement, subdiv, mesh, mmd);
displacement_init_data(*displacement, *subdiv, *mesh, *mmd);
displacement_init_functions(displacement);
/* Finish. */
subdiv->displacement_evaluator = displacement;