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

Cleanup: rename dynamic paint specific volume grid

Browse Source 
Doing this to avoid name clashes with the more used `VolumeGrid` type.
This commit is contained in:
Jacques Lucke
2023-12-13 13:12:55 +01:00
parent f01bc93bcf
commit 1a4f4104d1
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
source/blender/blenkernel/intern/dynamicpaint.cc
View File

@@ -141,7 +141,7 @@ struct Bounds3D {
bool valid;
};
struct VolumeGrid {
struct DynamicPaintVolumeGrid {
int dim[3];
/** whole grid bounds */
Bounds3D grid_bounds;
@@ -196,7 +196,7 @@ struct PaintBakeData {
double average_dist;
/* space partitioning */
/** space partitioning grid to optimize brush checks */
VolumeGrid *grid;
DynamicPaintVolumeGrid *grid;
/* velocity and movement */
/** speed vector in global space movement per frame, if required */
@@ -625,7 +625,7 @@ static float getSurfaceDimension(PaintSurfaceData *sData)
static void freeGrid(PaintSurfaceData *data)
{
PaintBakeData *bData = data->bData;
VolumeGrid *grid = bData->grid;
DynamicPaintVolumeGrid *grid = bData->grid;
if (grid->bounds) {
MEM_freeN(grid->bounds);
@@ -671,7 +671,7 @@ static void grid_cell_points_cb_ex(void *__restrict userdata,
const TaskParallelTLS *__restrict tls)
{
PaintBakeData *bData = static_cast<PaintBakeData *>(userdata);
VolumeGrid *grid = bData->grid;
DynamicPaintVolumeGrid *grid = bData->grid;
int *temp_t_index = grid->temp_t_index;
int *s_num = static_cast<int *>(tls->userdata_chunk);
@@ -692,7 +692,7 @@ static void grid_cell_points_reduce(const void *__restrict userdata,
void *__restrict chunk)
{
const PaintBakeData *bData = static_cast<const PaintBakeData *>(userdata);
const VolumeGrid *grid = bData->grid;
const DynamicPaintVolumeGrid *grid = bData->grid;
const int grid_cells = grid->dim[0] * grid->dim[1] * grid->dim[2];
int *join_s_num = static_cast<int *>(chunk_join);
@@ -709,7 +709,7 @@ static void grid_cell_bounds_cb(void *__restrict userdata,
const TaskParallelTLS *__restrict /*tls*/)
{
PaintBakeData *bData = static_cast<PaintBakeData *>(userdata);
VolumeGrid *grid = bData->grid;
DynamicPaintVolumeGrid *grid = bData->grid;
float *dim = bData->dim;
int *grid_dim = grid->dim;
@@ -731,7 +731,7 @@ static void surfaceGenerateGrid(DynamicPaintSurface *surface)
{
PaintSurfaceData *sData = surface->data;
PaintBakeData *bData = sData->bData;
VolumeGrid *grid;
DynamicPaintVolumeGrid *grid;
int grid_cells, axis = 3;
int *temp_t_index = nullptr;
int *temp_s_num = nullptr;
@@ -740,7 +740,7 @@ static void surfaceGenerateGrid(DynamicPaintSurface *surface)
freeGrid(sData);
}
bData->grid = MEM_cnew<VolumeGrid>(__func__);
bData->grid = MEM_cnew<DynamicPaintVolumeGrid>(__func__);
grid = bData->grid;
{
@@ -3950,7 +3950,7 @@ static void dynamic_paint_paint_mesh_cell_point_cb_ex(void *__restrict userdata,
const DynamicPaintSurface *surface = data->surface;
const PaintSurfaceData *sData = surface->data;
const PaintBakeData *bData = sData->bData;
VolumeGrid *grid = bData->grid;
DynamicPaintVolumeGrid *grid = bData->grid;
const DynamicPaintBrushSettings *brush = data->brush;
@@ -4304,7 +4304,7 @@ static bool dynamicPaint_paintMesh(Depsgraph *depsgraph,
int numOfVerts;
int ii;
Bounds3D mesh_bb = {{0}};
VolumeGrid *grid = bData->grid;
DynamicPaintVolumeGrid *grid = bData->grid;
mesh = BKE_mesh_copy_for_eval(brush_mesh);
blender::MutableSpan<blender::float3> positions = mesh->vert_positions_for_write();
@@ -4407,7 +4407,7 @@ static void dynamic_paint_paint_particle_cell_point_cb_ex(
const DynamicPaintSurface *surface = data->surface;
const PaintSurfaceData *sData = surface->data;
const PaintBakeData *bData = sData->bData;
VolumeGrid *grid = bData->grid;
DynamicPaintVolumeGrid *grid = bData->grid;
const DynamicPaintBrushSettings *brush = data->brush;
@@ -4584,7 +4584,7 @@ static bool dynamicPaint_paintParticles(DynamicPaintSurface *surface,
ParticleSettings *part = psys->part;
PaintSurfaceData *sData = surface->data;
PaintBakeData *bData = sData->bData;
VolumeGrid *grid = bData->grid;
DynamicPaintVolumeGrid *grid = bData->grid;
KDTree_3d *tree;
int particlesAdded = 0;