From feed403495cffaf3302fc7de99f33a8ca6cd4468 Mon Sep 17 00:00:00 2001 From: popertots Date: Sun, 7 Sep 2025 20:05:00 +0100 Subject: [PATCH] Update bevy version, implement bevy_rand --- Cargo.lock | 343 ++++++++++++++++++++++++++++++----------------- Cargo.toml | 11 +- src/citizen.rs | 123 +++++++++-------- src/constants.rs | 1 + src/main.rs | 4 + src/tilemap.rs | 25 ++-- 6 files changed, 315 insertions(+), 192 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 0ed034d..1517995 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -376,18 +376,18 @@ checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" [[package]] name = "bevy" -version = "0.16.0" +version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a5cd3b24a5adb7c7378da7b3eea47639877643d11b6b087fc8a8094f2528615" +checksum = "4b8369c16b7c017437021341521f8b4a0d98e1c70113fb358c3258ae7d661d79" dependencies = [ "bevy_internal", ] [[package]] name = "bevy_a11y" -version = "0.16.0" +version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91ed969a58fbe449ef35ebec58ab19578302537f34ee8a35d04e5a038b3c40f5" +checksum = "ed3561712cf49074d89e9989bfc2e6c6add5d33288f689db9a0c333300d2d004" dependencies = [ "accesskit", "bevy_app", @@ -398,9 +398,9 @@ dependencies = [ [[package]] name = "bevy_animation" -version = "0.16.0" +version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3647b67c6bfd456922b2720ccef980dec01742d155d0eb454dc3d8fdc65e7aff" +checksum = "49796627726d0b9a722ad9a0127719e7c1868f474d6575ec0f411e8299c4d7bb" dependencies = [ "bevy_app", "bevy_asset", @@ -432,9 +432,9 @@ dependencies = [ [[package]] name = "bevy_app" -version = "0.16.0" +version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2b6267ac23a9947d5b2725ff047a1e1add70076d85fa9fb73d044ab9bea1f3c" +checksum = "4491cc4c718ae76b4c6883df58b94cc88b32dcd894ea8d5b603c7c7da72ca967" dependencies = [ "bevy_derive", "bevy_ecs", @@ -455,9 +455,9 @@ dependencies = [ [[package]] name = "bevy_asset" -version = "0.16.0" +version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0698040d63199391ea77fd02e039630748e3e335c3070c6d932fd96cbf80f5d6" +checksum = "f56111d9b88d8649f331a667d9d72163fb26bd09518ca16476d238653823db1e" dependencies = [ "async-broadcast", "async-fs", @@ -495,9 +495,9 @@ dependencies = [ [[package]] name = "bevy_asset_macros" -version = "0.16.0" +version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bf8c00b5d532f8e5ac7b49af10602f9f7774a2d522cf0638323b5dfeee7b31c" +checksum = "a4cca3e67c0ec760d8889d42293d987ce5da92eaf9c592bf5d503728a63b276d" dependencies = [ "bevy_macro_utils", "proc-macro2", @@ -507,9 +507,9 @@ dependencies = [ [[package]] name = "bevy_audio" -version = "0.16.0" +version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74e54154e6369abdbaf5098e20424d59197c9b701d4f79fe8d0d2bde03d25f12" +checksum = "f2b4f6f2a5c6c0e7c6825e791d2a061c76c2d6784f114c8f24382163fabbfaaa" dependencies = [ "bevy_app", "bevy_asset", @@ -525,9 +525,9 @@ dependencies = [ [[package]] name = "bevy_color" -version = "0.16.1" +version = "0.16.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddf6a5ad35496bbc41713efbcf06ab72b9a310fabcab0f9db1debb56e8488c6e" +checksum = "5c101cbe1e26b8d701eb77263b14346e2e0cbbd2a6e254b9b1aead814e5ca8d3" dependencies = [ "bevy_math", "bevy_reflect", @@ -541,9 +541,9 @@ dependencies = [ [[package]] name = "bevy_core_pipeline" -version = "0.16.0" +version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55c2310717b9794e4a45513ee5946a7be0838852a4c1e185884195e1a8688ff3" +checksum = "59ed46363cad80dc00f08254c3015232bd6f640738403961c6d63e7ecfc61625" dependencies = [ "bevy_app", "bevy_asset", @@ -571,9 +571,9 @@ dependencies = [ [[package]] name = "bevy_derive" -version = "0.16.0" +version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f626531b9c05c25a758ede228727bd11c2c2c8498ecbed9925044386d525a2a3" +checksum = "1b837bf6c51806b10ebfa9edf1844ad80a3a0760d6c5fac4e90761df91a8901a" dependencies = [ "bevy_macro_utils", "quote", @@ -582,9 +582,9 @@ dependencies = [ [[package]] name = "bevy_diagnostic" -version = "0.16.0" +version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "048a1ff3944a534b8472516866284181eef0a75b6dd4d39b6e5925715e350766" +checksum = "48797366f312a8f31e237d08ce3ee70162591282d2bfe7c5ad8be196fb263e55" dependencies = [ "bevy_app", "bevy_ecs", @@ -600,9 +600,9 @@ dependencies = [ [[package]] name = "bevy_ecs" -version = "0.16.0" +version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9e807b5d9aab3bb8dfe47e7a44c9ff088bad2ceefe299b80ac77609a87fe9d4" +checksum = "3c2bf6521aae57a0ec3487c4bfb59e36c4a378e834b626a4bea6a885af2fdfe7" dependencies = [ "arrayvec", "bevy_ecs_macros", @@ -628,9 +628,9 @@ dependencies = [ [[package]] name = "bevy_ecs_macros" -version = "0.16.0" +version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "467d7bb98aeb8dd30f36e6a773000c12a891d4f1bee2adc3841ec89cc8eaf54e" +checksum = "38748d6f3339175c582d751f410fb60a93baf2286c3deb7efebb0878dce7f413" dependencies = [ "bevy_macro_utils", "proc-macro2", @@ -640,9 +640,9 @@ dependencies = [ [[package]] name = "bevy_encase_derive" -version = "0.16.0" +version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8bb31dc1090c6f8fabbf6b21994d19a12766e786885ee48ffc547f0f1fa7863" +checksum = "8148f4edee470a2ea5cad010184c492a4c94c36d7a7158ea28e134ea87f274ab" dependencies = [ "bevy_macro_utils", "encase_derive_impl", @@ -650,9 +650,9 @@ dependencies = [ [[package]] name = "bevy_gilrs" -version = "0.16.0" +version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "950c84596dbff8a9691a050c37bb610ef9398af56369c2c2dd6dc41ef7b717a5" +checksum = "97efef87c631949e67d06bb5d7dfd2a5f936b3b379afb6b1485b08edbb219b87" dependencies = [ "bevy_app", "bevy_ecs", @@ -667,9 +667,9 @@ dependencies = [ [[package]] name = "bevy_gizmos" -version = "0.16.0" +version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54af8145b35ab2a830a6dd1058e23c1e1ddc4b893db79d295259ef82f51c7520" +checksum = "7823154a9682128c261d8bddb3a4d7192a188490075c527af04520c2f0f8aad6" dependencies = [ "bevy_app", "bevy_asset", @@ -692,9 +692,9 @@ dependencies = [ [[package]] name = "bevy_gizmos_macros" -version = "0.16.0" +version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40137ace61f092b7a09eba41d7d1e6aef941f53a7818b06ef86dcce7b6a1fd3f" +checksum = "f378f3b513218ddc78254bbe76536d9de59c1429ebd0c14f5d8f2a25812131ad" dependencies = [ "bevy_macro_utils", "proc-macro2", @@ -704,9 +704,9 @@ dependencies = [ [[package]] name = "bevy_gltf" -version = "0.16.0" +version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa25b809ee024ef2682bafc1ca22ca8275552edb549dc6f69a030fdffd976c63" +checksum = "10a080237c0b8842ccc15a06d3379302c68580eeea4497b1c7387e470eda1f07" dependencies = [ "base64 0.22.1", "bevy_animation", @@ -739,9 +739,9 @@ dependencies = [ [[package]] name = "bevy_image" -version = "0.16.0" +version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "840b25f7f58894c641739f756959028a04f519c448db7e2cd3e2e29fc5fd188d" +checksum = "65e6e900cfecadbc3149953169e36b9e26f922ed8b002d62339d8a9dc6129328" dependencies = [ "bevy_app", "bevy_asset", @@ -767,9 +767,9 @@ dependencies = [ [[package]] name = "bevy_input" -version = "0.16.0" +version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "763410715714f3d4d2dcdf077af276e2e4ea93fd8081b183d446d060ea95baaa" +checksum = "18d6b6516433f6f7d680f648d04eb1866bb3927a1782d52f74831b62042f3cd1" dependencies = [ "bevy_app", "bevy_ecs", @@ -785,9 +785,9 @@ dependencies = [ [[package]] name = "bevy_input_focus" -version = "0.16.0" +version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7e7b4ed65e10927a39a987cf85ef98727dd319aafb6e6835f2cb05b883c6d66" +checksum = "2e2d079fda74d1416e0a57dac29ea2b79ff77f420cd6b87f833d3aa29a46bc4d" dependencies = [ "bevy_app", "bevy_ecs", @@ -801,9 +801,9 @@ dependencies = [ [[package]] name = "bevy_internal" -version = "0.16.0" +version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "526ffd64c58004cb97308826e896c07d0e23dc056c243b97492e31cdf72e2830" +checksum = "857da8785678fde537d02944cd20dec9cafb7d4c447efe15f898dc60e733cacd" dependencies = [ "bevy_a11y", "bevy_animation", @@ -844,9 +844,9 @@ dependencies = [ [[package]] name = "bevy_log" -version = "0.16.0" +version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7156df8d2f11135cf71c03eb4c11132b65201fd4f51648571e59e39c9c9ee2f6" +checksum = "d7a61ee8aef17a974f5ca481dcedf0c2bd52670e231d4c4bc9ddef58328865f9" dependencies = [ "android_log-sys", "bevy_app", @@ -861,9 +861,9 @@ dependencies = [ [[package]] name = "bevy_macro_utils" -version = "0.16.0" +version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a2473db70d8785b5c75d6dd951a2e51e9be2c2311122db9692c79c9d887517b" +checksum = "052eeebcb8e7e072beea5031b227d9a290f8a7fbbb947573ab6ec81df0fb94be" dependencies = [ "parking_lot", "proc-macro2", @@ -874,9 +874,9 @@ dependencies = [ [[package]] name = "bevy_math" -version = "0.16.0" +version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1a3a926d02dc501c6156a047510bdb538dcb1fa744eeba13c824b73ba88de55" +checksum = "68553e0090fe9c3ba066c65629f636bd58e4ebd9444fdba097b91af6cd3e243f" dependencies = [ "approx", "bevy_reflect", @@ -894,9 +894,9 @@ dependencies = [ [[package]] name = "bevy_mesh" -version = "0.16.0" +version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12af58280c7453e32e2f083d86eaa4c9b9d03ea8683977108ded8f1930c539f2" +checksum = "b10399c7027001edbc0406d7d0198596b1f07206c1aae715274106ba5bdcac40" dependencies = [ "bevy_asset", "bevy_derive", @@ -919,18 +919,18 @@ dependencies = [ [[package]] name = "bevy_mikktspace" -version = "0.16.0" +version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75e0258423c689f764556e36b5d9eebdbf624b29a1fd5b33cd9f6c42dcc4d5f3" +checksum = "8bb60c753b968a2de0fd279b76a3d19517695e771edb4c23575c7f92156315de" dependencies = [ "glam", ] [[package]] name = "bevy_pbr" -version = "0.16.0" +version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9fe0de43b68bf9e5090a33efc963f125e9d3f9d97be9ebece7bcfdde1b6da80" +checksum = "d5e0b4eb871f364a0d217f70f6c41d7fdc6f9f931fa1abbf222180c03d0ae410" dependencies = [ "bevy_app", "bevy_asset", @@ -962,9 +962,9 @@ dependencies = [ [[package]] name = "bevy_picking" -version = "0.16.0" +version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f73674f62b1033006bd75c89033f5d3516386cfd7d43bb9f7665012c0ab14d22" +checksum = "8ed04757938655ed8094ea1efb533f99063a8b22abffc22010c694d291522850" dependencies = [ "bevy_app", "bevy_asset", @@ -987,9 +987,9 @@ dependencies = [ [[package]] name = "bevy_platform" -version = "0.16.0" +version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "704db2c11b7bc31093df4fbbdd3769f9606a6a5287149f4b51f2680f25834ebc" +checksum = "f7573dc824a1b08b4c93fdbe421c53e1e8188e9ca1dd74a414455fe571facb47" dependencies = [ "cfg-if", "critical-section", @@ -1004,16 +1004,49 @@ dependencies = [ ] [[package]] -name = "bevy_ptr" -version = "0.16.0" +name = "bevy_prng" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86f1275dfb4cfef4ffc90c3fa75408964864facf833acc932413d52aa5364ba4" +checksum = "0093e25a1bafccc3020189c9037e8c2e6c2d65bb0b259c878c35bc2c1f913d71" +dependencies = [ + "bevy_reflect", + "rand_chacha 0.9.0", + "rand_core 0.6.4", + "rand_core 0.9.3", + "rand_pcg", + "rand_xoshiro", + "serde", + "wyrand", +] + +[[package]] +name = "bevy_ptr" +version = "0.16.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df7370d0e46b60e071917711d0860721f5347bc958bf325975ae6913a5dfcf01" + +[[package]] +name = "bevy_rand" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "47f5009a168e13abd76a7f002f171cc2fe3d4a8f268e45d2d6c3272c44c518d3" +dependencies = [ + "bevy_app", + "bevy_ecs", + "bevy_prng", + "bevy_reflect", + "getrandom 0.3.3", + "rand_chacha 0.9.0", + "rand_core 0.6.4", + "rand_core 0.9.3", + "serde", +] [[package]] name = "bevy_reflect" -version = "0.16.0" +version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "607ebacc31029cf2f39ac330eabf1d4bc411b159528ec08dbe6b0593eaccfd41" +checksum = "daeb91a63a1a4df00aa58da8cc4ddbd4b9f16ab8bb647c5553eb156ce36fa8c2" dependencies = [ "assert_type_match", "bevy_platform", @@ -1038,9 +1071,9 @@ dependencies = [ [[package]] name = "bevy_reflect_derive" -version = "0.16.0" +version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf35e45e4eb239018369f63f2adc2107a54c329f9276d020e01eee1625b0238b" +checksum = "40ddadc55fe16b45faaa54ab2f9cb00548013c74812e8b018aa172387103cce6" dependencies = [ "bevy_macro_utils", "proc-macro2", @@ -1051,9 +1084,9 @@ dependencies = [ [[package]] name = "bevy_render" -version = "0.16.0" +version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85a7306235b3343b032801504f3e884b93abfb7ba58179fc555c479df509f349" +checksum = "ef91fed1f09405769214b99ebe4390d69c1af5cdd27967deae9135c550eb1667" dependencies = [ "async-channel", "bevy_app", @@ -1103,9 +1136,9 @@ dependencies = [ [[package]] name = "bevy_render_macros" -version = "0.16.0" +version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b85c4fb26b66d3a257b655485d11b9b6df9d3c85026493ba8092767a5edfc1b2" +checksum = "abd42cf6c875bcf38da859f8e731e119a6aff190d41dd0a1b6000ad57cf2ed3d" dependencies = [ "bevy_macro_utils", "proc-macro2", @@ -1115,9 +1148,9 @@ dependencies = [ [[package]] name = "bevy_scene" -version = "0.16.0" +version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7b628f560f2d2fe9f35ecd4526627ba3992f082de03fd745536e4053a0266fe" +checksum = "5c52ca165200995fe8afd2a1a6c03e4ffee49198a1d4653d32240ea7f217d4ab" dependencies = [ "bevy_app", "bevy_asset", @@ -1136,9 +1169,9 @@ dependencies = [ [[package]] name = "bevy_sprite" -version = "0.16.0" +version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01f97bf54fb1c37a1077139b59bb32bc77f7ca53149cfcaa512adbb69a2d492c" +checksum = "6ccae7bab2cb956fb0434004c359e432a3a1a074a6ef4eb471f1fb099f0b620b" dependencies = [ "bevy_app", "bevy_asset", @@ -1166,9 +1199,9 @@ dependencies = [ [[package]] name = "bevy_state" -version = "0.16.0" +version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "682c343c354b191fe6669823bce3b0695ee1ae4ac36f582e29c436a72b67cdd5" +checksum = "155d3cd97b900539008cdcaa702f88b724d94b08977b8e591a32536ce66faa8c" dependencies = [ "bevy_app", "bevy_ecs", @@ -1182,9 +1215,9 @@ dependencies = [ [[package]] name = "bevy_state_macros" -version = "0.16.0" +version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55b4bf3970c4f0e60572901df4641656722172c222d71a80c430d36b0e31426c" +checksum = "2481c1304fd2a1851a0d4cb63a1ce6421ae40f3f0117cbc9882963ee4c9bb609" dependencies = [ "bevy_macro_utils", "proc-macro2", @@ -1194,9 +1227,9 @@ dependencies = [ [[package]] name = "bevy_tasks" -version = "0.16.0" +version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "444c450b65e108855f42ecb6db0c041a56ea7d7f10cc6222f0ca95e9536a7d19" +checksum = "5b674242641cab680688fc3b850243b351c1af49d4f3417a576debd6cca8dcf5" dependencies = [ "async-channel", "async-executor", @@ -1216,9 +1249,9 @@ dependencies = [ [[package]] name = "bevy_text" -version = "0.16.0" +version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ef071262c5a9afbc39caba4c0b282c7d045fbb5cf33bdab1924bd2343403833" +checksum = "1d76c85366159f5f54110f33321c76d8429cfd8f39638f26793a305dae568b60" dependencies = [ "bevy_app", "bevy_asset", @@ -1246,9 +1279,9 @@ dependencies = [ [[package]] name = "bevy_time" -version = "0.16.0" +version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "456369ca10f8e039aaf273332744674844827854833ee29e28f9e161702f2f55" +checksum = "bc98eb356c75be04fbbc77bb3d8ffa24c8bacd99f76111cee23d444be6ac8c9c" dependencies = [ "bevy_app", "bevy_ecs", @@ -1261,9 +1294,9 @@ dependencies = [ [[package]] name = "bevy_transform" -version = "0.16.0" +version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8479cdd5461246943956a7c8347e4e5d6ff857e57add889fb50eee0b5c26ab48" +checksum = "df218e440bb9a19058e1b80a68a031c887bcf7bd3a145b55f361359a2fa3100d" dependencies = [ "bevy_app", "bevy_ecs", @@ -1279,9 +1312,9 @@ dependencies = [ [[package]] name = "bevy_ui" -version = "0.16.0" +version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "110dc5d0059f112263512be8cd7bfe0466dfb7c26b9bf4c74529355249fd23f9" +checksum = "ea4a4d2ba51865bc3039af29a26b4f52c48b54cc758369f52004caf4b6f03770" dependencies = [ "accesskit", "bevy_a11y", @@ -1314,9 +1347,9 @@ dependencies = [ [[package]] name = "bevy_utils" -version = "0.16.0" +version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac2da3b3c1f94dadefcbe837aaa4aa119fcea37f7bdc5307eb05b4ede1921e24" +checksum = "94f7a8905a125d2017e8561beefb7f2f5e67e93ff6324f072ad87c5fd6ec3b99" dependencies = [ "bevy_platform", "thread_local", @@ -1324,9 +1357,9 @@ dependencies = [ [[package]] name = "bevy_window" -version = "0.16.0" +version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d83327cc5584da463d12b7a88ddb97f9e006828832287e1564531171fffdeb4" +checksum = "df7e8ad0c17c3cc23ff5566ae2905c255e6986037fb041f74c446216f5c38431" dependencies = [ "android-activity", "bevy_app", @@ -1344,9 +1377,9 @@ dependencies = [ [[package]] name = "bevy_winit" -version = "0.16.0" +version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57b14928923ae4274f4b867dce3d0e7b2c8a31bebcb0f6e65a4261c3e0765064" +checksum = "6a5e7f00c6b3b6823df5ec2a5e9067273607208919bc8c211773ebb9643c87f0" dependencies = [ "accesskit", "accesskit_winit", @@ -1974,9 +2007,10 @@ version = "0.1.0" dependencies = [ "bevy", "bevy_platform", + "bevy_rand", "image", "noise", - "rand 0.9.1", + "rand 0.9.2", "rayon", ] @@ -2113,6 +2147,26 @@ version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be" +[[package]] +name = "fax" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f05de7d48f37cd6730705cbca900770cab77a89f413d23e100ad7fad7795a0ab" +dependencies = [ + "fax_derive", +] + +[[package]] +name = "fax_derive" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0aca10fb742cb43f9e7bb8467c91aa9bcb8e3ffbc6a6f7389bb93ffc920577d" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "fdeflate" version = "0.3.7" @@ -2547,9 +2601,9 @@ checksum = "dfa686283ad6dd069f105e5ab091b04c62850d3e4cf5d67debad1933f55023df" [[package]] name = "image" -version = "0.25.6" +version = "0.25.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db35664ce6b9810857a38a906215e75a9c879f0696556a39f59c62829710251a" +checksum = "529feb3e6769d234375c4cf1ee2ce713682b8e76538cb13f9fc23e1400a591e7" dependencies = [ "bytemuck", "byteorder-lite", @@ -2557,6 +2611,7 @@ dependencies = [ "exr", "gif", "image-webp", + "moxcms", "num-traits", "png", "qoi", @@ -2716,12 +2771,6 @@ dependencies = [ "libc", ] -[[package]] -name = "jpeg-decoder" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5d4a7da358eff58addd2877a45865158f0d78c911d43a5784ceb7bbf52833b0" - [[package]] name = "js-sys" version = "0.3.77" @@ -2954,6 +3003,16 @@ dependencies = [ "simd-adler32", ] +[[package]] +name = "moxcms" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ddd32fa8935aeadb8a8a6b6b351e40225570a37c43de67690383d87ef170cd08" +dependencies = [ + "num-traits", + "pxfm", +] + [[package]] name = "naga" version = "24.0.0" @@ -3604,11 +3663,11 @@ checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c" [[package]] name = "png" -version = "0.17.16" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82151a2fc869e011c153adc57cf2789ccb8d9906ce52c0b39a6b5697749d7526" +checksum = "97baced388464909d42d89643fe4361939af9b7ce7a31ee32a168f832a70f2a0" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.9.0", "crc32fast", "fdeflate", "flate2", @@ -3716,6 +3775,15 @@ dependencies = [ "syn", ] +[[package]] +name = "pxfm" +version = "0.1.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "376f733579ac4d3b9fbf0afca99bf8f6b698d541118affca554d0b86f73c2470" +dependencies = [ + "num-traits", +] + [[package]] name = "qoi" version = "0.4.1" @@ -3774,9 +3842,9 @@ dependencies = [ [[package]] name = "rand" -version = "0.9.1" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fbfd9d094a40bf3ae768db9361049ace4c0e04a4fd6b359518bd7b73a73dd97" +checksum = "6db2770f06117d490610c7488547d543617b21bfa07796d7a12f6f1bd53850d1" dependencies = [ "rand_chacha 0.9.0", "rand_core 0.9.3", @@ -3800,6 +3868,7 @@ checksum = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb" dependencies = [ "ppv-lite86", "rand_core 0.9.3", + "serde", ] [[package]] @@ -3818,6 +3887,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "99d9a13982dcf210057a8a78572b2217b667c3beacbf3a0d8b454f6f82837d38" dependencies = [ "getrandom 0.3.3", + "serde", ] [[package]] @@ -3830,6 +3900,16 @@ dependencies = [ "rand 0.8.5", ] +[[package]] +name = "rand_pcg" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b48ac3f7ffaab7fac4d2376632268aa5f89abdb55f7ebf8f4d11fffccb2320f7" +dependencies = [ + "rand_core 0.9.3", + "serde", +] + [[package]] name = "rand_xorshift" version = "0.3.0" @@ -3839,6 +3919,16 @@ dependencies = [ "rand_core 0.6.4", ] +[[package]] +name = "rand_xoshiro" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f703f4665700daf5512dcca5f43afa6af89f09db47fb56be587f80636bda2d41" +dependencies = [ + "rand_core 0.9.3", + "serde", +] + [[package]] name = "range-alloc" version = "0.1.4" @@ -3909,9 +3999,9 @@ checksum = "20675572f6f24e9e76ef639bc5552774ed45f1c30e2951e1e99c59888861c539" [[package]] name = "rayon" -version = "1.10.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa" +checksum = "368f01d005bf8fd9b1206fb6fa653e6c4a81ceb1466406b81792d87c5677a58f" dependencies = [ "either", "rayon-core", @@ -3919,9 +4009,9 @@ dependencies = [ [[package]] name = "rayon-core" -version = "1.12.1" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" +checksum = "22e18b0f0062d30d4230b2e85ff77fdfe4326feb054b9783a3460d8435c8ab91" dependencies = [ "crossbeam-deque", "crossbeam-utils", @@ -4493,13 +4583,16 @@ dependencies = [ [[package]] name = "tiff" -version = "0.9.1" +version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba1310fcea54c6a9a4fd1aad794ecc02c31682f6bfbecdf460bf19533eed1e3e" +checksum = "af9605de7fee8d9551863fd692cce7637f548dbd9db9180fcc07ccc6d26c336f" dependencies = [ + "fax", "flate2", - "jpeg-decoder", + "half", + "quick-error", "weezl", + "zune-jpeg", ] [[package]] @@ -5037,9 +5130,9 @@ dependencies = [ [[package]] name = "weezl" -version = "0.1.8" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082" +checksum = "a751b3277700db47d3e574514de2eced5e54dc8a5436a3bf7a0b248b2cee16f3" [[package]] name = "wgpu" @@ -5759,6 +5852,16 @@ dependencies = [ "bitflags 2.9.0", ] +[[package]] +name = "wyrand" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "15e0359b0b8d9cdef235a1fd4a8c5d02e4c9204e9fac861c14c229a8e803d1a6" +dependencies = [ + "rand_core 0.9.3", + "serde", +] + [[package]] name = "x11-dl" version = "2.21.0" @@ -5871,9 +5974,9 @@ dependencies = [ [[package]] name = "zune-jpeg" -version = "0.4.14" +version = "0.4.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99a5bab8d7dedf81405c4bb1f2b83ea057643d9cb28778cea9eecddeedd2e028" +checksum = "29ce2c8a9384ad323cf564b67da86e21d3cfdff87908bc1223ed5c99bc792713" dependencies = [ "zune-core", ] diff --git a/Cargo.toml b/Cargo.toml index 7da3eeb..eb0e4ed 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -4,12 +4,13 @@ version = "0.1.0" edition = "2021" [dependencies] -bevy = { version = "0.16", features = ["wayland"] } +bevy = { version = "0.16.1", features = ["wayland"] } noise = "0.9.0" -rand = "0.9.1" -image = "0.25.6" -bevy_platform = "0.16.0" -rayon = "1.10.0" +rand = "0.9.2" +bevy_rand = { version = "0.11.3", features = ["wyrand"] } +image = "0.25.8" +bevy_platform = "0.16.1" +rayon = "1.11.0" # Enable max optimizations for dependencies, but not for our code: [profile.dev.package."*"] diff --git a/src/citizen.rs b/src/citizen.rs index 10aa471..cce3fa7 100644 --- a/src/citizen.rs +++ b/src/citizen.rs @@ -1,9 +1,16 @@ +use crate::constants::TILE_SIZE; +use crate::tile::TileMap; use crate::{ constants::*, - game, tilemap::{ChunkMap, VisibleGameEntity, CHUNK_SIZE}, }; use bevy::{math::ivec3, prelude::*}; +use bevy_rand::prelude::*; +use rand::Rng; +use std::{ + collections::{BinaryHeap, HashMap, HashSet}, + process::exit, +}; #[derive(Bundle)] pub struct Citizen { @@ -34,14 +41,6 @@ impl Citizen { } } -use crate::constants::TILE_SIZE; -use crate::tile::TileMap; -use rand::{seq::IndexedRandom, Rng}; -use std::{ - collections::{BinaryHeap, HashMap, HashSet}, - process::exit, -}; - #[derive(Component)] pub struct Ambulatory { pub walk_speed: f32, @@ -86,43 +85,46 @@ pub fn update_citizen_wandering_targets( mut query: Query<(&mut Ambulatory, &Transform)>, tilemap: Res, chunk_map: Res, + mut rng_q: Query<&mut Entropy, With>, ) { - let mut rng: rand::prelude::ThreadRng = rand::rng(); + if let Ok(mut rng) = rng_q.single_mut() { + for (mut ambulatory, _) in query.iter_mut() { + if ambulatory.target.is_none() + || (ambulatory.current_path.is_some() + && ambulatory.path_index >= ambulatory.current_path.as_ref().unwrap().len()) + { + // Find a random loaded chunk + let loaded_chunks: Vec<&IVec2> = chunk_map.loaded_chunks.keys().collect(); + if !loaded_chunks.is_empty() { + let random_index = rng.random_range(0..loaded_chunks.len()); + if let Some(&chunk_pos) = loaded_chunks.get(random_index) { + // Generate random position within chunk + let chunk_x = chunk_pos.x * CHUNK_SIZE; + let chunk_y = chunk_pos.y * CHUNK_SIZE; - for (mut ambulatory, _) in query.iter_mut() { - if ambulatory.target.is_none() - || (ambulatory.current_path.is_some() - && ambulatory.path_index >= ambulatory.current_path.as_ref().unwrap().len()) - { - // Find a random loaded chunk - let loaded_chunks: Vec<&IVec2> = chunk_map.loaded_chunks.keys().collect(); - if let Some(&chunk_pos) = loaded_chunks.choose(&mut rng) { - // Generate random position within chunk - let chunk_x = chunk_pos.x * CHUNK_SIZE; - let chunk_y = chunk_pos.y * CHUNK_SIZE; + let target_x = chunk_x + rng.random_range(0..CHUNK_SIZE); + let target_y = chunk_y + rng.random_range(0..CHUNK_SIZE); - let target_x = chunk_x + rng.random_range(0..CHUNK_SIZE); - let target_y = chunk_y + rng.random_range(0..CHUNK_SIZE); + // Get height at position + let surface_height = 0; - // Get height at position - let surface_height = 0; - - // Find a valid z-level near the surface - for z in (surface_height - 3)..=(surface_height + 4) { - let mut target_pos = IVec3::new(target_x, target_y, z) * ITILE_SIZE; - if let Some(_) = tilemap.floor_tiles.get(&target_pos) { - target_pos.z += ITILE_SIZE; - if let Some(_base_texture) = tilemap.floor_tiles.get(&target_pos) { - if is_standable_tile(&tilemap, target_pos) { - // If tile is walkable, set target - ambulatory.target = Some(Vec3::new( - target_pos.x as f32, - target_pos.y as f32, - target_pos.z as f32 + 1.0, - )); - ambulatory.current_path = None; - ambulatory.path_index = 0; - break; + // Find a valid z-level near the surface + for z in (surface_height - 3)..=(surface_height + 4) { + let mut target_pos = IVec3::new(target_x, target_y, z) * ITILE_SIZE; + if let Some(_) = tilemap.floor_tiles.get(&target_pos) { + target_pos.z += ITILE_SIZE; + if let Some(_base_texture) = tilemap.floor_tiles.get(&target_pos) { + if is_standable_tile(&tilemap, target_pos) { + ambulatory.target = Some(Vec3::new( + target_pos.x as f32, + target_pos.y as f32, + target_pos.z as f32 + 1.0, + )); + ambulatory.current_path = None; + ambulatory.path_index = 0; + break; + } + } } } } @@ -430,22 +432,25 @@ fn reconstruct_path(came_from: HashMap, mut current: IVec3) -> Vec path.reverse(); path } - -pub fn spawn_citizens(mut commands: Commands, asset_server: Res) { - let mut rng = rand::rng(); - - // Spawn a handful of citizens - for _ in 0..10 { - let cit = commands - .spawn(Citizen::new( - &asset_server, - Vec3::new( - rng.random_range(-8.0f32..8.0f32).round(), - rng.random_range(-8.0f32..8.0f32).round(), - 35.0, - ) * TILE_SIZE, - )) - .id(); - commands.entity(cit).insert(VisibleGameEntity); +pub fn spawn_citizens( + mut commands: Commands, + asset_server: Res, + mut rng_q: Query<&mut Entropy, With>, +) { + if let Ok(mut rng) = rng_q.single_mut() { + // Spawn a handful of citizens + for _ in 0..10 { + let cit = commands + .spawn(Citizen::new( + &asset_server, + Vec3::new( + rng.random_range(-8.0f32..8.0f32).round(), + rng.random_range(-8.0f32..8.0f32).round(), + 35.0, + ) * TILE_SIZE, + )) + .id(); + commands.entity(cit).insert(VisibleGameEntity); + } } } diff --git a/src/constants.rs b/src/constants.rs index fc17916..a0c34b2 100644 --- a/src/constants.rs +++ b/src/constants.rs @@ -2,3 +2,4 @@ pub const PIXEL_RATIO: f32 = 1.0; pub const TILE_PIXELS: u32 = 16; pub const TILE_SIZE: f32 = TILE_PIXELS as f32 * PIXEL_RATIO; pub const ITILE_SIZE: i32 = TILE_SIZE as i32; +pub const SEED: u32 = 420; diff --git a/src/main.rs b/src/main.rs index 65c30cb..51f9e75 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,4 +1,5 @@ use bevy::prelude::*; +use bevy_rand::prelude::*; mod camera; mod citizen; @@ -30,6 +31,9 @@ fn main() { }) .set(ImagePlugin::default_nearest()), ) + .add_plugins(bevy_rand::plugin::EntropyPlugin::::with_seed( + (constants::SEED as u64).to_le_bytes(), + )) .insert_resource(ClearColor(Color::srgb(0., 0., 0.))) .add_plugins(tilemap::TilemapPlugin) .add_plugins(citizen::PathfindingPlugin) diff --git a/src/tilemap.rs b/src/tilemap.rs index 2345ebc..5ddcb5d 100644 --- a/src/tilemap.rs +++ b/src/tilemap.rs @@ -1,7 +1,7 @@ use std::sync::Mutex; use std::time::Instant; -use crate::constants::{ITILE_SIZE, TILE_SIZE}; +use crate::constants::{self, ITILE_SIZE, TILE_SIZE}; use crate::tile::{update_tile_visibility, FloorTile, TileMap}; use crate::tiles::{ self, build_quilted_terrain_sprites, CurrentWorldSpriteState, FixtureTilePrefab, @@ -11,7 +11,11 @@ use crate::{camera, game}; use bevy::prelude::*; use bevy_platform::collections::hash_map::HashMap; use bevy_platform::collections::HashSet; +use bevy_rand::prelude::*; use noise::{NoiseFn, Perlin}; +use rand::{Rng, SeedableRng}; +use std::collections::hash_map::DefaultHasher; +use std::hash::{Hash, Hasher}; pub const CHUNK_SIZE: i32 = 8; @@ -21,8 +25,6 @@ pub const Z_TOTAL: f32 = Z_ABOVE + Z_BELOW; const _: () = assert!(Z_TOTAL <= 255.0); -pub const SEED: u32 = 420; - #[derive(Resource)] pub struct ChunkMap { pub loaded_chunks: HashMap, @@ -180,7 +182,7 @@ pub fn calculate_visibility(pos: IVec3, tilemap: &TileMap) -> [u32; 8] { } pub fn generate_surface_terrain(x: i32, y: i32) -> f32 { - let noise = Perlin::new(SEED); + let noise = Perlin::new(constants::SEED); let mut noise_value = 0.0; let mut amplitude = 1.0; let mut frequency = 0.008; @@ -264,7 +266,7 @@ fn generate_chunk_terrain( let start = Instant::now(); let count: usize = events.len(); - let cave_noise = Perlin::new(SEED); + let cave_noise = Perlin::new(constants::SEED); // Create mutexes for our shared resources let tilemap_updates = Mutex::new(HashMap::new()); @@ -418,6 +420,13 @@ fn generate_chunk_forrestry( let mut tree_positions: Vec = Vec::new(); let min_distance = 7.0 * TILE_SIZE; + let mut hasher = DefaultHasher::new(); + constants::SEED.hash(&mut hasher); + event.chunk_position.x.hash(&mut hasher); + event.chunk_position.y.hash(&mut hasher); + let seed = hasher.finish(); + let mut rng = WyRand::seed_from_u64(seed); + for (position, floor_type) in floor_positions.iter() { let above_pos = *position + Vec3::new(0.0, 0.0, TILE_SIZE); @@ -433,9 +442,9 @@ fn generate_chunk_forrestry( .all(|&tree_pos| above_pos.distance(tree_pos) > min_distance); // 1 in 100 chance if far enough from other trees - if is_far_enough && rand::random::() % 100 == 0 { + if is_far_enough && rng.random::() % 100 == 0 { // Generate trunk - let trunk_height = 4 + rand::random::() % 5; + let trunk_height = 4 + rng.random::() % 5; for i in 0..trunk_height { let trunk_pos = above_pos + Vec3::new(0.0, 0.0, i as f32 * TILE_SIZE); @@ -499,7 +508,7 @@ fn generate_chunk_forrestry( let y_f = y as f32; let z_f = z as f32; let radius = base_leaf_radius - * (1.0 + (rand::random::() * 0.35 - 0.1)); + * (1.0 + (rng.random::() * 0.35 - 0.1)); if x_f * x_f + y_f * y_f + z_f * z_f <= radius * radius { FixtureTilePrefab::leaves(pos).spawn(&mut commands);