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

Fix: properly sample white color (was off by half a texel)

Browse source
This commit is contained in:
Emil Ernerfeldt 2020-04-16 23:10:05 +02:00
parent 4a36b2c1c1
commit 49cbd3fe07
2 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
emigui/src/fonts.rs
View file

@ -69,9 +69,13 @@ impl Fonts {
let mut atlas = TextureAtlas::new(512, 8); // TODO: better default? let mut atlas = TextureAtlas::new(512, 8); // TODO: better default?
// Make one white pixel for use for various stuff: // Make the top left four pixels fully white:
let pos = atlas.allocate((1, 1)); let pos = atlas.allocate((2, 2));
atlas.texture_mut()[pos] = 255; assert_eq!(pos, (0, 0));
atlas.texture_mut()[(0, 0)] = 255;
atlas.texture_mut()[(0, 1)] = 255;
atlas.texture_mut()[(1, 0)] = 255;
atlas.texture_mut()[(1, 1)] = 255;
let atlas = Arc::new(Mutex::new(atlas)); let atlas = Arc::new(Mutex::new(atlas));

6
emigui/src/mesher.rs
View file

@ -8,6 +8,8 @@ use crate::{
types::PaintCmd, types::PaintCmd,
}; };
const WHITE_UV: (u16, u16) = (1, 1);
#[derive(Clone, Copy, Debug, Default, Serialize)] #[derive(Clone, Copy, Debug, Default, Serialize)]
pub struct Vertex { pub struct Vertex {
/// Pixel coordinates /// Pixel coordinates
@ -146,7 +148,7 @@ impl Mesher {
let n = points.len() as u32; let n = points.len() as u32;
let vert = |pos, color| Vertex { let vert = |pos, color| Vertex {
pos, pos,
uv: (0, 0), uv: WHITE_UV,
color, color,
}; };
let mesh = &mut self.mesh; let mesh = &mut self.mesh;
@ -192,7 +194,7 @@ impl Mesher {
let vert = |pos, color| Vertex { let vert = |pos, color| Vertex {
pos, pos,
uv: (0, 0), uv: WHITE_UV,
color, color,
}; };
let mesh = &mut self.mesh; let mesh = &mut self.mesh;