Merge branch 'master' into feature/panes-widget

This commit is contained in:
Héctor Ramón Jiménez 2020-03-10 06:12:06 +01:00
commit e4fbca59b4
15 changed files with 231 additions and 94 deletions

View file

@ -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,
}),
},
};
(

View file

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

View file

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