migrations/egui
1
0
Fork 0
mirror of https://github.com/emilk/egui.git synced 2026-06-28 07:23:13 -04:00
Code Activity

Code cleanup: allow None mouse_pos + clippy fixes

Browse Source
This commit is contained in:
Emil Ernerfeldt
2019-02-10 15:30:48 +01:00
parent 1beed16053
commit f0c879b2f4
9 changed files with 81 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
emigui_wasm/src/webgl.rs
View File

@@ -119,7 +119,7 @@ impl Painter {
gl.bind_texture(Gl::TEXTURE_2D, Some(&self.texture));
// TODO: remove once https://github.com/rustwasm/wasm-bindgen/issues/1005 is fixed.
let mut pixels: Vec<_> = texture.pixels.iter().cloned().collect();
let mut pixels: Vec<_> = texture.pixels.to_vec();
let level = 0;
let internal_format = Gl::ALPHA;
@@ -294,8 +294,8 @@ impl Painter {
.unwrap();
gl.uniform2f(
Some(&u_tex_size_loc),
self.tex_size.0 as f32,
self.tex_size.1 as f32,
f32::from(self.tex_size.0),
f32::from(self.tex_size.1),
);
let u_sampler_loc = gl.get_uniform_location(&self.program, "u_sampler").unwrap();