godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove unnecessary "rings" variable from "draw_rings()" in StyleBox

This commit is contained in:
Michael Alexsander Silva Dias 2018-10-16 14:48:46 -03:00
parent 0dbe01483a
commit cad9e4e692
1 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
scene/resources/style_box.cpp
View File

@ -565,8 +565,6 @@ inline void draw_ring(Vector<Vector2> &verts, Vector<int> &indices, Vector<Color
vert_offset = 0; vert_offset = 0;
} }
int adapted_corner_detail = (corner_radius[0] == 0 && corner_radius[1] == 0 && corner_radius[2] == 0 && corner_radius[3] == 0) ? 1 : corner_detail; int adapted_corner_detail = (corner_radius[0] == 0 && corner_radius[1] == 0 && corner_radius[2] == 0 && corner_radius[3] == 0) ? 1 : corner_detail;
int rings = (border_width[0] == 0 && border_width[1] == 0 && border_width[2] == 0 && border_width[3] == 0) ? 1 : 2;
rings = 2;
int ring_corner_radius[4]; int ring_corner_radius[4];
set_inner_corner_radius(style_rect, ring_rect, corner_radius, ring_corner_radius); set_inner_corner_radius(style_rect, ring_rect, corner_radius, ring_corner_radius);
@ -592,7 +590,7 @@ inline void draw_ring(Vector<Vector2> &verts, Vector<int> &indices, Vector<Color
//calculate the vert array //calculate the vert array
for (int corner_index = 0; corner_index < 4; corner_index++) { for (int corner_index = 0; corner_index < 4; corner_index++) {
for (int detail = 0; detail <= adapted_corner_detail; detail++) { for (int detail = 0; detail <= adapted_corner_detail; detail++) {
for (int inner_outer = (2 - rings); inner_outer < 2; inner_outer++) { for (int inner_outer = 0; inner_outer < 2; inner_outer++) {
float radius; float radius;
Color color; Color color;
Point2 corner_point; Point2 corner_point;
@ -613,8 +611,7 @@ inline void draw_ring(Vector<Vector2> &verts, Vector<int> &indices, Vector<Color
} }
} }
if (rings == 2) { int vert_count = (adapted_corner_detail + 1) * 4 * 2;
int vert_count = (adapted_corner_detail + 1) * 4 * rings;
//fill the indices and the colors for the border //fill the indices and the colors for the border
for (int i = 0; i < vert_count; i++) { for (int i = 0; i < vert_count; i++) {
//poly 1 //poly 1
@ -627,7 +624,6 @@ inline void draw_ring(Vector<Vector2> &verts, Vector<int> &indices, Vector<Color
indices.push_back(vert_offset + ((i + 3) % vert_count)); indices.push_back(vert_offset + ((i + 3) % vert_count));
} }
} }
}
inline void adapt_values(int p_index_a, int p_index_b, int *adapted_values, const int *p_values, const real_t p_width, const int p_max_a, const int p_max_b) { inline void adapt_values(int p_index_a, int p_index_b, int *adapted_values, const int *p_values, const real_t p_width, const int p_max_a, const int p_max_b) {
if (p_values[p_index_a] + p_values[p_index_b] > p_width) { if (p_values[p_index_a] + p_values[p_index_b] > p_width) {