asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Merge pull request #34835 from nekomatata/stylebox-aa-fix

Browse source 
Fixed StyleBoxFlat antialiasing with aa size of 1
This commit is contained in:
Rémi Verschelde 2020-01-05 11:07:38 +01:00 committed by GitHub
commit 195f39a2ce
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
scene/resources/style_box.cpp
View file

@ -719,6 +719,7 @@ void StyleBoxFlat::draw(RID p_canvas_item, const Rect2 &p_rect) const {
bool rounded_corners = (corner_radius[0] > 0) || (corner_radius[1] > 0) || (corner_radius[2] > 0) || (corner_radius[3] > 0); bool rounded_corners = (corner_radius[0] > 0) || (corner_radius[1] > 0) || (corner_radius[2] > 0) || (corner_radius[3] > 0);
bool aa_on = rounded_corners && anti_aliased; bool aa_on = rounded_corners && anti_aliased;
float aa_size_grow = 0.5 * ((float)aa_size + 1.0);
bool blend_on = blend_border && draw_border; bool blend_on = blend_border && draw_border;
@ -744,7 +745,6 @@ void StyleBoxFlat::draw(RID p_canvas_item, const Rect2 &p_rect) const {
Rect2 border_style_rect = style_rect; Rect2 border_style_rect = style_rect;
if (aa_on) { if (aa_on) {
float aa_size_grow = 0.5 * ((aa_size + 1) / 2);
for (int i = 0; i < 4; i++) { for (int i = 0; i < 4; i++) {
if (border_width[i] > 0) { if (border_width[i] > 0) {
border_style_rect = border_style_rect.grow_margin((Margin)i, -aa_size_grow); border_style_rect = border_style_rect.grow_margin((Margin)i, -aa_size_grow);
@ -789,7 +789,6 @@ void StyleBoxFlat::draw(RID p_canvas_item, const Rect2 &p_rect) const {
} }
if (aa_on) { if (aa_on) {
float aa_size_grow = 0.5 * ((aa_size + 1) / 2);
int aa_border_width[4]; int aa_border_width[4];
int aa_fill_width[4]; int aa_fill_width[4];
if (draw_border) { if (draw_border) {
@ -804,6 +803,7 @@ void StyleBoxFlat::draw(RID p_canvas_item, const Rect2 &p_rect) const {
} }
} else { } else {
for (int i = 0; i < 4; i++) { for (int i = 0; i < 4; i++) {
aa_border_width[i] = 0;
aa_fill_width[i] = aa_size_grow; aa_fill_width[i] = aa_size_grow;
} }
} }
@ -844,7 +844,7 @@ void StyleBoxFlat::draw(RID p_canvas_item, const Rect2 &p_rect) const {
} }
//COMPUTE UV COORDINATES //COMPUTE UV COORDINATES
Rect2 uv_rect = style_rect.grow(aa_on ? aa_size : 0); Rect2 uv_rect = style_rect.grow(aa_on ? aa_size_grow : 0);
uvs.resize(verts.size()); uvs.resize(verts.size());
for (int i = 0; i < verts.size(); i++) { for (int i = 0; i < verts.size(); i++) {
uvs.write[i].x = (verts[i].x - uv_rect.position.x) / uv_rect.size.width; uvs.write[i].x = (verts[i].x - uv_rect.position.x) / uv_rect.size.width;