reivilibre
/
glow_glyph_compat
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update `glow` dependency

This commit is contained in:
Héctor Ramón Jiménez 2020-11-10 19:23:10 +01:00
parent 131a45a6e8
commit acde52281e
3 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.toml
View File

@ -11,7 +11,7 @@ documentation = "https://docs.rs/glow_glyph"
readme = "README.md" readme = "README.md"
[dependencies] [dependencies]
glow = "0.5" glow = "0.6"
glyph_brush = "0.7" glyph_brush = "0.7"
log = "0.4" log = "0.4"
bytemuck = "1.4" bytemuck = "1.4"

10
examples/clipping.rs
View File

@ -22,9 +22,11 @@ fn main() -> Result<(), Box<dyn Error>> {
let mut size = context.window().inner_size(); let mut size = context.window().inner_size();
// Initialize OpenGL // Initialize OpenGL
let gl = glow::Context::from_loader_function(|s| { let gl = unsafe {
glow::Context::from_loader_function(|s| {
context.get_proc_address(s) as *const _ context.get_proc_address(s) as *const _
}); })
};
// Prepare glyph_brush // Prepare glyph_brush
let inconsolata = ab_glyph::FontArc::try_from_slice(include_bytes!( let inconsolata = ab_glyph::FontArc::try_from_slice(include_bytes!(
@ -71,7 +73,7 @@ fn main() -> Result<(), Box<dyn Error>> {
screen_position: (30.0, 30.0), screen_position: (30.0, 30.0),
bounds: (size.width as f32, size.height as f32), bounds: (size.width as f32, size.height as f32),
text: vec![Text::default() text: vec![Text::default()
.with_text("Hello wgpu_glyph!") .with_text("Hello glow_glyph!")
.with_color([0.0, 0.0, 0.0, 1.0]) .with_color([0.0, 0.0, 0.0, 1.0])
.with_scale(40.0)], .with_scale(40.0)],
..Section::default() ..Section::default()
@ -85,7 +87,7 @@ fn main() -> Result<(), Box<dyn Error>> {
screen_position: (30.0, 90.0), screen_position: (30.0, 90.0),
bounds: (size.width as f32, size.height as f32), bounds: (size.width as f32, size.height as f32),
text: vec![Text::default() text: vec![Text::default()
.with_text("Hello wgpu_glyph!") .with_text("Hello glow_glyph!")
.with_color([1.0, 1.0, 1.0, 1.0]) .with_color([1.0, 1.0, 1.0, 1.0])
.with_scale(40.0)], .with_scale(40.0)],
..Section::default() ..Section::default()

10
examples/hello.rs
View File

@ -22,9 +22,11 @@ fn main() -> Result<(), Box<dyn Error>> {
let mut size = context.window().inner_size(); let mut size = context.window().inner_size();
// Initialize OpenGL // Initialize OpenGL
let gl = glow::Context::from_loader_function(|s| { let gl = unsafe {
glow::Context::from_loader_function(|s| {
context.get_proc_address(s) as *const _ context.get_proc_address(s) as *const _
}); })
};
// Prepare glyph_brush // Prepare glyph_brush
let inconsolata = ab_glyph::FontArc::try_from_slice(include_bytes!( let inconsolata = ab_glyph::FontArc::try_from_slice(include_bytes!(
@ -77,7 +79,7 @@ fn main() -> Result<(), Box<dyn Error>> {
screen_position: (30.0, 30.0), screen_position: (30.0, 30.0),
bounds: (size.width as f32, size.height as f32), bounds: (size.width as f32, size.height as f32),
text: vec![Text::default() text: vec![Text::default()
.with_text("Hello wgpu_glyph!") .with_text("Hello glow_glyph!")
.with_color([0.0, 0.0, 0.0, 1.0]) .with_color([0.0, 0.0, 0.0, 1.0])
.with_scale(40.0)], .with_scale(40.0)],
..Section::default() ..Section::default()
@ -87,7 +89,7 @@ fn main() -> Result<(), Box<dyn Error>> {
screen_position: (30.0, 90.0), screen_position: (30.0, 90.0),
bounds: (size.width as f32, size.height as f32), bounds: (size.width as f32, size.height as f32),
text: vec![Text::default() text: vec![Text::default()
.with_text("Hello wgpu_glyph!") .with_text("Hello glow_glyph!")
.with_color([1.0, 1.0, 1.0, 1.0]) .with_color([1.0, 1.0, 1.0, 1.0])
.with_scale(40.0)], .with_scale(40.0)],
..Section::default() ..Section::default()