diff options
| author |  Héctor Ramón Jiménez <hector0193@gmail.com> | 2020-03-10 06:12:06 +0100 |
|---|---|---|
| committer | Héctor Ramón Jiménez <hector0193@gmail.com> | 2020-03-10 06:12:06 +0100 |
| commit | e4fbca59b4b9478c9c5fa5eec9ebe31dc93412ad (patch) | |
| tree | 237d2e5dd29c2d0f05f2b68f829425bb480b8ce7 /examples | |
| parent | 6151c528241d0a6ece88e6e664df1b50f8174ecb (diff) | |
| parent | 5a91b52ef4066701d82a897b44a3f90412f210d2 (diff) | |
| download | iced-e4fbca59b4b9478c9c5fa5eec9ebe31dc93412ad.tar.gz iced-e4fbca59b4b9478c9c5fa5eec9ebe31dc93412ad.tar.bz2 iced-e4fbca59b4b9478c9c5fa5eec9ebe31dc93412ad.zip | |
Merge branch 'master' into feature/panes-widget
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/bezier_tool/src/main.rs | 5 | ||||
| -rw-r--r-- | examples/geometry/src/main.rs | 4 | ||||
| -rw-r--r-- | examples/pokedex/Cargo.toml | 14 |
3 files changed, 13 insertions, 10 deletions
diff --git a/examples/bezier_tool/src/main.rs b/examples/bezier_tool/src/main.rs index 023eb0f7..c3fbf276 100644 --- a/examples/bezier_tool/src/main.rs +++ b/examples/bezier_tool/src/main.rs @@ -23,7 +23,6 @@ mod bezier { basic_shapes, BuffersBuilder, StrokeAttributes, StrokeOptions, StrokeTessellator, VertexBuffers, }; - use std::sync::Arc; pub struct Bezier<'a, Message> { state: &'a mut State, @@ -175,10 +174,10 @@ mod bezier { let mesh = Primitive::Mesh2D { origin: Point::new(bounds.x, bounds.y), - buffers: Arc::new(Mesh2D { + buffers: Mesh2D { vertices: buffer.vertices, indices: buffer.indices, - }), + }, }; ( diff --git a/examples/geometry/src/main.rs b/examples/geometry/src/main.rs index 795c6a71..13a687ab 100644 --- a/examples/geometry/src/main.rs +++ b/examples/geometry/src/main.rs @@ -87,7 +87,7 @@ mod rainbow { ( Primitive::Mesh2D { origin: Point::new(b.x, b.y), - buffers: std::sync::Arc::new(Mesh2D { + buffers: Mesh2D { vertices: vec![ Vertex2D { position: posn_center, @@ -136,7 +136,7 @@ mod rainbow { 0, 7, 8, // BL 0, 8, 1, // L ], - }), + }, }, MouseCursor::OutOfBounds, ) diff --git a/examples/pokedex/Cargo.toml b/examples/pokedex/Cargo.toml index c1e3edb5..94320086 100644 --- a/examples/pokedex/Cargo.toml +++ b/examples/pokedex/Cargo.toml @@ -7,12 +7,16 @@ publish = false [dependencies] iced = { path = "../..", features = ["image", "debug", "tokio"] } -serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" -rand = { version = "0.7", features = ["wasm-bindgen"] } + +[dependencies.serde] +version = "1.0" +features = ["derive"] [dependencies.reqwest] -version = "0.10" -git = "https://github.com/hecrj/reqwest.git" -branch = "feature/wasm-deserialize-json" +version = "0.10.2" features = ["json"] + +[dependencies.rand] +version = "0.7" +features = ["wasm-bindgen"] |