diff --git a/Cargo.lock b/Cargo.lock index d27a1378..78e8bcff 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -309,7 +309,7 @@ checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" [[package]] name = "avian3d" version = "0.1.2" -source = "git+https://github.com/Jondolf/avian#f1a98d96d240220d1345a785c563b3d84ad653a6" +source = "git+https://github.com/Jondolf/avian#a5616dd194aecfef294d70ad9294d20ac68a49d4" dependencies = [ "avian_derive", "bevy", @@ -327,7 +327,7 @@ dependencies = [ [[package]] name = "avian_derive" version = "0.1.0" -source = "git+https://github.com/Jondolf/avian#f1a98d96d240220d1345a785c563b3d84ad653a6" +source = "git+https://github.com/Jondolf/avian#a5616dd194aecfef294d70ad9294d20ac68a49d4" dependencies = [ "proc-macro-error", "proc-macro2", @@ -335,6 +335,15 @@ dependencies = [ "syn 2.0.66", ] +[[package]] +name = "avian_interpolation3d" +version = "0.1.0" +source = "git+https://github.com/janhohenheim/avian_interpolation#d51dca2e8601d45d8f04cb7e9da0362d9a0b3186" +dependencies = [ + "avian3d", + "bevy", +] + [[package]] name = "base64" version = "0.21.7" @@ -349,9 +358,9 @@ checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" [[package]] name = "bevy" -version = "0.14.1" +version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8ece0d8dde51890fb52dcba5b04fd1c657617a4022908c327b2d6e83d173a32" +checksum = "043c9ad4b6fc4ca52d779873a8ca792a4e37842d07fce95363c9e17e36a1d8a0" dependencies = [ "bevy_dylib", "bevy_internal", @@ -404,7 +413,7 @@ dependencies = [ [[package]] name = "bevy-tnua" version = "0.19.0" -source = "git+https://github.com/janhohenheim/bevy-tnua?branch=fix-minor-avian-stuff#3bc32f860169ce70b53ff19fad60682a23c48cd5" +source = "git+https://github.com/janhohenheim/bevy-tnua?branch=fix-minor-avian-stuff#6099a73bfb1b550345dec7ac3802c91aaa3d579a" dependencies = [ "bevy", "bevy-tnua-physics-integration-layer", @@ -414,7 +423,7 @@ dependencies = [ [[package]] name = "bevy-tnua-avian3d" version = "0.1.1" -source = "git+https://github.com/janhohenheim/bevy-tnua?branch=fix-minor-avian-stuff#3bc32f860169ce70b53ff19fad60682a23c48cd5" +source = "git+https://github.com/janhohenheim/bevy-tnua?branch=fix-minor-avian-stuff#6099a73bfb1b550345dec7ac3802c91aaa3d579a" dependencies = [ "avian3d", "bevy", @@ -424,16 +433,16 @@ dependencies = [ [[package]] name = "bevy-tnua-physics-integration-layer" version = "0.4.0" -source = "git+https://github.com/janhohenheim/bevy-tnua?branch=fix-minor-avian-stuff#3bc32f860169ce70b53ff19fad60682a23c48cd5" +source = "git+https://github.com/janhohenheim/bevy-tnua?branch=fix-minor-avian-stuff#6099a73bfb1b550345dec7ac3802c91aaa3d579a" dependencies = [ "bevy", ] [[package]] name = "bevy_a11y" -version = "0.14.1" +version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82d84e0ae7155afa21c4926fb8b89ebe0cbd66239ac817fdb834025327c4089b" +checksum = "ae1a976cb539d6a5a3ff579cdb78187a6bcfbffa7e8224ea28f23d8b983d9389" dependencies = [ "accesskit", "bevy_app", @@ -443,9 +452,9 @@ dependencies = [ [[package]] name = "bevy_animation" -version = "0.14.1" +version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abec61c2d9d19329d8d9f0d7f1ce0188f6ed2c6d74d90412b238efc38c7d7794" +checksum = "93aef7d21a0342c24b05059493aa31d58f1798d34a2236569a8789b74df5a475" dependencies = [ "bevy_app", "bevy_asset", @@ -473,9 +482,9 @@ dependencies = [ [[package]] name = "bevy_app" -version = "0.14.1" +version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0af99549f5de61cc91c8c23303b13aa07f97b73fbace39695dee0a0a32cec9d4" +checksum = "a5361d0f8a8677a5d0102cfe7321a7ecd2a8b9a4f887ce0dde1059311cf9cd42" dependencies = [ "bevy_derive", "bevy_ecs", @@ -491,9 +500,9 @@ dependencies = [ [[package]] name = "bevy_asset" -version = "0.14.1" +version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6533d17f13b44ea4fb5177f83b0900269ed13c0fd45772ccffd19a69980647ec" +checksum = "60ec5ea257e1ebd3d411f669e29acf60beb715bebc7e1f374c17f49cd3aad46c" dependencies = [ "async-broadcast", "async-fs", @@ -524,9 +533,9 @@ dependencies = [ [[package]] name = "bevy_asset_macros" -version = "0.14.1" +version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74b0e132a89e254c0f5c8bc8deebb0f2490f5662f4aa2215a6996701446d6a7b" +checksum = "c9eb05ce838d282f09d83380b4d6432aec7519d421dee8c75cc20e6148237e6e" dependencies = [ "bevy_macro_utils", "proc-macro2", @@ -536,9 +545,9 @@ dependencies = [ [[package]] name = "bevy_audio" -version = "0.14.1" +version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3050cb7244560313800b284e4b5eafcf91e833464e44d8407b20ec6c65974fc" +checksum = "8ee31312a0e67f288fe12a1d9aa679dd0ba8a49e1e6fe5fcd2ba1aa1ea34e5ed" dependencies = [ "bevy_app", "bevy_asset", @@ -555,9 +564,9 @@ dependencies = [ [[package]] name = "bevy_color" -version = "0.14.2" +version = "0.14.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82c031f121b8d72e7637c94ef139097613bd32935784d36728f83e77cfdf26f4" +checksum = "04842e9d38a93f0c75ab46f7f404ea24ef57ad83dbd159e5b4b35318b02257bb" dependencies = [ "bevy_math", "bevy_reflect", @@ -583,9 +592,9 @@ dependencies = [ [[package]] name = "bevy_core" -version = "0.14.1" +version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ccc7118a2865267136afb5e6a2c0aed30994e522f298b2ba0b088878e6ddf59" +checksum = "de706862871a1fe99ea619bff2f99d73e43ad82f19ef866a9e19a14c957c8537" dependencies = [ "bevy_app", "bevy_ecs", @@ -598,9 +607,9 @@ dependencies = [ [[package]] name = "bevy_core_pipeline" -version = "0.14.1" +version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "559ad1dc48c3fa6bbace503df2fe44a7de38c8dfe11bee911ec0ffaf93e3e57d" +checksum = "2f6e1e122ada4cd811442e083fb5ad3e325c59a87271d5ef57193f1c2cad7f8c" dependencies = [ "bevy_app", "bevy_asset", @@ -623,9 +632,9 @@ dependencies = [ [[package]] name = "bevy_derive" -version = "0.14.1" +version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8675f337f374b2b8ae90539982b947d171f9adb302d00c032b823bd5231f8978" +checksum = "3fbfc33a4c6b80760bb8bf850a2cc65a1e031da62fd3ca8b552189104dc98514" dependencies = [ "bevy_macro_utils", "quote", @@ -634,9 +643,9 @@ dependencies = [ [[package]] name = "bevy_dev_tools" -version = "0.14.1" +version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8cc87d018c71ab225cc3535051af5c0a7ade699b820b043a5484ce4097addf2" +checksum = "0abf99960653c5b0827c562e75fd7a6c74ffa517d2c138519c31375f17f12ce8" dependencies = [ "bevy_app", "bevy_asset", @@ -662,9 +671,9 @@ dependencies = [ [[package]] name = "bevy_diagnostic" -version = "0.14.1" +version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fdcc1d7ba5797e4285a7867227134d4cabaaf8cabfb7cdc42eb697d3b3db0460" +checksum = "bebb154e0cc78e3bbfbfdb42fb502b14c1cd47e72f16e6d4228dfe6233ba6cbd" dependencies = [ "bevy_app", "bevy_core", @@ -690,18 +699,18 @@ dependencies = [ [[package]] name = "bevy_dylib" -version = "0.14.1" +version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "521e5c295b80798b7a886aab4e54d0a92ea1780aa9586cdb17ded1fe34f36504" +checksum = "0c399292fac67682a72666e78872626f3c1c39b34c430b6f02c81d21da91b500" dependencies = [ "bevy_internal", ] [[package]] name = "bevy_ecs" -version = "0.14.1" +version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a3eed7f144811946ebfa1c740da9e3bcd6dd2dd4da844eda085249d29bc9fef" +checksum = "9ee4222406637f3c8e3991a99788cfcde76097bf997c311f1b6297364057483f" dependencies = [ "arrayvec", "bevy_ecs_macros", @@ -720,9 +729,9 @@ dependencies = [ [[package]] name = "bevy_ecs_macros" -version = "0.14.1" +version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d523630f2eb9fde6727e6c5ea48fa708079c5345da21ffeb1a4bd8ca761830da" +checksum = "36b573430b67aff7bde8292257494f39343401379bfbda64035ba4918bba7b20" dependencies = [ "bevy_macro_utils", "proc-macro2", @@ -754,9 +763,9 @@ dependencies = [ [[package]] name = "bevy_encase_derive" -version = "0.14.1" +version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a20ec101b103f430481112591e280a8fc3f2db6741579f885595372073b749b" +checksum = "d06c9693847a2a6ea61d6b86288dd4d8b6a79f05d4bf6e27b96d4f5c8d552fe4" dependencies = [ "bevy_macro_utils", "encase_derive_impl", @@ -764,9 +773,9 @@ dependencies = [ [[package]] name = "bevy_gilrs" -version = "0.14.1" +version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a64d84c2cbc6a027ba2c293752f9508e6777607acb1d98d03c25eb2a80d55372" +checksum = "0422ccb3ce0f79b264100cf064fdc5ef65cef5c7d51bf6378058f9b96fea4183" dependencies = [ "bevy_app", "bevy_ecs", @@ -779,9 +788,9 @@ dependencies = [ [[package]] name = "bevy_gizmos" -version = "0.14.1" +version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "248324352331d719071b0d1545a43e3d63470f4730e75312edee575f210d3a77" +checksum = "dfe32af0666d8d8a7fd6eb6b5e41eceefdc6f2e5441c74b812e8f0902a9d7f52" dependencies = [ "bevy_app", "bevy_asset", @@ -802,9 +811,9 @@ dependencies = [ [[package]] name = "bevy_gizmos_macros" -version = "0.14.1" +version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbe1708bb0e45a1d0fe0f32e998557689231dfe7bdae62083326e8008e97de23" +checksum = "906b052f8cf3f3983f0f6df625fb10cbd9b27d44e362a327dc1ed51300d362bc" dependencies = [ "bevy_macro_utils", "proc-macro2", @@ -814,9 +823,9 @@ dependencies = [ [[package]] name = "bevy_gltf" -version = "0.14.1" +version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb57239cb4209e52354268062cd1973892af3a2077ccbdb4d19259cbbc2d2c2d" +checksum = "d6adbd325b90e3c700d0966b5404e226c7deec1b8bda8f36832788d7b435b9b8" dependencies = [ "base64 0.22.1", "bevy_animation", @@ -845,9 +854,9 @@ dependencies = [ [[package]] name = "bevy_hierarchy" -version = "0.14.1" +version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb332d2789442ca1577c765977bafefea1dcd4db29479713ec8c6932dfb82cdb" +checksum = "a88b912b37e1bc4dbb2aa40723199f74c8b06c4fbb6da0bb4585131df28ef66e" dependencies = [ "bevy_app", "bevy_core", @@ -859,9 +868,9 @@ dependencies = [ [[package]] name = "bevy_input" -version = "0.14.1" +version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9ce5f27a8729b473205b01927cd6a5c4898a004cb8fcffa7c896e19ba999d98" +checksum = "8dd3a54e67cc3ba17971de7b1a7e64eda84493c1e7bb6bfa11c6cf8ac124377b" dependencies = [ "bevy_app", "bevy_ecs", @@ -875,9 +884,9 @@ dependencies = [ [[package]] name = "bevy_internal" -version = "0.14.1" +version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2463102e46d7d67440dbfe3bc97d34bf529c93191c4f4bb41395f4982062ff3" +checksum = "45d435cac77c568f3aef65f786a5fee0e53c81950c5258182dd2c1d6cd6c4fec" dependencies = [ "bevy_a11y", "bevy_animation", @@ -917,9 +926,9 @@ dependencies = [ [[package]] name = "bevy_log" -version = "0.14.1" +version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52f2c0c374af59007396793a51f747f6b10d74ca4acfb080ce0ade267118827b" +checksum = "67240c7596c8f0653e50fce35a60196516817449235193246599facba9002e02" dependencies = [ "android_log-sys", "bevy_app", @@ -932,9 +941,9 @@ dependencies = [ [[package]] name = "bevy_macro_utils" -version = "0.14.1" +version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ec4a585ec2a6dedd4f4143c07219d120ae142121929f0d83e68d82a452cdc9b" +checksum = "bfc65e570012e64a21f3546df68591aaede8349e6174fb500071677f54f06630" dependencies = [ "proc-macro2", "quote", @@ -944,9 +953,9 @@ dependencies = [ [[package]] name = "bevy_math" -version = "0.14.1" +version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40253578fe83a5ffe5f4fcb4dfa196b7d9c50f36dc8efaa231a53344bf4b3e57" +checksum = "5421792749dda753ab3718e77d27bfce38443daf1850b836b97530b6245a4581" dependencies = [ "bevy_reflect", "glam", @@ -958,18 +967,18 @@ dependencies = [ [[package]] name = "bevy_mikktspace" -version = "0.14.1" +version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24a1ad15685c6035e01bdc9d5ea082558ef1438e9d40d69fc552857dd7e83e71" +checksum = "66cf695a264b043f2c4edb92dd5c742e6892180d2b30dac870012d153f8557ea" dependencies = [ "glam", ] [[package]] name = "bevy_pbr" -version = "0.14.1" +version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "588998ba295db4a14dec54e571f272490f2885e5aaac59191fb4fa32a25835d0" +checksum = "4dccaa3c945f19834dcf7cd8eb358236dbf0fc4000dacbc7710564e7856714db" dependencies = [ "bevy_app", "bevy_asset", @@ -994,15 +1003,15 @@ dependencies = [ [[package]] name = "bevy_ptr" -version = "0.14.1" +version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ed72afbb6249a6803a3ed7bd2f68ff080d9392f550475e050b34c1e1c1e3e8f" +checksum = "61baa1bdc1f4a7ac2c18217570a7cc04e1cd54d38456e91782f0371c79afe0a8" [[package]] name = "bevy_reflect" -version = "0.14.1" +version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb37e8fc3c61d04da480c95cc8c303aa7781afed6be01dae333b336af493c38e" +checksum = "2508785a4a5809f25a237eec4fee2c91a4dbcf81324b2bbc2d6c52629e603781" dependencies = [ "bevy_ptr", "bevy_reflect_derive", @@ -1020,9 +1029,9 @@ dependencies = [ [[package]] name = "bevy_reflect_derive" -version = "0.14.1" +version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fc00d5086f5bf534b4c2dbeba549a6b8d3223515f3cb5ba4fdaabe953ec6cea" +checksum = "967d5da1882ec3bb3675353915d3da909cafac033cbf31e58727824a1ad2a288" dependencies = [ "bevy_macro_utils", "proc-macro2", @@ -1033,9 +1042,9 @@ dependencies = [ [[package]] name = "bevy_render" -version = "0.14.1" +version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f570f36154296ae5377587d5ef19e1feb4c5734923785c571f55a9fff091701" +checksum = "836cf8a513db013cbe7d55a331060088efd407e49fd5b05c8404700cd82e7619" dependencies = [ "async-channel", "bevy_app", @@ -1081,9 +1090,9 @@ dependencies = [ [[package]] name = "bevy_render_macros" -version = "0.14.1" +version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe2d5008c7b4a8a516ef7b58452b8e40e4c2317068fc7505398bedf34e8d45f7" +checksum = "cbc24e0e95061a38a7744218b9c7e52e4c08b53f1499f33480e2b749f3864432" dependencies = [ "bevy_macro_utils", "proc-macro2", @@ -1093,9 +1102,9 @@ dependencies = [ [[package]] name = "bevy_scene" -version = "0.14.1" +version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3910087f6fc45e7833fb62e4de282c36a7012ff381c0584eb2cc84dede02e72f" +checksum = "8ec57a72d75273bdbb6154390688fd07ba79ae9f6f99476d1937f799c736c2da" dependencies = [ "bevy_app", "bevy_asset", @@ -1113,9 +1122,9 @@ dependencies = [ [[package]] name = "bevy_sprite" -version = "0.14.1" +version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fffdfb9a18968c8606286b6be83c9323ff9008b5cc043a23a3ecc95ff72fb20c" +checksum = "e045b4d8cc8e7422a4c29b1eadbe224f5cc42f170b88d43e7535892fcede3840" dependencies = [ "bevy_app", "bevy_asset", @@ -1139,9 +1148,9 @@ dependencies = [ [[package]] name = "bevy_state" -version = "0.14.1" +version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21066e7bb8014d1b1dd4f611f28c0f4ea9c7738cec2325281e4260a65072d509" +checksum = "25335bfa58cc22371182335c3b133017293bc9b6d3308402fd4d1f978b83f937" dependencies = [ "bevy_app", "bevy_ecs", @@ -1153,9 +1162,9 @@ dependencies = [ [[package]] name = "bevy_state_macros" -version = "0.14.1" +version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8a449823c420d1cc1fa6cf3d484570b08358e5eeedc1b86de1efcf9c10399b5" +checksum = "dee600b659c739f1911f997a81611fec0a1832cf731727956e5fa4e7532b4dd5" dependencies = [ "bevy_macro_utils", "proc-macro2", @@ -1165,9 +1174,9 @@ dependencies = [ [[package]] name = "bevy_tasks" -version = "0.14.1" +version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84f5414c3f49c96e02ceccf5fa12fb6cfbf8b271d2a820902d6f622e9c2fa681" +checksum = "77865f310b1fc48fb05b7c4adbe76607ec01d0c14f8ab4caba4d714c86439946" dependencies = [ "async-channel", "async-executor", @@ -1178,9 +1187,9 @@ dependencies = [ [[package]] name = "bevy_text" -version = "0.14.1" +version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3e77dd86def15f5380e6e7c178ec54e5e356b3f464e2ad35794a08d5ecb82e4" +checksum = "b661db828fd423fc41a4ccf43aa4d1b8e50e75057ec40453317d0d761e8ad62d" dependencies = [ "ab_glyph", "bevy_app", @@ -1201,9 +1210,9 @@ dependencies = [ [[package]] name = "bevy_time" -version = "0.14.1" +version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3fb18cfac62098e07786e422e84b4f45f469f27ccb5b572b409500bef465f33" +checksum = "f4e4d53ec32a1b16492396951d04de0d2d90e924bf9adcb8d1adacab5ab6c17c" dependencies = [ "bevy_app", "bevy_ecs", @@ -1216,9 +1225,9 @@ dependencies = [ [[package]] name = "bevy_transform" -version = "0.14.1" +version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ff09cea0dd0d4e6a3ed5f7dcbd4fbbcec07e518ceb64a4c8a75dedbe294ab60" +checksum = "d5493dce84427d00a9266e8e4386d738a72ee8640423b62dfcecb6dfccbfe0d2" dependencies = [ "bevy_app", "bevy_ecs", @@ -1231,9 +1240,9 @@ dependencies = [ [[package]] name = "bevy_ui" -version = "0.14.1" +version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50684629a03b7d4891b5953e84dd971c7a8bbd290751bab5ce06e119b692220b" +checksum = "56d2cba6603b39a3765f043212ae530e25550af168a7eec6b23b9b93c19bc5f7" dependencies = [ "bevy_a11y", "bevy_app", @@ -1262,9 +1271,9 @@ dependencies = [ [[package]] name = "bevy_utils" -version = "0.14.1" +version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6efbe5a621b56cc4ffa41074929eca84107e242302496b9bb7550675e6bf2e7" +checksum = "ffb0ec333b5965771153bd746f92ffd8aeeb9d008a8620ffd9ed474859381a5e" dependencies = [ "ahash", "bevy_utils_proc_macros", @@ -1277,9 +1286,9 @@ dependencies = [ [[package]] name = "bevy_utils_proc_macros" -version = "0.14.1" +version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36a1e91b4294cad2d08620ac062509395d4f65247b636946d6497eaeccf4dbfd" +checksum = "38f1ab8f2f6f58439d260081d89a42b02690e5fdd64f814edc9417d33fcf2857" dependencies = [ "proc-macro2", "quote", @@ -1288,9 +1297,9 @@ dependencies = [ [[package]] name = "bevy_window" -version = "0.14.1" +version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ba11880f05a3b267ecfa4149fe789b0c046c35fd8418dd8899fad3a4359c986" +checksum = "c89e88a20db64ea8204540afb4699295947c454738fd50293f7b32ab8be857a6" dependencies = [ "bevy_a11y", "bevy_app", @@ -1305,9 +1314,9 @@ dependencies = [ [[package]] name = "bevy_winit" -version = "0.14.1" +version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5aeb4b2e3b1ece189fcf37ea2de625ceab93e6ac2a14d4b15b0393351e4c18b" +checksum = "d0bef8ec3e4b45db943ad4d1c0bf59b09e382ce0651a706e2f33a70fa955303c" dependencies = [ "accesskit_winit", "approx", @@ -1398,8 +1407,7 @@ dependencies = [ [[package]] name = "blenvy" version = "0.1.0-alpha.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a54af0aa5fc695e7a3a6880a34570b1a5388851a20cee43f90c43f2580ff8fcd" +source = "git+https://github.com/janhohenheim/blenvy?branch=scheduling#98010b116d7475c082fda6c9d2d01537b28fd8f7" dependencies = [ "bevy", "bevy_common_assets", @@ -2185,6 +2193,7 @@ name = "foxtrot" version = "0.1.0" dependencies = [ "avian3d", + "avian_interpolation3d", "bevy", "bevy-inspector-egui", "bevy-tnua", diff --git a/Cargo.toml b/Cargo.toml index 22cfe8d5..2da4b72a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -6,9 +6,10 @@ edition = "2021" [dependencies] # Bevy dependencies -bevy = { version = "0.14", features = ["wayland"] } -blenvy = "0.1.0-alpha.1" +bevy = { version = "0.14.2", features = ["wayland"] } +blenvy = { version = "0.1.0-alpha.1", git = "https://github.com/janhohenheim/blenvy", branch = "scheduling"} avian3d = { git = "https://github.com/Jondolf/avian" } +avian_interpolation3d = { git = "https://github.com/janhohenheim/avian_interpolation", version = "0.1.0" } bevy-inspector-egui = { version = "0.25.2", optional = true } leafwing-input-manager = { git = "https://github.com/Leafwing-Studios/leafwing_input_manager" } bevy_dolly = "0.0.4" diff --git a/assets/registry.json b/assets/registry.json index 8f1e42c5..ce266230 100644 --- a/assets/registry.json +++ b/assets/registry.json @@ -10,6 +10,27 @@ "type": "array", "typeInfo": "Tuple" }, + "(avian_interpolation3d::InterpolationMode, avian_interpolation3d::DisableTransformChanges)": { + "isComponent": false, + "isResource": false, + "items": false, + "long_name": "(avian_interpolation3d::InterpolationMode, avian_interpolation3d::DisableTransformChanges)", + "prefixItems": [ + { + "type": { + "$ref": "#/$defs/avian_interpolation3d::InterpolationMode" + } + }, + { + "type": { + "$ref": "#/$defs/avian_interpolation3d::DisableTransformChanges" + } + } + ], + "short_name": "(InterpolationMode, DisableTransformChanges)", + "type": "array", + "typeInfo": "Tuple" + }, "(bevy_ecs::entity::Entity, bevy_ecs::entity::Entity)": { "isComponent": false, "isResource": false, @@ -3174,6 +3195,29 @@ "type": "object", "typeInfo": "Struct" }, + "avian_interpolation3d::DisableTransformChanges": { + "additionalProperties": false, + "isComponent": true, + "isResource": false, + "long_name": "avian_interpolation3d::DisableTransformChanges", + "properties": {}, + "required": [], + "short_name": "DisableTransformChanges", + "type": "object", + "typeInfo": "Struct" + }, + "avian_interpolation3d::InterpolationMode": { + "isComponent": true, + "isResource": false, + "long_name": "avian_interpolation3d::InterpolationMode", + "oneOf": [ + "Linear", + "None" + ], + "short_name": "InterpolationMode", + "type": "string", + "typeInfo": "Enum" + }, "bevy_animation::AnimationClip": { "additionalProperties": false, "isComponent": false, @@ -13888,6 +13932,11 @@ "isResource": false, "long_name": "bevy_ui::ui_node::Node", "properties": { + "border_radius": { + "type": { + "$ref": "#/$defs/bevy_ui::ui_node::ResolvedBorderRadius" + } + }, "calculated_size": { "type": { "$ref": "#/$defs/glam::Vec2" @@ -13919,7 +13968,8 @@ "calculated_size", "outline_width", "outline_offset", - "unrounded_size" + "unrounded_size", + "border_radius" ], "short_name": "Node", "type": "object", @@ -14031,6 +14081,43 @@ "type": "object", "typeInfo": "Struct" }, + "bevy_ui::ui_node::ResolvedBorderRadius": { + "additionalProperties": false, + "isComponent": false, + "isResource": false, + "long_name": "bevy_ui::ui_node::ResolvedBorderRadius", + "properties": { + "bottom_left": { + "type": { + "$ref": "#/$defs/f32" + } + }, + "bottom_right": { + "type": { + "$ref": "#/$defs/f32" + } + }, + "top_left": { + "type": { + "$ref": "#/$defs/f32" + } + }, + "top_right": { + "type": { + "$ref": "#/$defs/f32" + } + } + }, + "required": [ + "top_left", + "top_right", + "bottom_left", + "bottom_right" + ], + "short_name": "ResolvedBorderRadius", + "type": "object", + "typeInfo": "Struct" + }, "bevy_ui::ui_node::Style": { "additionalProperties": false, "isComponent": true, @@ -16396,28 +16483,6 @@ "type": "string", "typeInfo": "Enum" }, - "blenvy::save_load::Dynamic": { - "additionalProperties": false, - "isComponent": true, - "isResource": false, - "long_name": "blenvy::save_load::Dynamic", - "properties": {}, - "required": [], - "short_name": "Dynamic", - "type": "object", - "typeInfo": "Struct" - }, - "blenvy::save_load::StaticEntitiesRoot": { - "additionalProperties": false, - "isComponent": true, - "isResource": false, - "long_name": "blenvy::save_load::StaticEntitiesRoot", - "properties": {}, - "required": [], - "short_name": "StaticEntitiesRoot", - "type": "object", - "typeInfo": "Struct" - }, "bool": { "isComponent": false, "isResource": false, diff --git a/src/hacks.rs b/src/hacks.rs index 5b1303d5..80366612 100644 --- a/src/hacks.rs +++ b/src/hacks.rs @@ -1,3 +1,17 @@ +use avian3d::prelude::*; use bevy::prelude::*; -pub(super) fn plugin(_app: &mut App) {} +pub(super) fn plugin(app: &mut App) { + app.observe(fix_collider); +} + +fn fix_collider( + trigger: Trigger, + mut q_floor: Query<(&GlobalTransform, &mut Collider)>, +) { + let Ok((transform, mut collider)) = q_floor.get_mut(trigger.entity()) else { + return; + }; + let transform = transform.compute_transform(); + collider.set_scale(transform.scale, 10); +} diff --git a/src/lib.rs b/src/lib.rs index 2cdfee6b..de14680b 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -14,6 +14,7 @@ mod theme; mod ui_camera; use avian3d::PhysicsPlugins; +use avian_interpolation3d::prelude::*; use bevy::{ asset::AssetMetaCheck, audio::{AudioPlugin, Volume}, @@ -78,7 +79,11 @@ impl Plugin for AppPlugin { ); // Add third party plugins. - app.add_plugins((BlenvyPlugin::default(), PhysicsPlugins::default())); + app.add_plugins(( + BlenvyPlugin::default(), + PhysicsPlugins::default(), + AvianInterpolationPlugin::default(), + )); // Add internal plugins. app.add_plugins((