archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Cleanup: Following naming convention and more const

Browse Source 
Adding "_" suffix on private member variables.
Add const qualifier where possible.

No functional changes.
This commit is contained in:
Chris Blackbourn
2023-03-22 13:04:13 +13:00
parent 64ef514ec9
commit d2b502f213
2 changed files with 39 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/geometry/GEO_uv_pack.hh
View File

@@ -75,7 +75,7 @@ class PackIsland {
void finalize_geometry(const UVPackIsland_Params &params, MemArena *arena, Heap *heap);
private:
blender::Vector<float2> triangleVertices;
blender::Vector<float2> triangle_vertices_;
friend class Occupancy;
};

76
source/blender/geometry/intern/uv_pack.cc
View File

@@ -70,14 +70,14 @@ void PackIsland::add_triangle(const float2 uv0, const float2 uv1, const float2 u
{
/* Be careful with winding. */
if (dist_signed_squared_to_edge(uv0, uv1, uv2) < 0.0f) {
triangleVertices.append(uv0);
triangleVertices.append(uv1);
triangleVertices.append(uv2);
triangle_vertices_.append(uv0);
triangle_vertices_.append(uv1);
triangle_vertices_.append(uv2);
}
else {
triangleVertices.append(uv0);
triangleVertices.append(uv2);
triangleVertices.append(uv1);
triangle_vertices_.append(uv0);
triangle_vertices_.append(uv2);
triangle_vertices_.append(uv1);
}
}
@@ -128,11 +128,11 @@ void PackIsland::finalize_geometry(const UVPackIsland_Params &params, MemArena *
const eUVPackIsland_ShapeMethod shape_method = params.shape_method;
if (shape_method == ED_UVPACK_SHAPE_CONVEX) {
/* Compute convex hull of existing triangles. */
if (triangleVertices.size() <= 3) {
if (triangle_vertices_.size() <= 3) {
return; /* Trivial case, nothing to do. */
}
int vert_count = int(triangleVertices.size());
int vert_count = int(triangle_vertices_.size());
/* Allocate storage. */
int *index_map = static_cast<int *>(
@@ -142,14 +142,14 @@ void PackIsland::finalize_geometry(const UVPackIsland_Params &params, MemArena *
/* Prepare input for convex hull. */
for (int i = 0; i < vert_count; i++) {
copy_v2_v2(source[i], triangleVertices[i]);
copy_v2_v2(source[i], triangle_vertices_[i]);
}
/* Compute convex hull. */
int convex_len = BLI_convexhull_2d(source, vert_count, index_map);
/* Write back. */
triangleVertices.clear();
triangle_vertices_.clear();
blender::Array<float2> convexVertices(convex_len);
for (int i = 0; i < convex_len; i++) {
convexVertices[i] = source[index_map[i]];
@@ -277,17 +277,17 @@ class Occupancy {
int bitmap_radix; /* Width and Height of `bitmap`. */
float bitmap_scale_reciprocal; /* == 1.0f / `bitmap_scale`. */
private:
mutable blender::Array<float> bitmap;
mutable blender::Array<float> bitmap_;
mutable float2 witness; /* Witness to a previously known occupied pixel. */
mutable float witness_distance; /* Signed distance to nearest placed island. */
mutable uint triangle_hint; /* Hint to a previously suspected overlapping triangle. */
mutable float2 witness_; /* Witness to a previously known occupied pixel. */
mutable float witness_distance_; /* Signed distance to nearest placed island. */
mutable uint triangle_hint_; /* Hint to a previously suspected overlapping triangle. */
const float terminal = 1048576.0f; /* A "very" large number, much bigger than 4 * bitmap_radix */
};
Occupancy::Occupancy(const float initial_scale)
: bitmap_radix(800), bitmap(bitmap_radix * bitmap_radix, false)
: bitmap_radix(800), bitmap_(bitmap_radix * bitmap_radix, false)
{
increase_scale();
bitmap_scale_reciprocal = bitmap_radix / initial_scale;
@@ -297,12 +297,12 @@ void Occupancy::increase_scale()
{
bitmap_scale_reciprocal *= 0.5f;
for (int i = 0; i < bitmap_radix * bitmap_radix; i++) {
bitmap[i] = terminal;
bitmap_[i] = terminal;
}
witness.x = -1;
witness.y = -1;
witness_distance = 0.0f;
triangle_hint = 0;
witness_.x = -1;
witness_.y = -1;
witness_distance_ = 0.0f;
triangle_hint_ = 0;
}
static float signed_distance_fat_triangle(const float2 probe,
@@ -351,10 +351,10 @@ float Occupancy::trace_triangle(const float2 &uv0,
epsilon = std::max(epsilon, 2 * margin * bitmap_scale_reciprocal);
if (!write) {
if (ix0 <= witness.x && witness.x < ix1) {
if (iy0 <= witness.y && witness.y < iy1) {
const float distance = signed_distance_fat_triangle(witness, uv0s, uv1s, uv2s);
const float extent = epsilon - distance - witness_distance;
if (ix0 <= witness_.x && witness_.x < ix1) {
if (iy0 <= witness_.y && witness_.y < iy1) {
const float distance = signed_distance_fat_triangle(witness_, uv0s, uv1s, uv2s);
const float extent = epsilon - distance - witness_distance_;
if (extent > 0.0f) {
return extent; /* Witness observes occupied. */
}
@@ -365,7 +365,7 @@ float Occupancy::trace_triangle(const float2 &uv0,
/* Iterate in opposite direction to outer search to improve witness effectiveness. */
for (int y = iy1 - 1; y >= iy0; y--) {
for (int x = ix1 - 1; x >= ix0; x--) {
float *hotspot = &bitmap[y * bitmap_radix + x];
float *hotspot = &bitmap_[y * bitmap_radix + x];
if (!write && *hotspot > epsilon) {
continue;
}
@@ -377,8 +377,8 @@ float Occupancy::trace_triangle(const float2 &uv0,
}
const float extent = epsilon - distance - *hotspot;
if (extent > 0.0f) {
witness = probe;
witness_distance = *hotspot;
witness_ = probe;
witness_distance_ = *hotspot;
return extent; /* Occupied. */
}
}
@@ -400,17 +400,17 @@ float Occupancy::trace_island(PackIsland *island,
}
const float2 origin(island->bounds_rect.xmin, island->bounds_rect.ymin);
const float2 delta = uv - origin * scale;
uint vert_count = uint(island->triangleVertices.size());
uint vert_count = uint(island->triangle_vertices_.size());
for (uint i = 0; i < vert_count; i += 3) {
uint j = (i + triangle_hint) % vert_count;
float extent = trace_triangle(delta + island->triangleVertices[j] * scale,
delta + island->triangleVertices[j + 1] * scale,
delta + island->triangleVertices[j + 2] * scale,
uint j = (i + triangle_hint_) % vert_count;
float extent = trace_triangle(delta + island->triangle_vertices_[j] * scale,
delta + island->triangle_vertices_[j + 1] * scale,
delta + island->triangle_vertices_[j + 2] * scale,
margin,
write);
if (!write && extent >= 0.0f) {
triangle_hint = j;
triangle_hint_ = j;
return extent; /* Occupied. */
}
}
@@ -678,11 +678,11 @@ static float pack_islands_margin_fraction(const Span<PackIsland *> &island_vecto
/* Scaling smaller than `min_scale_roundoff` is unlikely to fit and
* will destroy information in existing UVs. */
float min_scale_roundoff = 1e-5f;
const float min_scale_roundoff = 1e-5f;
/* Certain inputs might have poor convergence properties.
* Use `max_iteration` to prevent an infinite loop. */
int max_iteration = 25;
const int max_iteration = 25;
for (int iteration = 0; iteration < max_iteration; iteration++) {
float scale = 1.0f;
@@ -728,9 +728,9 @@ static float pack_islands_margin_fraction(const Span<PackIsland *> &island_vecto
/* Evaluate our `f`. */
scale_last = scale;
float max_uv = pack_islands_scale_margin(
const float max_uv = pack_islands_scale_margin(
island_vector, box_array, scale_last, margin_fraction, params);
float value = sqrtf(max_uv) - 1.0f;
const float value = sqrtf(max_uv) - 1.0f;
if (value <= 0.0f) {
scale_low = scale;
@@ -752,7 +752,7 @@ static float pack_islands_margin_fraction(const Span<PackIsland *> &island_vecto
/* Write back best pack as a side-effect. First get best pack. */
if (scale_last != scale_low) {
scale_last = scale_low;
float max_uv = pack_islands_scale_margin(
const float max_uv = pack_islands_scale_margin(
island_vector, box_array, scale_last, margin_fraction, params);
UNUSED_VARS(max_uv);
/* TODO (?): `if (max_uv < 1.0f) { scale_last /= max_uv; }` */