Archives
/
learn-wgpu
mirror of https://github.com/sotrh/learn-wgpu
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cleaning up and fixing snow

Browse Source
0.19
Benjamin Hansen 3 months ago
parent 12f115dfa1
commit 7c290e7436
25 changed files with 103 additions and 432 deletions
Show Stats Download Patch File Download Diff File

470
Cargo.lock generated
Unescape Escape View File

@ -61,24 +61,6 @@ dependencies = [
name = "alignment"
version = "0.1.0"
[[package]]
name = "android-activity"
version = "0.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7c77a0045eda8b888c76ea473c2b0515ba6f471d318f8927c5c72240937035a6"
dependencies = [
"android-properties",
"bitflags 1.3.2",
"cc",
"jni-sys",
"libc",
"log",
"ndk 0.7.0",
"ndk-context",
"ndk-sys 0.4.0",
"num_enum 0.5.7",
]
[[package]]
name = "android-activity"
version = "0.5.1"
@ -93,10 +75,10 @@ dependencies = [
"jni-sys",
"libc",
"log",
"ndk 0.8.0",
"ndk",
"ndk-context",
"ndk-sys 0.5.0+25.2.9519653",
"num_enum 0.7.2",
"ndk-sys",
"num_enum",
"thiserror",
]
@ -334,32 +316,13 @@ version = "0.1.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a"
[[package]]
name = "block-sys"
version = "0.1.0-beta.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0fa55741ee90902547802152aaf3f8e5248aab7e21468089560d4c8840561146"
dependencies = [
"objc-sys 0.2.0-beta.2",
]
[[package]]
name = "block-sys"
version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ae85a0696e7ea3b835a453750bf002770776609115e6d25c6d2ff28a8200f7e7"
dependencies = [
"objc-sys 0.3.2",
]
[[package]]
name = "block2"
version = "0.2.0-alpha.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8dd9e63c1744f755c2f60332b88de39d341e5e86239014ad839bd71c106dec42"
dependencies = [
"block-sys 0.1.0-beta.1",
"objc2-encode 2.0.0-pre.2",
"objc-sys",
]
[[package]]
@ -368,8 +331,8 @@ version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "15b55663a85f33501257357e6421bb33e769d5c9ffb5ba0921c975a123e35e68"
dependencies = [
"block-sys 0.2.1",
"objc2 0.4.1",
"block-sys",
"objc2",
]
[[package]]
@ -430,19 +393,6 @@ version = "1.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c1db59621ec70f09c5e9b597b220c7a2b43611f4710dc03ceb8748637775692c"
[[package]]
name = "calloop"
version = "0.10.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a22a6a8f622f797120d452c630b0ab12e1331a1a753e2039ce7868d4ac77b4ee"
dependencies = [
"log",
"nix 0.24.2",
"slotmap",
"thiserror",
"vec_map",
]
[[package]]
name = "calloop"
version = "0.12.4"
@ -463,10 +413,10 @@ version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0f0ea9b9476c7fad82841a8dbb380e2eae480c21910feba80725b46931ed8f02"
dependencies = [
"calloop 0.12.4",
"calloop",
"rustix 0.38.30",
"wayland-backend",
"wayland-client 0.31.1",
"wayland-client",
]
[[package]]
@ -612,7 +562,7 @@ dependencies = [
"rayon",
"tobj 2.0.4",
"wgpu",
"winit 0.29.10",
"winit",
]
[[package]]
@ -669,19 +619,6 @@ version = "0.8.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc"
[[package]]
name = "core-graphics"
version = "0.22.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2581bbab3b8ffc6fcbd550bf46c355135d16e9ff2a6ea032ad6b9bf1d7efe4fb"
dependencies = [
"bitflags 1.3.2",
"core-foundation",
"core-graphics-types",
"foreign-types 0.3.2",
"libc",
]
[[package]]
name = "core-graphics"
version = "0.23.1"
@ -1048,7 +985,7 @@ dependencies = [
"tobj 2.0.4",
"wgpu",
"wgpu-subscriber",
"winit 0.29.10",
"winit",
]
[[package]]
@ -1177,7 +1114,7 @@ dependencies = [
"pollster",
"tobj 3.2.3",
"wgpu",
"winit 0.29.10",
"winit",
]
[[package]]
@ -1500,9 +1437,9 @@ version = "0.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "99d3aaff8a54577104bafdf686ff18565c3b6903ca5782a2026ef06e2c7aa319"
dependencies = [
"block2 0.3.0",
"block2",
"dispatch",
"objc2 0.4.1",
"objc2",
]
[[package]]
@ -1567,9 +1504,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c"
dependencies = [
"cfg-if",
"js-sys",
"wasm-bindgen",
"web-sys",
]
[[package]]
@ -1773,7 +1707,7 @@ dependencies = [
"anyhow",
"pollster",
"wgpu",
"winit 0.29.10",
"winit",
]
[[package]]
@ -1800,15 +1734,6 @@ version = "2.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
[[package]]
name = "memmap2"
version = "0.5.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "83faa42c0a078c393f6b29d5db232d8be22776a891f8f56e5284faee4a20b327"
dependencies = [
"libc",
]
[[package]]
name = "memmap2"
version = "0.9.3"
@ -1916,7 +1841,7 @@ dependencies = [
"wasm-bindgen-futures",
"web-sys",
"wgpu",
"winit 0.29.10",
"winit",
]
[[package]]
@ -1985,20 +1910,6 @@ dependencies = [
"tempfile",
]
[[package]]
name = "ndk"
version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "451422b7e4718271c8b5b3aadf5adedba43dc76312454b387e98fae0fc951aa0"
dependencies = [
"bitflags 1.3.2",
"jni-sys",
"ndk-sys 0.4.0",
"num_enum 0.5.7",
"raw-window-handle 0.5.2",
"thiserror",
]
[[package]]
name = "ndk"
version = "0.8.0"
@ -2008,8 +1919,8 @@ dependencies = [
"bitflags 2.4.2",
"jni-sys",
"log",
"ndk-sys 0.5.0+25.2.9519653",
"num_enum 0.7.2",
"ndk-sys",
"num_enum",
"raw-window-handle 0.5.2",
"raw-window-handle 0.6.0",
"thiserror",
@ -2021,15 +1932,6 @@ version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b"
[[package]]
name = "ndk-sys"
version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "21d83ec9c63ec5bf950200a8e508bdad6659972187b625469f58ef8c08e29046"
dependencies = [
"jni-sys",
]
[[package]]
name = "ndk-sys"
version = "0.5.0+25.2.9519653"
@ -2039,18 +1941,6 @@ dependencies = [
"jni-sys",
]
[[package]]
name = "nix"
version = "0.24.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "195cdbc1741b8134346d515b3a56a1c94b0912758009cfd53f99ea0f57b065fc"
dependencies = [
"bitflags 1.3.2",
"cfg-if",
"libc",
"memoffset 0.6.5",
]
[[package]]
name = "nix"
version = "0.26.4"
@ -2113,34 +2003,13 @@ dependencies = [
"libc",
]
[[package]]
name = "num_enum"
version = "0.5.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cf5395665662ef45796a4ff5486c5d41d29e0c09640af4c5f17fd94ee2c119c9"
dependencies = [
"num_enum_derive 0.5.7",
]
[[package]]
name = "num_enum"
version = "0.7.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "02339744ee7253741199f897151b38e72257d13802d4ee837285cc2990a90845"
dependencies = [
"num_enum_derive 0.7.2",
]
[[package]]
name = "num_enum_derive"
version = "0.5.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3b0498641e53dd6ac1a4f22547548caa6864cc4933784319cd1775271c5a46ce"
dependencies = [
"proc-macro-crate",
"proc-macro2",
"quote",
"syn 1.0.102",
"num_enum_derive",
]
[[package]]
@ -2165,46 +2034,20 @@ dependencies = [
"objc_exception",
]
[[package]]
name = "objc-sys"
version = "0.2.0-beta.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "df3b9834c1e95694a05a828b59f55fa2afec6288359cda67146126b3f90a55d7"
[[package]]
name = "objc-sys"
version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c7c71324e4180d0899963fc83d9d241ac39e699609fc1025a850aadac8257459"
[[package]]
name = "objc2"
version = "0.3.0-beta.3.patch-leaks.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7e01640f9f2cb1220bbe80325e179e532cb3379ebcd1bf2279d703c19fe3a468"
dependencies = [
"block2 0.2.0-alpha.6",
"objc-sys 0.2.0-beta.2",
"objc2-encode 2.0.0-pre.2",
]
[[package]]
name = "objc2"
version = "0.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "559c5a40fdd30eb5e344fbceacf7595a81e242529fb4e21cf5f43fb4f11ff98d"
dependencies = [
"objc-sys 0.3.2",
"objc2-encode 3.0.0",
]
[[package]]
name = "objc2-encode"
version = "2.0.0-pre.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "abfcac41015b00a120608fdaa6938c44cb983fee294351cc4bac7638b4e50512"
dependencies = [
"objc-sys 0.2.0-beta.2",
"objc-sys",
"objc2-encode",
]
[[package]]
@ -2769,19 +2612,6 @@ version = "1.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9c8132065adcfd6e02db789d9285a0deb2f3fcb04002865ab67d5fb103533898"
[[package]]
name = "sctk-adwaita"
version = "0.5.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cda4e97be1fd174ccc2aae81c8b694e803fa99b34e8fd0f057a9d70698e3ed09"
dependencies = [
"ab_glyph",
"log",
"memmap2 0.5.10",
"smithay-client-toolkit 0.16.0",
"tiny-skia 0.8.4",
]
[[package]]
name = "sctk-adwaita"
version = "0.8.1"
@ -2790,9 +2620,9 @@ checksum = "82b2eaf3a5b264a521b988b2e73042e742df700c4f962cde845d1541adb46550"
dependencies = [
"ab_glyph",
"log",
"memmap2 0.9.3",
"smithay-client-toolkit 0.18.0",
"tiny-skia 0.11.3",
"memmap2",
"smithay-client-toolkit",
"tiny-skia",
]
[[package]]
@ -2915,25 +2745,6 @@ version = "1.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0"
[[package]]
name = "smithay-client-toolkit"
version = "0.16.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f307c47d32d2715eb2e0ece5589057820e0e5e70d07c247d1063e844e107f454"
dependencies = [
"bitflags 1.3.2",
"calloop 0.10.1",
"dlib",
"lazy_static",
"log",
"memmap2 0.5.10",
"nix 0.24.2",
"pkg-config",
"wayland-client 0.29.5",
"wayland-cursor 0.29.5",
"wayland-protocols 0.29.5",
]
[[package]]
name = "smithay-client-toolkit"
version = "0.18.0"
@ -2941,21 +2752,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "60e3d9941fa3bacf7c2bf4b065304faa14164151254cd16ce1b1bc8fc381600f"
dependencies = [
"bitflags 2.4.2",
"calloop 0.12.4",
"calloop",
"calloop-wayland-source",
"cursor-icon",
"libc",
"log",
"memmap2 0.9.3",
"memmap2",
"rustix 0.38.30",
"thiserror",
"wayland-backend",
"wayland-client 0.31.1",
"wayland-client",
"wayland-csd-frame",
"wayland-cursor 0.31.0",
"wayland-protocols 0.31.0",
"wayland-cursor",
"wayland-protocols",
"wayland-protocols-wlr",
"wayland-scanner 0.31.0",
"wayland-scanner",
"xkeysym",
]
@ -2978,7 +2789,7 @@ dependencies = [
"glam",
"pollster",
"wgpu",
"winit 0.28.6",
"winit",
]
[[package]]
@ -3147,7 +2958,7 @@ dependencies = [
"wasm-bindgen-futures",
"web-sys",
"wgpu",
"winit 0.29.10",
"winit",
]
[[package]]
@ -3170,20 +2981,6 @@ dependencies = [
"weezl",
]
[[package]]
name = "tiny-skia"
version = "0.8.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "df8493a203431061e901613751931f047d1971337153f96d0e5e363d6dbf6a67"
dependencies = [
"arrayref",
"arrayvec",
"bytemuck",
"cfg-if",
"png",
"tiny-skia-path 0.8.4",
]
[[package]]
name = "tiny-skia"
version = "0.11.3"
@ -3195,18 +2992,7 @@ dependencies = [
"bytemuck",
"cfg-if",
"log",
"tiny-skia-path 0.11.3",
]
[[package]]
name = "tiny-skia-path"
version = "0.8.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "adbfb5d3f3dd57a0e11d12f4f13d4ebbbc1b5c15b7ab0a156d030b21da5f677c"
dependencies = [
"arrayref",
"bytemuck",
"strict-num",
"tiny-skia-path",
]
[[package]]
@ -3395,7 +3181,7 @@ dependencies = [
"wasm-bindgen-futures",
"web-sys",
"wgpu",
"winit 0.29.10",
"winit",
]
[[package]]
@ -3420,7 +3206,7 @@ dependencies = [
"wasm-bindgen-futures",
"web-sys",
"wgpu",
"winit 0.29.10",
"winit",
]
[[package]]
@ -3445,7 +3231,7 @@ dependencies = [
"wasm-bindgen-futures",
"web-sys",
"wgpu",
"winit 0.29.10",
"winit",
]
[[package]]
@ -3471,7 +3257,7 @@ dependencies = [
"wasm-bindgen-futures",
"web-sys",
"wgpu",
"winit 0.29.10",
"winit",
]
[[package]]
@ -3497,7 +3283,7 @@ dependencies = [
"wasm-bindgen-futures",
"web-sys",
"wgpu",
"winit 0.29.10",
"winit",
]
[[package]]
@ -3523,7 +3309,7 @@ dependencies = [
"wasm-bindgen-futures",
"web-sys",
"wgpu",
"winit 0.29.10",
"winit",
]
[[package]]
@ -3540,7 +3326,7 @@ dependencies = [
"wasm-bindgen-futures",
"web-sys",
"wgpu",
"winit 0.29.10",
"winit",
]
[[package]]
@ -3557,7 +3343,7 @@ dependencies = [
"wasm-bindgen-futures",
"web-sys",
"wgpu",
"winit 0.29.10",
"winit",
]
[[package]]
@ -3578,7 +3364,7 @@ dependencies = [
"wasm-bindgen-futures",
"web-sys",
"wgpu",
"winit 0.29.10",
"winit",
]
[[package]]
@ -3600,7 +3386,7 @@ dependencies = [
"wasm-bindgen-futures",
"web-sys",
"wgpu",
"winit 0.29.10",
"winit",
]
[[package]]
@ -3623,7 +3409,7 @@ dependencies = [
"wasm-bindgen-futures",
"web-sys",
"wgpu",
"winit 0.29.10",
"winit",
]
[[package]]
@ -3646,7 +3432,7 @@ dependencies = [
"wasm-bindgen-futures",
"web-sys",
"wgpu",
"winit 0.29.10",
"winit",
]
[[package]]
@ -3669,7 +3455,7 @@ dependencies = [
"wasm-bindgen-futures",
"web-sys",
"wgpu",
"winit 0.29.10",
"winit",
]
[[package]]
@ -3694,7 +3480,7 @@ dependencies = [
"wasm-bindgen-futures",
"web-sys",
"wgpu",
"winit 0.29.10",
"winit",
]
[[package]]
@ -3769,12 +3555,6 @@ version = "0.2.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
[[package]]
name = "vec_map"
version = "0.8.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191"
[[package]]
name = "version_check"
version = "0.9.4"
@ -4018,26 +3798,10 @@ checksum = "19152ddd73f45f024ed4534d9ca2594e0ef252c1847695255dae47f34df9fbe4"
dependencies = [
"cc",
"downcast-rs",
"nix 0.26.4",
"nix",
"scoped-tls",
"smallvec",
"wayland-sys 0.31.1",
]
[[package]]
name = "wayland-client"
version = "0.29.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3f3b068c05a039c9f755f881dc50f01732214f5685e379829759088967c46715"
dependencies = [
"bitflags 1.3.2",
"downcast-rs",
"libc",
"nix 0.24.2",
"scoped-tls",
"wayland-commons",
"wayland-scanner 0.29.5",
"wayland-sys 0.29.5",
"wayland-sys",
]
[[package]]
@ -4047,21 +3811,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1ca7d52347346f5473bf2f56705f360e8440873052e575e55890c4fa57843ed3"
dependencies = [
"bitflags 2.4.2",
"nix 0.26.4",
"nix",
"wayland-backend",
"wayland-scanner 0.31.0",
]
[[package]]
name = "wayland-commons"
version = "0.29.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8691f134d584a33a6606d9d717b95c4fa20065605f798a3f350d78dced02a902"
dependencies = [
"nix 0.24.2",
"once_cell",
"smallvec",
"wayland-sys 0.29.5",
"wayland-scanner",
]
[[package]]
@ -4075,40 +3827,17 @@ dependencies = [
"wayland-backend",
]
[[package]]
name = "wayland-cursor"
version = "0.29.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6865c6b66f13d6257bef1cd40cbfe8ef2f150fb8ebbdb1e8e873455931377661"
dependencies = [
"nix 0.24.2",
"wayland-client 0.29.5",
"xcursor",
]
[[package]]
name = "wayland-cursor"
version = "0.31.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a44aa20ae986659d6c77d64d808a046996a932aa763913864dc40c359ef7ad5b"
dependencies = [
"nix 0.26.4",
"wayland-client 0.31.1",
"nix",
"wayland-client",
"xcursor",
]
[[package]]
name = "wayland-protocols"
version = "0.29.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b950621f9354b322ee817a23474e479b34be96c2e909c14f7bc0100e9a970bc6"
dependencies = [
"bitflags 1.3.2",
"wayland-client 0.29.5",
"wayland-commons",
"wayland-scanner 0.29.5",
]
[[package]]
name = "wayland-protocols"
version = "0.31.0"
@ -4117,8 +3846,8 @@ checksum = "e253d7107ba913923dc253967f35e8561a3c65f914543e46843c88ddd729e21c"
dependencies = [
"bitflags 2.4.2",
"wayland-backend",
"wayland-client 0.31.1",
"wayland-scanner 0.31.0",
"wayland-client",
"wayland-scanner",
]
[[package]]
@ -4129,9 +3858,9 @@ checksum = "23803551115ff9ea9bce586860c5c5a971e360825a0309264102a9495a5ff479"
dependencies = [
"bitflags 2.4.2",
"wayland-backend",
"wayland-client 0.31.1",
"wayland-protocols 0.31.0",
"wayland-scanner 0.31.0",
"wayland-client",
"wayland-protocols",
"wayland-scanner",
]
[[package]]
@ -4142,20 +3871,9 @@ checksum = "ad1f61b76b6c2d8742e10f9ba5c3737f6530b4c243132c2a2ccc8aa96fe25cd6"
dependencies = [
"bitflags 2.4.2",
"wayland-backend",
"wayland-client 0.31.1",
"wayland-protocols 0.31.0",
"wayland-scanner 0.31.0",
]
[[package]]
name = "wayland-scanner"
version = "0.29.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8f4303d8fa22ab852f789e75a967f0a2cdc430a607751c0499bada3e451cbd53"
dependencies = [
"proc-macro2",
"quote",
"xml-rs",
"wayland-client",
"wayland-protocols",
"wayland-scanner",
]
[[package]]
@ -4169,17 +3887,6 @@ dependencies = [
"quote",
]
[[package]]
name = "wayland-sys"
version = "0.29.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "be12ce1a3c39ec7dba25594b97b42cb3195d54953ddb9d3d95a7c3902bc6e9d4"
dependencies = [
"dlib",
"lazy_static",
"pkg-config",
]
[[package]]
name = "wayland-sys"
version = "0.31.1"
@ -4669,41 +4376,6 @@ version = "0.52.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04"
[[package]]
name = "winit"
version = "0.28.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "866db3f712fffba75d31bf0cdecf357c8aeafd158c5b7ab51dba2a2b2d47f196"
dependencies = [
"android-activity 0.4.1",
"bitflags 1.3.2",
"cfg_aliases",
"core-foundation",
"core-graphics 0.22.3",
"dispatch",
"instant",
"libc",
"log",
"mio",
"ndk 0.7.0",
"objc2 0.3.0-beta.3.patch-leaks.3",
"once_cell",
"orbclient",
"percent-encoding",
"raw-window-handle 0.5.2",
"redox_syscall 0.3.5",
"sctk-adwaita 0.5.4",
"smithay-client-toolkit 0.16.0",
"wasm-bindgen",
"wayland-client 0.29.5",
"wayland-commons",
"wayland-protocols 0.29.5",
"wayland-scanner 0.29.5",
"web-sys",
"windows-sys 0.45.0",
"x11-dl",
]
[[package]]
name = "winit"
version = "0.29.10"
@ -4711,23 +4383,23 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4c824f11941eeae66ec71111cc2674373c772f482b58939bb4066b642aa2ffcf"
dependencies = [
"ahash 0.8.7",
"android-activity 0.5.1",
"android-activity",
"atomic-waker",
"bitflags 2.4.2",
"bytemuck",
"calloop 0.12.4",
"calloop",
"cfg_aliases",
"core-foundation",
"core-graphics 0.23.1",
"core-graphics",
"cursor-icon",
"icrate",
"js-sys",
"libc",
"log",
"memmap2 0.9.3",
"ndk 0.8.0",
"ndk-sys 0.5.0+25.2.9519653",
"objc2 0.4.1",
"memmap2",
"ndk",
"ndk-sys",
"objc2",
"once_cell",
"orbclient",
"percent-encoding",
@ -4735,15 +4407,15 @@ dependencies = [
"raw-window-handle 0.6.0",
"redox_syscall 0.3.5",
"rustix 0.38.30",
"sctk-adwaita 0.8.1",
"smithay-client-toolkit 0.18.0",
"sctk-adwaita",
"smithay-client-toolkit",
"smol_str",
"unicode-segmentation",
"wasm-bindgen",
"wasm-bindgen-futures",
"wayland-backend",
"wayland-client 0.31.1",
"wayland-protocols 0.31.0",
"wayland-client",
"wayland-protocols",
"wayland-protocols-plasma",
"web-sys",
"web-time",

1
code/beginner/tutorial2-surface/src/challenge.rs
Unescape Escape View File

@ -84,7 +84,6 @@ impl<'a> State<'a> {
alpha_mode: surface_caps.alpha_modes[0],
desired_maximum_frame_latency: 2,
view_formats: vec![],
desired_maximum_frame_latency: 2,
};
surface.configure(&device, &config);

1
code/beginner/tutorial2-surface/src/lib.rs
Unescape Escape View File

@ -82,7 +82,6 @@ impl<'a> State<'a> {
alpha_mode: surface_caps.alpha_modes[0],
desired_maximum_frame_latency: 2,
view_formats: vec![],
desired_maximum_frame_latency: 2,
};
surface.configure(&device, &config);

2
code/beginner/tutorial3-pipeline/src/challenge.rs
Unescape Escape View File

@ -2,7 +2,7 @@ use std::iter;
use winit::{
event::*,
event_loop::{ControlFlow, EventLoop},
event_loop::{EventLoop},
keyboard::{KeyCode, PhysicalKey},
window::{Window, WindowBuilder},
};

2
code/beginner/tutorial4-buffer/src/challenge.rs
Unescape Escape View File

@ -3,7 +3,7 @@ use std::iter;
use wgpu::util::DeviceExt;
use winit::{
event::*,
event_loop::{ControlFlow, EventLoop},
event_loop::{EventLoop},
keyboard::{KeyCode, PhysicalKey},
window::{Window, WindowBuilder},
};

2
code/beginner/tutorial5-textures/src/challenge.rs
Unescape Escape View File

@ -3,7 +3,7 @@ use std::iter;
use wgpu::util::DeviceExt;
use winit::{
event::*,
event_loop::{ControlFlow, EventLoop},
event_loop::{EventLoop},
keyboard::{KeyCode, PhysicalKey},
window::{Window, WindowBuilder},
};

2
code/beginner/tutorial7-instancing/src/lib.rs
Unescape Escape View File

@ -4,7 +4,7 @@ use cgmath::prelude::*;
use wgpu::util::DeviceExt;
use winit::{
event::*,
event_loop::{ControlFlow, EventLoop},
event_loop::{EventLoop},
keyboard::{KeyCode, PhysicalKey},
window::{Window, WindowBuilder},
};

4
code/beginner/tutorial8-depth/src/challenge.rs
Unescape Escape View File

@ -1,11 +1,11 @@
use std::iter;
use cgmath::prelude::*;
use wgpu::include_spirv_raw;
use wgpu::util::DeviceExt;
use winit::{
event::*,
event_loop::{ControlFlow, EventLoop},
event_loop::{EventLoop},
keyboard::{KeyCode, PhysicalKey},
window::{Window, WindowBuilder},
};

2
code/beginner/tutorial8-depth/src/lib.rs
Unescape Escape View File

@ -4,7 +4,7 @@ use cgmath::prelude::*;
use wgpu::util::DeviceExt;
use winit::{
event::*,
event_loop::{ControlFlow, EventLoop},
event_loop::{EventLoop},
keyboard::{KeyCode, PhysicalKey},
window::{Window, WindowBuilder},
};

2
code/beginner/tutorial9-models/src/lib.rs
Unescape Escape View File

@ -4,7 +4,7 @@ use cgmath::prelude::*;
use wgpu::util::DeviceExt;
use winit::{
event::*,
event_loop::{ControlFlow, EventLoop},
event_loop::{EventLoop},
keyboard::{KeyCode, PhysicalKey},
window::Window,
};

2
code/intermediate/tutorial10-lighting/src/lib.rs
Unescape Escape View File

@ -4,7 +4,7 @@ use cgmath::prelude::*;
use wgpu::util::DeviceExt;
use winit::{
event::*,
event_loop::{ControlFlow, EventLoop},
event_loop::{EventLoop},
keyboard::{KeyCode, PhysicalKey},
window::Window,
};

2
code/intermediate/tutorial10-lighting/src/texture.rs
Unescape Escape View File

@ -1,6 +1,6 @@
use anyhow::*;
use image::GenericImageView;
use std::num::NonZeroU32;
pub struct Texture {
pub texture: wgpu::Texture,

2
code/intermediate/tutorial11-normals/src/lib.rs
Unescape Escape View File

@ -4,7 +4,7 @@ use cgmath::prelude::*;
use wgpu::util::DeviceExt;
use winit::{
event::*,
event_loop::{ControlFlow, EventLoop},
event_loop::{EventLoop},
keyboard::{KeyCode, PhysicalKey},
window::Window,
};

2
code/intermediate/tutorial11-normals/src/texture.rs
Unescape Escape View File

@ -1,6 +1,6 @@
use anyhow::*;
use image::GenericImageView;
use std::num::NonZeroU32;
pub struct Texture {
pub texture: wgpu::Texture,

2
code/intermediate/tutorial12-camera/src/lib.rs
Unescape Escape View File

@ -4,7 +4,7 @@ use cgmath::prelude::*;
use wgpu::util::DeviceExt;
use winit::{
event::*,
event_loop::{ControlFlow, EventLoop},
event_loop::{EventLoop},
keyboard::{KeyCode, PhysicalKey},
window::Window,
};

2
code/intermediate/tutorial13-hdr/src/resources.rs
Unescape Escape View File

@ -190,7 +190,7 @@ pub async fn load_model(
// Average the tangents/bitangents
for (i, n) in triangles_included.into_iter().enumerate() {
let denom = 1.0 / n as f32;
let mut v = &mut vertices[i];
let v = &mut vertices[i];
v.tangent = (cgmath::Vector3::from(v.tangent) * denom).into();
v.bitangent = (cgmath::Vector3::from(v.bitangent) * denom).into();
}

2
code/intermediate/wip-terrain/src/lib.rs
Unescape Escape View File

@ -4,7 +4,7 @@ use cgmath::prelude::*;
use wgpu::util::DeviceExt;
use winit::{
event::*,
event_loop::{ControlFlow, EventLoop},
event_loop::{EventLoop},
keyboard::{KeyCode, PhysicalKey},
window::Window,
};

2
code/showcase/compute/src/main.rs
Unescape Escape View File

@ -5,7 +5,7 @@ use wgpu::util::DeviceExt;
use winit::{
dpi::PhysicalPosition,
event::*,
event_loop::{ControlFlow, EventLoop},
event_loop::{EventLoop},
keyboard::{KeyCode, PhysicalKey},
window::Window,
};

2
code/showcase/framework/src/lib.rs
Unescape Escape View File

@ -234,7 +234,7 @@ pub async fn run<D: Demo>() -> Result<(), Error> {
let mut last_update = Instant::now();
let mut is_resumed = true;
let mut is_focused = true;
let mut is_redraw_requested = true;
let _is_redraw_requested = true;
event_loop.run(move |event, control_flow| {
if is_resumed && is_focused {

2
code/showcase/mouse-picking/src/lib.rs
Unescape Escape View File

@ -5,7 +5,7 @@ use math::Ray;
use wgpu::util::DeviceExt;
use winit::{
event::*,
event_loop::{ControlFlow, EventLoop},
event_loop::{EventLoop},
keyboard::{KeyCode, PhysicalKey},
window::Window,
};

4
code/showcase/mouse-picking/src/resources.rs
Unescape Escape View File

@ -118,7 +118,7 @@ pub async fn load_model(
.into_iter()
.map(|m| {
// NEW!
let mut bounding_box = BoundingBox {
let bounding_box = BoundingBox {
min: cgmath::Vector3::new(
std::f32::INFINITY,
std::f32::INFINITY,
@ -218,7 +218,7 @@ pub async fn load_model(
// Average the tangents/bitangents
for (i, n) in triangles_included.into_iter().enumerate() {
let denom = 1.0 / n as f32;
let mut v = &mut vertices[i];
let v = &mut vertices[i];
v.tangent = (cgmath::Vector3::from(v.tangent) * denom).into();
v.bitangent = (cgmath::Vector3::from(v.bitangent) * denom).into();
}

2
code/showcase/mouse-picking/src/texture.rs
Unescape Escape View File

@ -1,6 +1,6 @@
use anyhow::*;
use image::GenericImageView;
use std::num::NonZeroU32;
pub struct Texture {
pub texture: wgpu::Texture,

2
code/showcase/snow/Cargo.toml
Unescape Escape View File

@ -12,4 +12,4 @@ framework = { version = "0.1", path = "../framework"}
glam = { version = "0.24.1", features = ["bytemuck"] }
pollster = "0.3.0"
wgpu = "0.19"
winit = "0.28.6"
winit = { version = "0.29", features = ["rwh_05"] }

16
code/showcase/snow/src/camera.rs
Unescape Escape View File

@ -2,7 +2,7 @@ use std::{f32::consts::FRAC_PI_2, time::Duration};
use winit::{
dpi::PhysicalPosition,
event::{MouseScrollDelta, VirtualKeyCode},
event::MouseScrollDelta, keyboard::KeyCode,
};
const SAFE_FRAC_PI_2: f32 = FRAC_PI_2 - 0.0001;
@ -93,30 +93,30 @@ impl CameraController {
}
}
pub fn process_keyboard(&mut self, key: VirtualKeyCode, pressed: bool) -> bool {
pub fn process_keyboard(&mut self, key: KeyCode, pressed: bool) -> bool {
let amount = if pressed { 1.0 } else { 0.0 };
match key {
VirtualKeyCode::W | VirtualKeyCode::Up => {
KeyCode::KeyW | KeyCode::ArrowUp => {
self.amount_forward = amount;
true
}
VirtualKeyCode::S | VirtualKeyCode::Down => {
KeyCode::KeyS | KeyCode::ArrowDown => {
self.amount_backward = amount;
true
}
VirtualKeyCode::A | VirtualKeyCode::Left => {
KeyCode::KeyA | KeyCode::ArrowLeft => {
self.amount_left = amount;
true
}
VirtualKeyCode::D | VirtualKeyCode::Right => {
KeyCode::KeyD | KeyCode::ArrowRight => {
self.amount_right = amount;
true
}
VirtualKeyCode::Space => {
KeyCode::Space => {
self.amount_up = amount;
true
}
VirtualKeyCode::LShift => {
KeyCode::ShiftLeft => {
self.amount_down = amount;
true
}

3
code/showcase/snow/src/main.rs
Unescape Escape View File

@ -4,6 +4,7 @@ use std::f32::consts::PI;
use camera::{Camera, CameraController, Projection};
use wgpu::util::{BufferInitDescriptor, DeviceExt};
use winit::keyboard::KeyCode;
const MAX_PARTICLES: u32 = 1000;
const PARTICLE_SIZE: u64 = 4 * 4 * 2;
@ -265,7 +266,7 @@ impl framework::Demo for Snow {
self.uniforms_dirty = true;
}
fn process_keyboard(&mut self, key: winit::event::VirtualKeyCode, pressed: bool) {
fn process_keyboard(&mut self, key: KeyCode, pressed: bool) {
self.camera_controller.process_keyboard(key, pressed);
self.uniforms_dirty = true;
}

Write Preview
Loading…
Cancel
Save