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

Update dependencies

CHANGELOG.md

@@ -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

Cargo.toml

@@ -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"
+glutin = "0.25"
-env_logger = "0.7"
+env_logger = "0.8"

examples/clipping.rs

@@ -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| {
+    let gl = unsafe {
-        context.get_proc_address(s) as *const _
+        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()

examples/hello.rs

@@ -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| {
+    let gl = unsafe {
-        context.get_proc_address(s) as *const _
+        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()