diff options
| author |  Héctor Ramón <hector0193@gmail.com> | 2020-11-11 18:06:27 +0100 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2020-11-11 18:06:27 +0100 |
| commit | 73811c394a39c3816c67bffd2cf7d7a93c8803a9 (patch) | |
| tree | babd079fff2163d147d3d2cec429b17d04a1af9c /graphics | |
| parent | 2f5a3dacd933a52931a1bb169138d52402413956 (diff) | |
| parent | 0400f6716bfb7bcae7d7e464e79e400f3ccc2368 (diff) | |
| download | iced-73811c394a39c3816c67bffd2cf7d7a93c8803a9.tar.gz iced-73811c394a39c3816c67bffd2cf7d7a93c8803a9.tar.bz2 iced-73811c394a39c3816c67bffd2cf7d7a93c8803a9.zip | |
Merge pull request #610 from hecrj/improvement/update-dependencies
Update dependencies
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/Cargo.toml | 11 | ||||
| -rw-r--r-- | graphics/src/triangle.rs | 9 |
2 files changed, 9 insertions, 11 deletions
diff --git a/graphics/Cargo.toml b/graphics/Cargo.toml index dec24c59..1511f8b0 100644 --- a/graphics/Cargo.toml +++ b/graphics/Cargo.toml @@ -12,11 +12,14 @@ font-icons = [] opengl = [] [dependencies] -bytemuck = "1.2" -glam = "0.9" +glam = "0.10" raw-window-handle = "0.3" thiserror = "1.0" +[dependencies.bytemuck] +version = "1.4" +features = ["derive"] + [dependencies.iced_native] version = "0.2" path = "../native" @@ -26,11 +29,11 @@ version = "0.1" path = "../style" [dependencies.lyon] -version = "0.15" +version = "0.16" optional = true [dependencies.font-kit] -version = "0.6" +version = "0.8" optional = true [package.metadata.docs.rs] diff --git a/graphics/src/triangle.rs b/graphics/src/triangle.rs index ce879ffc..eb1494b1 100644 --- a/graphics/src/triangle.rs +++ b/graphics/src/triangle.rs @@ -1,4 +1,5 @@ //! Draw geometry using meshes of triangles. +use bytemuck::{Pod, Zeroable}; /// A set of [`Vertex2D`] and indices representing a list of triangles. /// @@ -16,7 +17,7 @@ pub struct Mesh2D { } /// A two-dimensional vertex with some color in __linear__ RGBA. -#[derive(Copy, Clone, Debug)] +#[derive(Copy, Clone, Debug, Zeroable, Pod)] #[repr(C)] pub struct Vertex2D { /// The vertex position @@ -24,9 +25,3 @@ pub struct Vertex2D { /// The vertex color in __linear__ RGBA. pub color: [f32; 4], } - -#[allow(unsafe_code)] -unsafe impl bytemuck::Zeroable for Vertex2D {} - -#[allow(unsafe_code)] -unsafe impl bytemuck::Pod for Vertex2D {} |