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

Cleanup: Sculpt: Move SculptBoundary struct

Browse Source 
Moves SculptBoundary out of BKE_paint.hh and into sculpt_intern.hh

Like other cached data, this ideally should not be this exposed, but
reducing its inclusion in any other file that uses BKE_paint.hh is a
good start.

Pull Request: https://projects.blender.org/blender/blender/pulls/126010
This commit is contained in:
Sean Kim
2024-08-07 19:08:57 +02:00
committed by Sean Kim
parent a512afe9b5
commit 998712ba2e
2 changed files with 59 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
source/blender/blenkernel/BKE_paint.hh
View File

@@ -326,65 +326,6 @@ struct SculptBoundaryPreview {
blender::float3 initial_vert_position;
};
struct SculptBoundary {
/* Vertex indices of the active boundary. */
blender::Vector<int> verts;
/* Distance from a vertex in the boundary to initial vertex indexed by vertex index, taking into
* account the length of all edges between them. Any vertex that is not in the boundary will have
* a distance of 0. */
blender::Map<int, float> distance;
/* Data for drawing the preview. */
blender::Vector<std::pair<blender::float3, blender::float3>> edges;
/* Initial vertex index in the boundary which is closest to the current sculpt active vertex. */
int initial_vert_i;
/* Vertex that at max_propagation_steps from the boundary and closest to the original active
* vertex that was used to initialize the boundary. This is used as a reference to check how much
* the deformation will go into the mesh and to calculate the strength of the brushes. */
blender::float3 pivot_position;
/* Stores the initial positions of the pivot and boundary initial vertex as they may be deformed
* during the brush action. This allows to use them as a reference positions and vectors for some
* brush effects. */
blender::float3 initial_vert_position;
/* Maximum number of topology steps that were calculated from the boundary. */
int max_propagation_steps;
/* Indexed by vertex index, contains the topology information needed for boundary deformations.
*/
struct {
/* Vertex index from where the topology propagation reached this vertex. */
blender::Array<int> original_vertex_i;
/* How many steps were needed to reach this vertex from the boundary. */
blender::Array<int> propagation_steps_num;
/* Strength that is used to deform this vertex. */
blender::Array<float> strength_factor;
} edit_info;
/* Bend Deform type. */
struct {
blender::Array<blender::float3> pivot_rotation_axis;
blender::Array<blender::float3> pivot_positions;
} bend;
/* Slide Deform type. */
struct {
blender::Array<blender::float3> directions;
} slide;
/* Twist Deform type. */
struct {
blender::float3 rotation_axis;
blender::float3 pivot_position;
} twist;
};
struct SculptFakeNeighbors {
bool use_fake_neighbors;

59
source/blender/editors/sculpt_paint/sculpt_intern.hh
View File

@@ -287,6 +287,65 @@ struct Cache {
}
struct SculptBoundary {
/* Vertex indices of the active boundary. */
blender::Vector<int> verts;
/* Distance from a vertex in the boundary to initial vertex indexed by vertex index, taking into
* account the length of all edges between them. Any vertex that is not in the boundary will have
* a distance of 0. */
blender::Map<int, float> distance;
/* Data for drawing the preview. */
blender::Vector<std::pair<blender::float3, blender::float3>> edges;
/* Initial vertex index in the boundary which is closest to the current sculpt active vertex. */
int initial_vert_i;
/* Vertex that at max_propagation_steps from the boundary and closest to the original active
* vertex that was used to initialize the boundary. This is used as a reference to check how much
* the deformation will go into the mesh and to calculate the strength of the brushes. */
blender::float3 pivot_position;
/* Stores the initial positions of the pivot and boundary initial vertex as they may be deformed
* during the brush action. This allows to use them as a reference positions and vectors for some
* brush effects. */
blender::float3 initial_vert_position;
/* Maximum number of topology steps that were calculated from the boundary. */
int max_propagation_steps;
/* Indexed by vertex index, contains the topology information needed for boundary deformations.
*/
struct {
/* Vertex index from where the topology propagation reached this vertex. */
blender::Array<int> original_vertex_i;
/* How many steps were needed to reach this vertex from the boundary. */
blender::Array<int> propagation_steps_num;
/* Strength that is used to deform this vertex. */
blender::Array<float> strength_factor;
} edit_info;
/* Bend Deform type. */
struct {
blender::Array<blender::float3> pivot_rotation_axis;
blender::Array<blender::float3> pivot_positions;
} bend;
/* Slide Deform type. */
struct {
blender::Array<blender::float3> directions;
} slide;
/* Twist Deform type. */
struct {
blender::float3 rotation_axis;
blender::float3 pivot_position;
} twist;
};
/**
* This structure contains all the temporary data
* needed for individual brush strokes.