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

Cleanup: Rename various multires functions

Browse Source 
* `multires_reshape_evaluate_limit_at_grid` to
  `multires_reshape_evaluate_base_mesh_limit_at_grid`

Pull Request: https://projects.blender.org/blender/blender/pulls/145457
This commit is contained in:
Sean Kim
2025-09-06 23:55:16 +02:00
committed by Sean Kim
parent 4d6405c130
commit 9cae162597
4 changed files with 21 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
source/blender/blenkernel/intern/multires_reshape.hh
View File

@@ -254,10 +254,11 @@ ReshapeConstGridElement multires_reshape_orig_grid_element_for_grid_coord(
* Evaluate limit surface created from base mesh.
* This is the limit surface which defines tangent space for MDisps.
*/
void multires_reshape_evaluate_limit_at_grid(const MultiresReshapeContext *reshape_context,
const GridCoord *grid_coord,
blender::float3 &r_P,
blender::float3x3 &r_tangent_matrix);
void multires_reshape_evaluate_base_mesh_limit_at_grid(
const MultiresReshapeContext *reshape_context,
const GridCoord *grid_coord,
blender::float3 &r_P,
blender::float3x3 &r_tangent_matrix);
/* --------------------------------------------------------------------
* Custom data preparation.

3
source/blender/blenkernel/intern/multires_reshape_apply_base.cc
View File

@@ -36,7 +36,8 @@ void multires_reshape_apply_base_update_mesh_coords(MultiresReshapeContext *resh
blender::float3 P;
blender::float3x3 tangent_matrix;
multires_reshape_evaluate_limit_at_grid(reshape_context, &grid_coord, P, tangent_matrix);
multires_reshape_evaluate_base_mesh_limit_at_grid(
reshape_context, &grid_coord, P, tangent_matrix);
ReshapeConstGridElement grid_element = multires_reshape_orig_grid_element_for_grid_coord(
reshape_context, &grid_coord);

5
source/blender/blenkernel/intern/multires_reshape_smooth.cc
View File

@@ -1019,7 +1019,8 @@ static void reshape_subdiv_refine_orig_P(
blender::float3 limit_P;
blender::float3x3 tangent_matrix;
multires_reshape_evaluate_limit_at_grid(reshape_context, grid_coord, limit_P, tangent_matrix);
multires_reshape_evaluate_base_mesh_limit_at_grid(
reshape_context, grid_coord, limit_P, tangent_matrix);
const ReshapeConstGridElement orig_grid_element =
multires_reshape_orig_grid_element_for_grid_coord(reshape_context, grid_coord);
@@ -1250,7 +1251,7 @@ static void evaluate_final_original_point(
/* Limit surface of the base mesh. */
blender::float3 base_mesh_limit_P;
blender::float3x3 base_mesh_tangent_matrix;
multires_reshape_evaluate_limit_at_grid(
multires_reshape_evaluate_base_mesh_limit_at_grid(
reshape_context, grid_coord, base_mesh_limit_P, base_mesh_tangent_matrix);
/* Convert original displacement from tangent space to object space. */

18
source/blender/blenkernel/intern/multires_reshape_util.cc
View File

@@ -531,10 +531,11 @@ ReshapeConstGridElement multires_reshape_orig_grid_element_for_grid_coord(
/** \name Sample limit surface of the base mesh
* \{ */
void multires_reshape_evaluate_limit_at_grid(const MultiresReshapeContext *reshape_context,
const GridCoord *grid_coord,
blender::float3 &r_P,
blender::float3x3 &r_tangent_matrix)
void multires_reshape_evaluate_base_mesh_limit_at_grid(
const MultiresReshapeContext *reshape_context,
const GridCoord *grid_coord,
blender::float3 &r_P,
blender::float3x3 &r_tangent_matrix)
{
blender::float3 dPdu;
blender::float3 dPdv;
@@ -733,7 +734,8 @@ static void object_grid_element_to_tangent_displacement(
{
blender::float3 P;
blender::float3x3 tangent_matrix;
multires_reshape_evaluate_limit_at_grid(reshape_context, grid_coord, P, tangent_matrix);
multires_reshape_evaluate_base_mesh_limit_at_grid(
reshape_context, grid_coord, P, tangent_matrix);
const blender::float3x3 inv_tangent_matrix = blender::math::invert(tangent_matrix);
@@ -771,7 +773,8 @@ static void assign_final_coords_from_mdisps(const MultiresReshapeContext *reshap
{
blender::float3 P;
blender::float3x3 tangent_matrix;
multires_reshape_evaluate_limit_at_grid(reshape_context, grid_coord, P, tangent_matrix);
multires_reshape_evaluate_base_mesh_limit_at_grid(
reshape_context, grid_coord, P, tangent_matrix);
ReshapeGridElement grid_element = multires_reshape_grid_element_for_grid_coord(reshape_context,
grid_coord);
@@ -794,7 +797,8 @@ static void assign_final_elements_from_orig_mdisps(const MultiresReshapeContext
{
blender::float3 P;
blender::float3x3 tangent_matrix;
multires_reshape_evaluate_limit_at_grid(reshape_context, grid_coord, P, tangent_matrix);
multires_reshape_evaluate_base_mesh_limit_at_grid(
reshape_context, grid_coord, P, tangent_matrix);
const ReshapeConstGridElement orig_grid_element =
multires_reshape_orig_grid_element_for_grid_coord(reshape_context, grid_coord);