Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2012-05-05 04:23:55 +0400
committerCampbell Barton <ideasman42@gmail.com>2012-05-05 04:23:55 +0400
commit4c5502bfd690cad5c02aa6a0be0bd59400ef3407 (patch)
tree6c421d2c324166a682952476e7a1f9aa924c7c51 /source/blender/blenlib/intern/voxel.c
parent9466af0eabf05bfcb966cac01ee72dca544f7dd1 (diff)
code cleanup: function naming for BLI functions.
Diffstat (limited to 'source/blender/blenlib/intern/voxel.c')
-rw-r--r--source/blender/blenlib/intern/voxel.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/source/blender/blenlib/intern/voxel.c b/source/blender/blenlib/intern/voxel.c
index 34862c724e1..1fe42384eb6 100644
--- a/source/blender/blenlib/intern/voxel.c
+++ b/source/blender/blenlib/intern/voxel.c
@@ -37,15 +37,15 @@
BLI_INLINE float D(float *data, const int res[3], int x, int y, int z)
{
- CLAMP(x, 0, res[0]-1);
- CLAMP(y, 0, res[1]-1);
- CLAMP(z, 0, res[2]-1);
- return data[ V_I(x, y, z, res) ];
+ CLAMP(x, 0, res[0] - 1);
+ CLAMP(y, 0, res[1] - 1);
+ CLAMP(z, 0, res[2] - 1);
+ return data[ BLI_VEXEL_INDEX(x, y, z, res) ];
}
/* *** nearest neighbor *** */
/* input coordinates must be in bounding box 0.0 - 1.0 */
-float voxel_sample_nearest(float *data, const int res[3], const float co[3])
+float BLI_voxel_sample_nearest(float *data, const int res[3], const float co[3])
{
int xi, yi, zi;
@@ -70,7 +70,7 @@ BLI_INLINE int _clamp(int a, int b, int c)
return (a < b) ? b : ((a > c) ? c : a);
}
-float voxel_sample_trilinear(float *data, const int res[3], const float co[3])
+float BLI_voxel_sample_trilinear(float *data, const int res[3], const float co[3])
{
if (data) {
@@ -102,7 +102,7 @@ float voxel_sample_trilinear(float *data, const int res[3], const float co[3])
}
-float voxel_sample_triquadratic(float *data, const int res[3], const float co[3])
+float BLI_voxel_sample_triquadratic(float *data, const int res[3], const float co[3])
{
if (data) {
@@ -132,7 +132,7 @@ float voxel_sample_triquadratic(float *data, const int res[3], const float co[3]
return 0.f;
}
-float voxel_sample_tricubic(float *data, const int res[3], const float co[3], int bspline)
+float BLI_voxel_sample_tricubic(float *data, const int res[3], const float co[3], int bspline)
{
if (data) {