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

Cleanup: Remove unused voxel sampling functions

Browse Source 
Last used in Blender internal renderer.
This commit is contained in:
Hans Goudey
2023-11-28 13:30:18 -05:00
parent 573b4728cb
commit 7020a4ff1a
2 changed files with 0 additions and 174 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/blenlib/BLI_voxel.h
View File

@@ -19,13 +19,7 @@ extern "C" {
/* All input coordinates must be in bounding box 0.0 - 1.0. */
float BLI_voxel_sample_nearest(const float *data, const int res[3], const float co[3]);
float BLI_voxel_sample_trilinear(const float *data, const int res[3], const float co[3]);
float BLI_voxel_sample_triquadratic(const float *data, const int res[3], const float co[3]);
float BLI_voxel_sample_tricubic(const float *data,
const int res[3],
const float co[3],
int bspline);
#ifdef __cplusplus
}

168
source/blender/blenlib/intern/voxel.c
View File

@@ -21,17 +21,6 @@ BLI_INLINE float D(const float *data, const int res[3], int x, int y, int z)
/* *** nearest neighbor *** */
float BLI_voxel_sample_nearest(const float *data, const int res[3], const float co[3])
{
int xi, yi, zi;
xi = (int)(co[0] * (float)res[0]);
yi = (int)(co[1] * (float)res[1]);
zi = (int)(co[2] * (float)res[2]);
return D(data, res, xi, yi, zi);
}
/* returns highest integer <= x as integer (slightly faster than floor()) */
BLI_INLINE int FLOORI(float x)
{
@@ -92,160 +81,3 @@ float BLI_voxel_sample_trilinear(const float *data, const int res[3], const floa
}
return 0.0f;
}
float BLI_voxel_sample_triquadratic(const float *data, const int res[3], const float co[3])
{
if (data) {
const float xf = co[0] * (float)res[0];
const float yf = co[1] * (float)res[1];
const float zf = co[2] * (float)res[2];
const int x = FLOORI(xf), y = FLOORI(yf), z = FLOORI(zf);
const int64_t xc[3] = {
_clamp(x - 1, 0, res[0] - 1),
_clamp(x, 0, res[0] - 1),
_clamp(x + 1, 0, res[0] - 1),
};
const int64_t yc[3] = {
_clamp(y - 1, 0, res[1] - 1) * res[0],
_clamp(y, 0, res[1] - 1) * res[0],
_clamp(y + 1, 0, res[1] - 1) * res[0],
};
const int64_t zc[3] = {
_clamp(z - 1, 0, res[2] - 1) * res[0] * res[1],
_clamp(z, 0, res[2] - 1) * res[0] * res[1],
_clamp(z + 1, 0, res[2] - 1) * res[0] * res[1],
};
const float dx = xf - (float)x, dy = yf - (float)y, dz = zf - (float)z;
const float u[3] = {dx * (0.5f * dx - 1.0f) + 0.5f, dx * (1.0f - dx) + 0.5f, 0.5f * dx * dx};
const float v[3] = {dy * (0.5f * dy - 1.0f) + 0.5f, dy * (1.0f - dy) + 0.5f, 0.5f * dy * dy};
const float w[3] = {dz * (0.5f * dz - 1.0f) + 0.5f, dz * (1.0f - dz) + 0.5f, 0.5f * dz * dz};
return w[0] *
(v[0] * (u[0] * data[xc[0] + yc[0] + zc[0]] + u[1] * data[xc[1] + yc[0] + zc[0]] +
u[2] * data[xc[2] + yc[0] + zc[0]]) +
v[1] * (u[0] * data[xc[0] + yc[1] + zc[0]] + u[1] * data[xc[1] + yc[1] + zc[0]] +
u[2] * data[xc[2] + yc[1] + zc[0]]) +
v[2] * (u[0] * data[xc[0] + yc[2] + zc[0]] + u[1] * data[xc[1] + yc[2] + zc[0]] +
u[2] * data[xc[2] + yc[2] + zc[0]])) +
w[1] *
(v[0] * (u[0] * data[xc[0] + yc[0] + zc[1]] + u[1] * data[xc[1] + yc[0] + zc[1]] +
u[2] * data[xc[2] + yc[0] + zc[1]]) +
v[1] * (u[0] * data[xc[0] + yc[1] + zc[1]] + u[1] * data[xc[1] + yc[1] + zc[1]] +
u[2] * data[xc[2] + yc[1] + zc[1]]) +
v[2] * (u[0] * data[xc[0] + yc[2] + zc[1]] + u[1] * data[xc[1] + yc[2] + zc[1]] +
u[2] * data[xc[2] + yc[2] + zc[1]])) +
w[2] *
(v[0] * (u[0] * data[xc[0] + yc[0] + zc[2]] + u[1] * data[xc[1] + yc[0] + zc[2]] +
u[2] * data[xc[2] + yc[0] + zc[2]]) +
v[1] * (u[0] * data[xc[0] + yc[1] + zc[2]] + u[1] * data[xc[1] + yc[1] + zc[2]] +
u[2] * data[xc[2] + yc[1] + zc[2]]) +
v[2] * (u[0] * data[xc[0] + yc[2] + zc[2]] + u[1] * data[xc[1] + yc[2] + zc[2]] +
u[2] * data[xc[2] + yc[2] + zc[2]]));
}
return 0.0f;
}
float BLI_voxel_sample_tricubic(const float *data,
const int res[3],
const float co[3],
int bspline)
{
if (data) {
const float xf = co[0] * (float)res[0] - 0.5f;
const float yf = co[1] * (float)res[1] - 0.5f;
const float zf = co[2] * (float)res[2] - 0.5f;
const int x = FLOORI(xf), y = FLOORI(yf), z = FLOORI(zf);
const int64_t xc[4] = {
_clamp(x - 1, 0, res[0] - 1),
_clamp(x, 0, res[0] - 1),
_clamp(x + 1, 0, res[0] - 1),
_clamp(x + 2, 0, res[0] - 1),
};
const int64_t yc[4] = {
_clamp(y - 1, 0, res[1] - 1) * res[0],
_clamp(y, 0, res[1] - 1) * res[0],
_clamp(y + 1, 0, res[1] - 1) * res[0],
_clamp(y + 2, 0, res[1] - 1) * res[0],
};
const int64_t zc[4] = {
_clamp(z - 1, 0, res[2] - 1) * res[0] * res[1],
_clamp(z, 0, res[2] - 1) * res[0] * res[1],
_clamp(z + 1, 0, res[2] - 1) * res[0] * res[1],
_clamp(z + 2, 0, res[2] - 1) * res[0] * res[1],
};
const float dx = xf - (float)x, dy = yf - (float)y, dz = zf - (float)z;
float u[4], v[4], w[4];
if (bspline) { /* B-Spline. */
u[0] = (((-1.0f / 6.0f) * dx + 0.5f) * dx - 0.5f) * dx + (1.0f / 6.0f);
u[1] = ((0.5f * dx - 1.0f) * dx) * dx + (2.0f / 3.0f);
u[2] = ((-0.5f * dx + 0.5f) * dx + 0.5f) * dx + (1.0f / 6.0f);
u[3] = (1.0f / 6.0f) * dx * dx * dx;
v[0] = (((-1.0f / 6.0f) * dy + 0.5f) * dy - 0.5f) * dy + (1.0f / 6.0f);
v[1] = ((0.5f * dy - 1.0f) * dy) * dy + (2.0f / 3.0f);
v[2] = ((-0.5f * dy + 0.5f) * dy + 0.5f) * dy + (1.0f / 6.0f);
v[3] = (1.0f / 6.0f) * dy * dy * dy;
w[0] = (((-1.0f / 6.0f) * dz + 0.5f) * dz - 0.5f) * dz + (1.0f / 6.0f);
w[1] = ((0.5f * dz - 1.0f) * dz) * dz + (2.0f / 3.0f);
w[2] = ((-0.5f * dz + 0.5f) * dz + 0.5f) * dz + (1.0f / 6.0f);
w[3] = (1.0f / 6.0f) * dz * dz * dz;
}
else { /* Catmull-Rom. */
u[0] = ((-0.5f * dx + 1.0f) * dx - 0.5f) * dx;
u[1] = ((1.5f * dx - 2.5f) * dx) * dx + 1.0f;
u[2] = ((-1.5f * dx + 2.0f) * dx + 0.5f) * dx;
u[3] = ((0.5f * dx - 0.5f) * dx) * dx;
v[0] = ((-0.5f * dy + 1.0f) * dy - 0.5f) * dy;
v[1] = ((1.5f * dy - 2.5f) * dy) * dy + 1.0f;
v[2] = ((-1.5f * dy + 2.0f) * dy + 0.5f) * dy;
v[3] = ((0.5f * dy - 0.5f) * dy) * dy;
w[0] = ((-0.5f * dz + 1.0f) * dz - 0.5f) * dz;
w[1] = ((1.5f * dz - 2.5f) * dz) * dz + 1.0f;
w[2] = ((-1.5f * dz + 2.0f) * dz + 0.5f) * dz;
w[3] = ((0.5f * dz - 0.5f) * dz) * dz;
}
return w[0] *
(v[0] * (u[0] * data[xc[0] + yc[0] + zc[0]] + u[1] * data[xc[1] + yc[0] + zc[0]] +
u[2] * data[xc[2] + yc[0] + zc[0]] + u[3] * data[xc[3] + yc[0] + zc[0]]) +
v[1] * (u[0] * data[xc[0] + yc[1] + zc[0]] + u[1] * data[xc[1] + yc[1] + zc[0]] +
u[2] * data[xc[2] + yc[1] + zc[0]] + u[3] * data[xc[3] + yc[1] + zc[0]]) +
v[2] * (u[0] * data[xc[0] + yc[2] + zc[0]] + u[1] * data[xc[1] + yc[2] + zc[0]] +
u[2] * data[xc[2] + yc[2] + zc[0]] + u[3] * data[xc[3] + yc[2] + zc[0]]) +
v[3] * (u[0] * data[xc[0] + yc[3] + zc[0]] + u[1] * data[xc[1] + yc[3] + zc[0]] +
u[2] * data[xc[2] + yc[3] + zc[0]] + u[3] * data[xc[3] + yc[3] + zc[0]])) +
w[1] *
(v[0] * (u[0] * data[xc[0] + yc[0] + zc[1]] + u[1] * data[xc[1] + yc[0] + zc[1]] +
u[2] * data[xc[2] + yc[0] + zc[1]] + u[3] * data[xc[3] + yc[0] + zc[1]]) +
v[1] * (u[0] * data[xc[0] + yc[1] + zc[1]] + u[1] * data[xc[1] + yc[1] + zc[1]] +
u[2] * data[xc[2] + yc[1] + zc[1]] + u[3] * data[xc[3] + yc[1] + zc[1]]) +
v[2] * (u[0] * data[xc[0] + yc[2] + zc[1]] + u[1] * data[xc[1] + yc[2] + zc[1]] +
u[2] * data[xc[2] + yc[2] + zc[1]] + u[3] * data[xc[3] + yc[2] + zc[1]]) +
v[3] * (u[0] * data[xc[0] + yc[3] + zc[1]] + u[1] * data[xc[1] + yc[3] + zc[1]] +
u[2] * data[xc[2] + yc[3] + zc[1]] + u[3] * data[xc[3] + yc[3] + zc[1]])) +
w[2] *
(v[0] * (u[0] * data[xc[0] + yc[0] + zc[2]] + u[1] * data[xc[1] + yc[0] + zc[2]] +
u[2] * data[xc[2] + yc[0] + zc[2]] + u[3] * data[xc[3] + yc[0] + zc[2]]) +
v[1] * (u[0] * data[xc[0] + yc[1] + zc[2]] + u[1] * data[xc[1] + yc[1] + zc[2]] +
u[2] * data[xc[2] + yc[1] + zc[2]] + u[3] * data[xc[3] + yc[1] + zc[2]]) +
v[2] * (u[0] * data[xc[0] + yc[2] + zc[2]] + u[1] * data[xc[1] + yc[2] + zc[2]] +
u[2] * data[xc[2] + yc[2] + zc[2]] + u[3] * data[xc[3] + yc[2] + zc[2]]) +
v[3] * (u[0] * data[xc[0] + yc[3] + zc[2]] + u[1] * data[xc[1] + yc[3] + zc[2]] +
u[2] * data[xc[2] + yc[3] + zc[2]] + u[3] * data[xc[3] + yc[3] + zc[2]])) +
w[3] *
(v[0] * (u[0] * data[xc[0] + yc[0] + zc[3]] + u[1] * data[xc[1] + yc[0] + zc[3]] +
u[2] * data[xc[2] + yc[0] + zc[3]] + u[3] * data[xc[3] + yc[0] + zc[3]]) +
v[1] * (u[0] * data[xc[0] + yc[1] + zc[3]] + u[1] * data[xc[1] + yc[1] + zc[3]] +
u[2] * data[xc[2] + yc[1] + zc[3]] + u[3] * data[xc[3] + yc[1] + zc[3]]) +
v[2] * (u[0] * data[xc[0] + yc[2] + zc[3]] + u[1] * data[xc[1] + yc[2] + zc[3]] +
u[2] * data[xc[2] + yc[2] + zc[3]] + u[3] * data[xc[3] + yc[2] + zc[3]]) +
v[3] * (u[0] * data[xc[0] + yc[3] + zc[3]] + u[1] * data[xc[1] + yc[3] + zc[3]] +
u[2] * data[xc[2] + yc[3] + zc[3]] + u[3] * data[xc[3] + yc[3] + zc[3]]));
}
return 0.0f;
}