djkato/egui
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

egui_web: make text thicker and less pixelated (#640)

Browse source 
Closes https://github.com/emilk/egui/issues/516
This commit is contained in:
Emil Ernerfeldt 2021-08-21 21:18:00 +02:00 committed by GitHub
parent 12fd4906de
commit 91bdf9ba6e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 20 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
egui_demo_lib/src/apps/demo/painting.rs
View file

@ -12,7 +12,7 @@ impl Default for Painting {
fn default() -> Self {
Self {
lines: Default::default(),
stroke: Stroke::new(1.0, Color32::LIGHT_BLUE),
stroke: Stroke::new(2.0, Color32::LIGHT_BLUE), // Thin strokes looks bad on web
}
}
}

3
egui_web/CHANGELOG.md
View file

@ -8,6 +8,9 @@ All notable changes to the `egui_web` integration will be noted in this file.
### Added ⭐
* Added support for dragging and dropping files into the browser window.
### Fixed 🐛
* Made text thicker and less pixelated.
## 0.13.0 - 2021-06-24

3
egui_web/src/webgl1.rs
View file

@ -367,7 +367,8 @@ impl crate::Painter for WebGlPainter {
}
let mut pixels: Vec<u8> = Vec::with_capacity(texture.pixels.len() * 4);
for srgba in texture.srgba_pixels() {
let font_gamma = 1.0 / 2.2; // HACK due to non-linear framebuffer blending.
for srgba in texture.srgba_pixels(font_gamma) {
pixels.push(srgba.r());
pixels.push(srgba.g());
pixels.push(srgba.b());

3
egui_web/src/webgl2.rs
View file

@ -368,7 +368,8 @@ impl crate::Painter for WebGl2Painter {
}
let mut pixels: Vec<u8> = Vec::with_capacity(texture.pixels.len() * 4);
for srgba in texture.srgba_pixels() {
let font_gamma = 1.0 / 2.2; // HACK due to non-linear framebuffer blending.
for srgba in texture.srgba_pixels(font_gamma) {
pixels.push(srgba.r());
pixels.push(srgba.g());
pixels.push(srgba.b());

15
epaint/src/texture_atlas.rs
View file

@ -17,10 +17,19 @@ impl Texture {
}
/// Returns the textures as `sRGBA` premultiplied pixels, row by row, top to bottom.
pub fn srgba_pixels(&'_ self) -> impl Iterator<Item = super::Color32> + '_ {
///
/// `gamma` should normally be set to 1.0.
/// If you are having problems with egui text looking skinny and pixelated, try
/// setting a lower gamma, e.g. `0.5`.
pub fn srgba_pixels(&'_ self, gamma: f32) -> impl Iterator<Item = super::Color32> + '_ {
use super::Color32;
let srgba_from_luminance_lut: Vec<Color32> =
(0..=255).map(Color32::from_white_alpha).collect();
let srgba_from_luminance_lut: Vec<Color32> = (0..=255)
.map(|a| {
let a = super::color::linear_f32_from_linear_u8(a).powf(gamma);
super::Rgba::from_white_alpha(a).into()
})
.collect();
self.pixels
.iter()
.map(move |&l| srgba_from_luminance_lut[l as usize])