Skip to content

Commit 2e7f5f1

Browse files
committed
Merge pull request #100250 from YYF233333/style
[Codestyle] Merge identical code piece in ConvexHullComputer
2 parents 14b2f62 + bdf2492 commit 2e7f5f1

File tree

1 file changed

+4
-10
lines changed

1 file changed

+4
-10
lines changed

core/math/convex_hull.cpp

+4-10
Original file line numberDiff line numberDiff line change
@@ -2152,10 +2152,11 @@ static int32_t get_vertex_copy(ConvexHullInternal::Vertex *p_vertex, LocalVector
21522152
}
21532153

21542154
real_t ConvexHullComputer::compute(const Vector3 *p_coords, int32_t p_count, real_t p_shrink, real_t p_shrink_clamp) {
2155+
vertices.clear();
2156+
edges.clear();
2157+
faces.clear();
2158+
21552159
if (p_count <= 0) {
2156-
vertices.clear();
2157-
edges.clear();
2158-
faces.clear();
21592160
return 0;
21602161
}
21612162

@@ -2164,16 +2165,9 @@ real_t ConvexHullComputer::compute(const Vector3 *p_coords, int32_t p_count, rea
21642165

21652166
real_t shift = 0;
21662167
if ((p_shrink > 0) && ((shift = hull.shrink(p_shrink, p_shrink_clamp)) < 0)) {
2167-
vertices.clear();
2168-
edges.clear();
2169-
faces.clear();
21702168
return shift;
21712169
}
21722170

2173-
vertices.clear();
2174-
edges.clear();
2175-
faces.clear();
2176-
21772171
LocalVector<ConvexHullInternal::Vertex *> old_vertices;
21782172
get_vertex_copy(hull.vertex_list, old_vertices);
21792173
int32_t copied = 0;

0 commit comments

Comments
 (0)