Update all dependencies in the workspace (#323)
This commit is contained in:
Jay Oster
GitHub
parent
0819b8f60c
commit
5c2985f1b6
125
Cargo.lock
generated
125
Cargo.lock
generated
|
|
@ -127,17 +127,6 @@ version = "0.1.8"
|
|||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "73b5e5f48b927f04e952dedc932f31995a65a0bf65ec971c74436e51bf6e970d"
|
||||
|
||||
[[package]]
|
||||
name = "atty"
|
||||
version = "0.2.14"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
|
||||
dependencies = [
|
||||
"hermit-abi",
|
||||
"libc",
|
||||
"winapi",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "autocfg"
|
||||
version = "1.1.0"
|
||||
|
|
@ -258,8 +247,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "cargo-run-wasm"
|
||||
version = "0.1.1"
|
||||
source = "git+https://github.com/rukai/cargo-run-wasm.git?rev=49d53e5eda86aaf66bfb271cb2e7e37cbcf4cfbb#49d53e5eda86aaf66bfb271cb2e7e37cbcf4cfbb"
|
||||
version = "0.2.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "611b811fad83eebfcdcf47ae1e425c82d1249608bc571d537448d706be08cf27"
|
||||
dependencies = [
|
||||
"devserver_lib",
|
||||
"pico-args",
|
||||
|
|
@ -673,12 +663,12 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "env_logger"
|
||||
version = "0.9.3"
|
||||
version = "0.10.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a12e6657c4c97ebab115a42dcee77225f7f482cdd841cf7088c657a42e9e00e7"
|
||||
checksum = "85cdab6a89accf66733ad5a1693a4dcced6aeff64602b634530dd73c1f3ee9f0"
|
||||
dependencies = [
|
||||
"atty",
|
||||
"humantime",
|
||||
"is-terminal",
|
||||
"log",
|
||||
"regex",
|
||||
"termcolor",
|
||||
|
|
@ -700,6 +690,27 @@ dependencies = [
|
|||
"parking_lot",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "errno"
|
||||
version = "0.2.8"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1"
|
||||
dependencies = [
|
||||
"errno-dragonfly",
|
||||
"libc",
|
||||
"winapi",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "errno-dragonfly"
|
||||
version = "0.1.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf"
|
||||
dependencies = [
|
||||
"cc",
|
||||
"libc",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "euclid"
|
||||
version = "0.22.7"
|
||||
|
|
@ -1006,9 +1017,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "gilrs"
|
||||
version = "0.9.0"
|
||||
version = "0.10.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "1d6ba7c37bf8ea7ba0c3e3795dfa1a7771b1e47c4bb417c4d27c7b338d79685f"
|
||||
checksum = "7d0342acdc7b591d171212e17c9350ca02383b86d5f9af33c6e3598e03a6c57e"
|
||||
dependencies = [
|
||||
"fnv",
|
||||
"gilrs-core",
|
||||
|
|
@ -1019,9 +1030,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "gilrs-core"
|
||||
version = "0.4.1"
|
||||
version = "0.5.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "96a8d94a7fc5afd27e894e08a4cfe5a49237f85bcc7140e90721bad3399c7d02"
|
||||
checksum = "6789d356476c3280a4e15365d23f62b4b4f1bcdac81fdd552f65807bce4666dd"
|
||||
dependencies = [
|
||||
"core-foundation",
|
||||
"io-kit-sys",
|
||||
|
|
@ -1029,13 +1040,12 @@ dependencies = [
|
|||
"libc",
|
||||
"libudev-sys",
|
||||
"log",
|
||||
"nix 0.24.3",
|
||||
"rusty-xinput",
|
||||
"nix 0.25.1",
|
||||
"uuid",
|
||||
"vec_map",
|
||||
"wasm-bindgen",
|
||||
"web-sys",
|
||||
"winapi",
|
||||
"windows 0.43.0",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
|
|
@ -1256,9 +1266,9 @@ checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9"
|
|||
|
||||
[[package]]
|
||||
name = "hermit-abi"
|
||||
version = "0.1.19"
|
||||
version = "0.2.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33"
|
||||
checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7"
|
||||
dependencies = [
|
||||
"libc",
|
||||
]
|
||||
|
|
@ -1421,6 +1431,28 @@ dependencies = [
|
|||
"mach",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "io-lifetimes"
|
||||
version = "1.0.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "46112a93252b123d31a119a8d1a1ac19deac4fac6e0e8b0df58f0d4e5870e63c"
|
||||
dependencies = [
|
||||
"libc",
|
||||
"windows-sys 0.42.0",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "is-terminal"
|
||||
version = "0.4.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "927609f78c2913a6f6ac3c27a4fe87f43e2a35367c0c4b0f8265e8f49a104330"
|
||||
dependencies = [
|
||||
"hermit-abi",
|
||||
"io-lifetimes",
|
||||
"rustix",
|
||||
"windows-sys 0.42.0",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "itoa"
|
||||
version = "1.0.5"
|
||||
|
|
@ -1514,6 +1546,12 @@ dependencies = [
|
|||
"num-traits",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "linux-raw-sys"
|
||||
version = "0.1.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4"
|
||||
|
||||
[[package]]
|
||||
name = "lock_api"
|
||||
version = "0.4.9"
|
||||
|
|
@ -2136,8 +2174,9 @@ checksum = "63e935c45e09cc6dcf00d2f0b2d630a58f4095320223d47fc68918722f0538b6"
|
|||
|
||||
[[package]]
|
||||
name = "raqote"
|
||||
version = "0.8.1-alpha.0"
|
||||
source = "git+https://github.com/jrmuizel/raqote.git?rev=dea376474966fe91f0fa3c5115171e0df86bac22#dea376474966fe91f0fa3c5115171e0df86bac22"
|
||||
version = "0.8.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d8d728aa565b374ac3a2109401af5707e941f7189914f5bb64fc416abcbd08ff"
|
||||
dependencies = [
|
||||
"euclid",
|
||||
"lyon_geom",
|
||||
|
|
@ -2246,14 +2285,17 @@ dependencies = [
|
|||
]
|
||||
|
||||
[[package]]
|
||||
name = "rusty-xinput"
|
||||
version = "1.2.0"
|
||||
name = "rustix"
|
||||
version = "0.36.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d2aa654bc32eb9ca14cce1a084abc9dfe43949a4547c35269a094c39272db3bb"
|
||||
checksum = "a3807b5d10909833d3e9acd1eb5fb988f79376ff10fce42937de71a449c4c588"
|
||||
dependencies = [
|
||||
"lazy_static",
|
||||
"log",
|
||||
"winapi",
|
||||
"bitflags",
|
||||
"errno",
|
||||
"io-lifetimes",
|
||||
"libc",
|
||||
"linux-raw-sys",
|
||||
"windows-sys 0.42.0",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
|
|
@ -2538,7 +2580,7 @@ dependencies = [
|
|||
"scopeguard",
|
||||
"unicode-segmentation",
|
||||
"uuid",
|
||||
"windows",
|
||||
"windows 0.39.0",
|
||||
"windows-implement",
|
||||
"x11-dl",
|
||||
]
|
||||
|
|
@ -3267,6 +3309,21 @@ dependencies = [
|
|||
"windows_x86_64_msvc 0.39.0",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "windows"
|
||||
version = "0.43.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "04662ed0e3e5630dfa9b26e4cb823b817f1a9addda855d973a9458c236556244"
|
||||
dependencies = [
|
||||
"windows_aarch64_gnullvm",
|
||||
"windows_aarch64_msvc 0.42.0",
|
||||
"windows_i686_gnu 0.42.0",
|
||||
"windows_i686_msvc 0.42.0",
|
||||
"windows_x86_64_gnu 0.42.0",
|
||||
"windows_x86_64_gnullvm",
|
||||
"windows_x86_64_msvc 0.42.0",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "windows-implement"
|
||||
version = "0.39.0"
|
||||
|
|
|
|||
|
|
@ -10,12 +10,12 @@ optimize = ["log/release_max_level_warn"]
|
|||
default = ["optimize"]
|
||||
|
||||
[dependencies]
|
||||
byteorder = "1.4"
|
||||
env_logger = "0.9"
|
||||
byteorder = "1"
|
||||
env_logger = "0.10"
|
||||
getrandom = "0.2"
|
||||
line_drawing = "1.0"
|
||||
line_drawing = "1"
|
||||
log = "0.4"
|
||||
pixels = { path = "../.." }
|
||||
randomize = "3.0"
|
||||
randomize = "3"
|
||||
winit = "0.27"
|
||||
winit_input_helper = "0.13"
|
||||
|
|
|
|||
|
|
@ -10,8 +10,8 @@ optimize = ["log/release_max_level_warn"]
|
|||
default = ["optimize"]
|
||||
|
||||
[dependencies]
|
||||
bytemuck = "1.10"
|
||||
env_logger = "0.9"
|
||||
bytemuck = "1"
|
||||
env_logger = "0.10"
|
||||
log = "0.4"
|
||||
pixels = { path = "../.." }
|
||||
winit = "0.27"
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ optimize = ["log/release_max_level_warn"]
|
|||
default = ["optimize"]
|
||||
|
||||
[dependencies]
|
||||
env_logger = "0.9"
|
||||
env_logger = "0.10"
|
||||
imgui = "0.9"
|
||||
imgui-wgpu = "0.21"
|
||||
imgui-winit-support = "0.9"
|
||||
|
|
|
|||
|
|
@ -10,11 +10,11 @@ optimize = ["log/release_max_level_warn"]
|
|||
default = ["optimize"]
|
||||
|
||||
[dependencies]
|
||||
byteorder = "1.3"
|
||||
env_logger = "0.9"
|
||||
byteorder = "1"
|
||||
env_logger = "0.10"
|
||||
game-loop = { version = "0.10", features = ["winit"] }
|
||||
getrandom = "0.2"
|
||||
gilrs = "0.9"
|
||||
gilrs = "0.10"
|
||||
log = "0.4"
|
||||
pixels = { path = "../.." }
|
||||
randomize = "3.0"
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ default = ["optimize"]
|
|||
egui = "0.20"
|
||||
egui-wgpu = "0.20"
|
||||
egui-winit = { version = "0.20", default-features = false, features = ["links"] }
|
||||
env_logger = "0.9"
|
||||
env_logger = "0.10"
|
||||
log = "0.4"
|
||||
pixels = { path = "../.." }
|
||||
winit = "0.27"
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ optimize = ["log/release_max_level_warn"]
|
|||
default = ["optimize"]
|
||||
|
||||
[dependencies]
|
||||
fltk = { version = "1.3.17", features = ["rwh05", "no-images", "no-pango"] }
|
||||
env_logger = "0.9"
|
||||
fltk = { version = "1", features = ["rwh05", "no-images", "no-pango"] }
|
||||
env_logger = "0.10"
|
||||
log = "0.4"
|
||||
pixels = { path = "../.." }
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ optimize = ["log/release_max_level_warn"]
|
|||
default = ["optimize"]
|
||||
|
||||
[dependencies]
|
||||
env_logger = "0.9"
|
||||
env_logger = "0.10"
|
||||
log = "0.4"
|
||||
pixels = { path = "../.." }
|
||||
tao = "0.15"
|
||||
|
|
|
|||
|
|
@ -23,5 +23,5 @@ wasm-bindgen-futures = "0.4"
|
|||
web-sys = { version = "0.3", features = ["GpuTextureFormat"] }
|
||||
|
||||
[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
|
||||
env_logger = "0.9"
|
||||
env_logger = "0.10"
|
||||
pollster = "0.2"
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ optimize = ["log/release_max_level_warn"]
|
|||
default = ["optimize"]
|
||||
|
||||
[dependencies]
|
||||
env_logger = "0.9"
|
||||
env_logger = "0.10"
|
||||
log = "0.4"
|
||||
pixels = { path = "../.." }
|
||||
winit = "0.27"
|
||||
|
|
|
|||
|
|
@ -10,14 +10,10 @@ optimize = ["log/release_max_level_warn"]
|
|||
default = ["optimize"]
|
||||
|
||||
[dependencies]
|
||||
env_logger = "0.9"
|
||||
env_logger = "0.10"
|
||||
euclid = "0.22"
|
||||
log = "0.4"
|
||||
pixels = { path = "../.." }
|
||||
raqote = { version = "0.8", default-features = false }
|
||||
winit = "0.27"
|
||||
winit_input_helper = "0.13"
|
||||
|
||||
[dependencies.raqote]
|
||||
git = "https://github.com/jrmuizel/raqote.git"
|
||||
rev = "dea376474966fe91f0fa3c5115171e0df86bac22"
|
||||
default-features = false
|
||||
|
|
|
|||
|
|
@ -10,10 +10,10 @@ optimize = ["log/release_max_level_warn"]
|
|||
default = ["optimize"]
|
||||
|
||||
[dependencies]
|
||||
env_logger = "0.9"
|
||||
env_logger = "0.10"
|
||||
euclid = "0.22"
|
||||
log = "0.4"
|
||||
pixels = { path = "../.." }
|
||||
winit = "0.27"
|
||||
winit_input_helper = "0.13"
|
||||
tiny-skia = "0.8.2"
|
||||
tiny-skia = "0.8"
|
||||
|
|
|
|||
|
|
@ -3,7 +3,6 @@
|
|||
|
||||
use log::error;
|
||||
use pixels::{Error, Pixels, SurfaceTexture};
|
||||
use shape::draw;
|
||||
use std::time::Instant;
|
||||
use tiny_skia::Pixmap;
|
||||
use winit::dpi::LogicalSize;
|
||||
|
|
@ -14,8 +13,8 @@ use winit_input_helper::WinitInputHelper;
|
|||
|
||||
mod shape;
|
||||
|
||||
const WIDTH: u32 = 1000;
|
||||
const HEIGHT: u32 = 1000;
|
||||
const WIDTH: u32 = 500;
|
||||
const HEIGHT: u32 = 500;
|
||||
|
||||
fn main() -> Result<(), Error> {
|
||||
env_logger::init();
|
||||
|
|
@ -34,10 +33,11 @@ fn main() -> Result<(), Error> {
|
|||
let mut pixels = {
|
||||
let window_size = window.inner_size();
|
||||
let surface_texture = SurfaceTexture::new(window_size.width, window_size.height, &window);
|
||||
|
||||
Pixels::new(WIDTH, HEIGHT, surface_texture)?
|
||||
};
|
||||
|
||||
let mut drawing = Pixmap::new(1000, 1000).unwrap();
|
||||
let mut drawing = Pixmap::new(WIDTH, HEIGHT).unwrap();
|
||||
let now = Instant::now();
|
||||
|
||||
event_loop.run(move |event, _, control_flow| {
|
||||
|
|
@ -68,8 +68,7 @@ fn main() -> Result<(), Error> {
|
|||
}
|
||||
|
||||
// Update internal state and request a redraw
|
||||
// shapes.draw(now.elapsed().as_secs_f32());
|
||||
draw(&mut drawing, now.elapsed().as_secs_f32());
|
||||
shape::draw(&mut drawing, now.elapsed().as_secs_f32());
|
||||
window.request_redraw();
|
||||
}
|
||||
});
|
||||
|
|
|
|||
|
|
@ -21,14 +21,14 @@ pub fn draw(pixmap: &mut Pixmap, delta: f32) {
|
|||
paint5.set_color_rgba8(20, 205, 25, 205);
|
||||
paint5.anti_alias = true;
|
||||
|
||||
let path1 = PathBuilder::from_circle(400.0, 400.0, 300.0).unwrap();
|
||||
let path1 = PathBuilder::from_circle(200.0, 200.0, 150.0).unwrap();
|
||||
|
||||
let path2 = {
|
||||
let mut pb = PathBuilder::new();
|
||||
pb.move_to(940.0, 60.0);
|
||||
pb.line_to(840.0, 940.0);
|
||||
pb.cubic_to(620.0, 840.0, 340.0, 800.0, 60.0, 800.0);
|
||||
pb.cubic_to(260.0, 460.0, 560.0, 160.0, 940.0, 60.0);
|
||||
pb.move_to(470.0, 30.0);
|
||||
pb.line_to(420.0, 470.0);
|
||||
pb.cubic_to(310.0, 420.0, 170.0, 400.0, 30.0, 400.0);
|
||||
pb.cubic_to(130.0, 230.0, 280.0, 80.0, 470.0, 30.0);
|
||||
pb.close();
|
||||
pb.finish().unwrap()
|
||||
};
|
||||
|
|
@ -39,25 +39,25 @@ pub fn draw(pixmap: &mut Pixmap, delta: f32) {
|
|||
&path1,
|
||||
&paint1,
|
||||
FillRule::Winding,
|
||||
Transform::from_rotate_at(delta * 15.0, 500.0, 500.0),
|
||||
Transform::from_rotate_at(delta * 15.0, 250.0, 250.0),
|
||||
None,
|
||||
);
|
||||
|
||||
stroke.width = 4.0;
|
||||
stroke.width = 2.0;
|
||||
pixmap.stroke_path(
|
||||
&path1,
|
||||
&paint5,
|
||||
&stroke,
|
||||
Transform::from_rotate_at(delta * 15.0, 500.0, 500.0),
|
||||
Transform::from_rotate_at(delta * 15.0, 250.0, 250.0),
|
||||
None,
|
||||
);
|
||||
|
||||
stroke.width = 48.0;
|
||||
stroke.width = 24.0;
|
||||
pixmap.stroke_path(
|
||||
&path1,
|
||||
&paint4,
|
||||
&stroke,
|
||||
Transform::from_rotate_at(-delta * 25.0, 500.0, 500.0).post_scale(0.75, 0.75),
|
||||
Transform::from_rotate_at(-delta * 25.0, 250.0, 250.0).post_scale(0.75, 0.75),
|
||||
None,
|
||||
);
|
||||
|
||||
|
|
@ -68,6 +68,6 @@ pub fn draw(pixmap: &mut Pixmap, delta: f32) {
|
|||
Transform::identity(),
|
||||
None,
|
||||
);
|
||||
stroke.width = 8.0;
|
||||
stroke.width = 4.0;
|
||||
pixmap.stroke_path(&path2, &paint3, &stroke, Transform::identity(), None);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,6 +3,5 @@ name = "run-wasm"
|
|||
version = "0.1.0"
|
||||
edition = "2021"
|
||||
|
||||
[dependencies.cargo-run-wasm]
|
||||
git = "https://github.com/rukai/cargo-run-wasm.git"
|
||||
rev = "49d53e5eda86aaf66bfb271cb2e7e37cbcf4cfbb"
|
||||
[dependencies]
|
||||
cargo-run-wasm = "0.2"
|
||||
|
|
|
|||
Loading…
Reference in a new issue