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

Merge pull request #3 from hecrj/improvement/update-dependencies 

Update dependencies
This commit is contained in:
Héctor Ramón 2020-11-10 19:38:08 +01:00 committed by GitHub
parent 88aa675037 77c6672861
commit ff79441235
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 27 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
CHANGELOG.md
View File

@ -6,6 +6,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
## [Unreleased]
## [0.4.0] - 2020-11-10
### Changed
- `glow` updated to `0.6`. [#3]
- `bytemuck` updated to `1.4`. [#3]
[#3]: https://github.com/hecrj/glow_glyph/pull/3
## [0.3.0] - 2020-07-27
### Changed
- `glow` updated to `0.5`. [#2]
@ -29,7 +36,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- First release! :tada:
[Unreleased]: https://github.com/hecrj/glow_glyph/compare/0.3.0...HEAD
[Unreleased]: https://github.com/hecrj/glow_glyph/compare/0.4.0...HEAD
[0.4.0]: https://github.com/hecrj/glow_glyph/compare/0.3.0...0.4.0
[0.3.0]: https://github.com/hecrj/glow_glyph/compare/0.2.1...0.3.0
[0.2.1]: https://github.com/hecrj/glow_glyph/compare/0.2.0...0.2.1
[0.2.0]: https://github.com/hecrj/glow_glyph/compare/0.1.0...0.2.0

8
Cargo.toml
View File

@ -11,11 +11,11 @@ documentation = "https://docs.rs/glow_glyph"
readme = "README.md"
[dependencies]
glow = "0.5"
glow = "0.6"
glyph_brush = "0.7"
log = "0.4"
bytemuck = "1.2"
bytemuck = "1.4"
[dev-dependencies]
glutin = "0.24"
env_logger = "0.7"
glutin = "0.25"
env_logger = "0.8"

12
examples/clipping.rs
View File

@ -22,9 +22,11 @@ fn main() -> Result<(), Box<dyn Error>> {
let mut size = context.window().inner_size();
// Initialize OpenGL
let gl = glow::Context::from_loader_function(|s| {
context.get_proc_address(s) as *const _
});
let gl = unsafe {
glow::Context::from_loader_function(|s| {
context.get_proc_address(s) as *const _
})
};
// Prepare glyph_brush
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),
bounds: (size.width as f32, size.height as f32),
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_scale(40.0)],
..Section::default()
@ -85,7 +87,7 @@ fn main() -> Result<(), Box<dyn Error>> {
screen_position: (30.0, 90.0),
bounds: (size.width as f32, size.height as f32),
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_scale(40.0)],
..Section::default()

12
examples/hello.rs
View File

@ -22,9 +22,11 @@ fn main() -> Result<(), Box<dyn Error>> {
let mut size = context.window().inner_size();
// Initialize OpenGL
let gl = glow::Context::from_loader_function(|s| {
context.get_proc_address(s) as *const _
});
let gl = unsafe {
glow::Context::from_loader_function(|s| {
context.get_proc_address(s) as *const _
})
};
// Prepare glyph_brush
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),
bounds: (size.width as f32, size.height as f32),
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_scale(40.0)],
..Section::default()
@ -87,7 +89,7 @@ fn main() -> Result<(), Box<dyn Error>> {
screen_position: (30.0, 90.0),
bounds: (size.width as f32, size.height as f32),
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_scale(40.0)],
..Section::default()