migrations/egui
1
0
Fork 0
mirror of https://github.com/emilk/egui.git synced 2026-08-31 05:40:03 -04:00
Code Activity

Use premultiplied alpha for all colors + improve painting of thin lines

Browse Source
This commit is contained in:
Emil Ernerfeldt
2020-05-11 17:57:11 +02:00
parent 4fcea59929
commit 3860807e29
6 changed files with 130 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
emigui_glium/src/painter.rs
View File

@@ -64,7 +64,7 @@ impl Painter {
if (v_pos.y > v_clip_rect.w) { discard; }
f_color = v_color;
f_color.rgb = linear_from_srgb(f_color.rgb);
f_color.a *= texture(u_sampler, v_tc).r;
f_color *= texture(u_sampler, v_tc).r;
}
"
},
@@ -118,7 +118,7 @@ impl Painter {
if (v_pos.y > v_clip_rect.w) { discard; }
gl_FragColor = v_color;
gl_FragColor.rgb = linear_from_srgb(gl_FragColor.rgb);
gl_FragColor.a *= texture2D(u_sampler, v_tc).r;
gl_FragColor *= texture2D(u_sampler, v_tc).r;
}
",
},
@@ -172,7 +172,7 @@ impl Painter {
if (v_pos.y > v_clip_rect.w) { discard; }
gl_FragColor = v_color;
gl_FragColor.rgb = linear_from_srgb(gl_FragColor.rgb);
gl_FragColor.a *= texture2D(u_sampler, v_tc).r;
gl_FragColor *= texture2D(u_sampler, v_tc).r;
}
",
},
@@ -274,8 +274,19 @@ impl Painter {
u_sampler: &self.texture,
};
// Emilib outputs colors with premultiplied alpha:
let blend_func = glium::BlendingFunction::Addition {
source: glium::LinearBlendingFactor::One,
destination: glium::LinearBlendingFactor::OneMinusSourceAlpha,
};
let blend = glium::Blend {
color: blend_func,
alpha: blend_func,
..Default::default()
};
let params = glium::DrawParameters {
blend: glium::Blend::alpha_blending(),
blend,
..Default::default()
};