reivilibre
/
iced-mobile
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use published `glow` and `glow_glyph` versions

This commit is contained in:
Héctor Ramón Jiménez 2020-05-22 19:17:07 +02:00
parent 1dd79c4697
commit d6bf8955db
3 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
glow/Cargo.toml
View File

@ -13,16 +13,14 @@ image = []
svg = [] svg = []
[dependencies] [dependencies]
glow = "0.4"
glow_glyph = "0.1"
euclid = "0.20" euclid = "0.20"
bytemuck = "1.2" bytemuck = "1.2"
glam = "0.8" glam = "0.8"
log = "0.4" log = "0.4"
glyph_brush = "0.6" glyph_brush = "0.6"
[dependencies.glow]
git = "https://github.com/grovesNL/glow"
rev = "722a850e972a69c3012fcb3687758eacbdac2823"
[dependencies.iced_native] [dependencies.iced_native]
version = "0.2" version = "0.2"
path = "../native" path = "../native"
@ -31,7 +29,3 @@ path = "../native"
version = "0.1" version = "0.1"
path = "../graphics" path = "../graphics"
features = ["font-source", "font-fallback", "font-icons", "opengl"] features = ["font-source", "font-fallback", "font-icons", "opengl"]
[dependencies.glow_glyph]
git = "https://github.com/hecrj/glow_glyph"
rev = "8ec7982d9e0ce828769d4ba7abe73b0b0ec22db6"

12
glow/src/quad.rs
View File

@ -48,13 +48,13 @@ impl Pipeline {
let matrix: [f32; 16] = Transformation::identity().into(); let matrix: [f32; 16] = Transformation::identity().into();
gl.uniform_matrix_4_f32_slice( gl.uniform_matrix_4_f32_slice(
Some(&transform_location), Some(transform_location),
false, false,
&matrix, &matrix,
); );
gl.uniform_1_f32(Some(&scale_location), 1.0); gl.uniform_1_f32(Some(scale_location), 1.0);
gl.uniform_1_f32(Some(&screen_height_location), 0.0); gl.uniform_1_f32(Some(screen_height_location), 0.0);
gl.use_program(None); gl.use_program(None);
} }
@ -102,7 +102,7 @@ impl Pipeline {
unsafe { unsafe {
let matrix: [f32; 16] = transformation.into(); let matrix: [f32; 16] = transformation.into();
gl.uniform_matrix_4_f32_slice( gl.uniform_matrix_4_f32_slice(
Some(&self.transform_location), Some(self.transform_location),
false, false,
&matrix, &matrix,
); );
@ -113,7 +113,7 @@ impl Pipeline {
if scale != self.current_scale { if scale != self.current_scale {
unsafe { unsafe {
gl.uniform_1_f32(Some(&self.scale_location), scale); gl.uniform_1_f32(Some(self.scale_location), scale);
} }
self.current_scale = scale; self.current_scale = scale;
@ -122,7 +122,7 @@ impl Pipeline {
if target_height != self.current_target_height { if target_height != self.current_target_height {
unsafe { unsafe {
gl.uniform_1_f32( gl.uniform_1_f32(
Some(&self.screen_height_location), Some(self.screen_height_location),
target_height as f32, target_height as f32,
); );
} }

4
glow/src/triangle.rs
View File

@ -44,7 +44,7 @@ impl Pipeline {
let transform: [f32; 16] = Transformation::identity().into(); let transform: [f32; 16] = Transformation::identity().into();
gl.uniform_matrix_4_f32_slice( gl.uniform_matrix_4_f32_slice(
Some(&transform_location), Some(transform_location),
false, false,
&transform, &transform,
); );
@ -182,7 +182,7 @@ impl Pipeline {
if self.current_transform != transform { if self.current_transform != transform {
let matrix: [f32; 16] = transform.into(); let matrix: [f32; 16] = transform.into();
gl.uniform_matrix_4_f32_slice( gl.uniform_matrix_4_f32_slice(
Some(&self.transform_location), Some(self.transform_location),
false, false,
&matrix, &matrix,
); );