diff --git a/Cargo.lock b/Cargo.lock index da0cba3..a6cb5ff 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -126,9 +126,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.41" +version = "1.0.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15af2628f6890fe2609a3b91bef4c83450512802e59489f9c1cb1fa5df064a61" +checksum = "595d3cfa7a60d4555cb5067b99f07142a08ea778de5cf993f7b75c7d8fabc486" [[package]] name = "approx" @@ -440,7 +440,7 @@ dependencies = [ [[package]] name = "bevy_retrograde" -version = "0.1.0" +version = "0.2.0" dependencies = [ "bevy", "bevy_retrograde_audio", @@ -457,7 +457,7 @@ dependencies = [ [[package]] name = "bevy_retrograde_audio" -version = "0.1.0" +version = "0.2.0" dependencies = [ "anyhow", "bevy", @@ -468,7 +468,7 @@ dependencies = [ [[package]] name = "bevy_retrograde_core" -version = "0.1.0" +version = "0.2.0" dependencies = [ "anyhow", "bevy", @@ -495,7 +495,7 @@ dependencies = [ [[package]] name = "bevy_retrograde_epaint" -version = "0.1.0" +version = "0.2.0" dependencies = [ "bevy", "bevy_retrograde_core", @@ -505,7 +505,7 @@ dependencies = [ [[package]] name = "bevy_retrograde_ldtk" -version = "0.1.0" +version = "0.2.0" dependencies = [ "anyhow", "bevy", @@ -517,11 +517,11 @@ dependencies = [ [[package]] name = "bevy_retrograde_macros" -version = "0.1.0" +version = "0.2.0" [[package]] name = "bevy_retrograde_physics" -version = "0.1.0" +version = "0.2.0" dependencies = [ "bevy", "bevy_retrograde_core", @@ -533,7 +533,7 @@ dependencies = [ [[package]] name = "bevy_retrograde_text" -version = "0.1.0" +version = "0.2.0" dependencies = [ "anyhow", "bevy", @@ -546,7 +546,7 @@ dependencies = [ [[package]] name = "bevy_retrograde_ui" -version = "0.1.0" +version = "0.2.0" dependencies = [ "bevy", "bevy_retrograde_core", @@ -727,9 +727,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.68" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a72c244c1ff497a746a7e1fb3d14bd08420ecda70c8f25c7112f2781652d787" +checksum = "e70cc2f62c6ce1868963827bd677764c62d07c3d9a3e1fb1177ee1a9ab199eb2" dependencies = [ "jobserver", ] @@ -1599,8 +1599,9 @@ dependencies = [ [[package]] name = "heron" -version = "0.9.1" -source = "git+https://github.com/katharostech/heron.git?branch=ktech-patches#9824d1a5299a979dde0ecfc0164aa99414a58f52" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9ee8ef1ef98114eb27d3534cc910902232a5abaaa14893317575891119dfe48" dependencies = [ "bevy", "cfg_aliases", @@ -1611,8 +1612,9 @@ dependencies = [ [[package]] name = "heron_core" -version = "0.9.1" -source = "git+https://github.com/katharostech/heron.git?branch=ktech-patches#9824d1a5299a979dde0ecfc0164aa99414a58f52" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c60840ee87f81b3dbea5b4461d48b51a3611cc0355ce9faf3ff7cb54ce15baf" dependencies = [ "bevy", "duplicate", @@ -1620,8 +1622,9 @@ dependencies = [ [[package]] name = "heron_macros" -version = "0.9.1" -source = "git+https://github.com/katharostech/heron.git?branch=ktech-patches#9824d1a5299a979dde0ecfc0164aa99414a58f52" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42c0927dddbba0571c826a5507d1bedea2875080d0329331c098d3dd46a2e1af" dependencies = [ "heron_core", "quote", @@ -1630,8 +1633,9 @@ dependencies = [ [[package]] name = "heron_rapier" -version = "0.9.1" -source = "git+https://github.com/katharostech/heron.git?branch=ktech-patches#9824d1a5299a979dde0ecfc0164aa99414a58f52" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfb1c7faa2c07dcbafd88931f111fb5e7decb40409233c5a078a4efd6b9de476" dependencies = [ "bevy", "cfg_aliases", @@ -1710,9 +1714,9 @@ dependencies = [ [[package]] name = "instant" -version = "0.1.9" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61124eeebbd69b8190558df225adf7e4caafce0d743919e5d6b19652314ec5ec" +checksum = "bee0328b1209d157ef001c94dd85b4f8f64139adb0eac2659f4b08382b2f474d" dependencies = [ "cfg-if 1.0.0", "js-sys", @@ -2227,7 +2231,7 @@ checksum = "8794322172319b972f528bf90c6b467be0079f1fa82780ffb431088e741a73ab" dependencies = [ "jni-sys", "ndk-sys", - "num_enum 0.5.1", + "num_enum 0.5.2", "thiserror", ] @@ -2267,7 +2271,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "05d1c6307dc424d0f65b9b06e94f88248e6305726b14729fd67a5e47b2dc481d" dependencies = [ "darling", - "proc-macro-crate", + "proc-macro-crate 0.1.5", "proc-macro2", "quote", "syn", @@ -2455,12 +2459,12 @@ dependencies = [ [[package]] name = "num_enum" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "226b45a5c2ac4dd696ed30fa6b94b057ad909c7b7fc2e0d0808192bced894066" +checksum = "e5adf0198d427ee515335639f275e806ca01acf9f07d7cf14bb36a10532a6169" dependencies = [ "derivative", - "num_enum_derive 0.5.1", + "num_enum_derive 0.5.2", ] [[package]] @@ -2469,7 +2473,7 @@ version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ffa5a33ddddfee04c0283a7653987d634e880347e96b5b2ed64de07efb59db9d" dependencies = [ - "proc-macro-crate", + "proc-macro-crate 0.1.5", "proc-macro2", "quote", "syn", @@ -2477,11 +2481,11 @@ dependencies = [ [[package]] name = "num_enum_derive" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c0fd9eba1d5db0994a239e09c1be402d35622277e35468ba891aa5e3188ce7e" +checksum = "b1def5a3f69d4707d8a040b12785b98029a39e8c610ae685c7f6265669767482" dependencies = [ - "proc-macro-crate", + "proc-macro-crate 1.0.0", "proc-macro2", "quote", "syn", @@ -2566,9 +2570,9 @@ checksum = "692fcb63b64b1758029e0a96ee63e049ce8c5948587f2f7208df04625e5f6b56" [[package]] name = "ordered-float" -version = "2.6.0" +version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6dea6388d3d5498ec651701f14edbaf463c924b5d8829fb2848ccf0bcc7b3c69" +checksum = "039f02eb0f69271f26abe3202189275d7aa2258b903cb0281b5de710a2570ff3" dependencies = [ "num-traits", ] @@ -2760,6 +2764,16 @@ dependencies = [ "toml", ] +[[package]] +name = "proc-macro-crate" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41fdbd1df62156fbc5945f4762632564d7d038153091c3fcf1067f6aef7cff92" +dependencies = [ + "thiserror", + "toml", +] + [[package]] name = "proc-macro-error" version = "1.0.4" diff --git a/Cargo.toml b/Cargo.toml index a2e9607..42d912e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "bevy_retrograde" -version = "0.1.0" +version = "0.2.0" authors = ["Katharos Technology LLC."] edition = "2018" @@ -41,14 +41,14 @@ ldtk = ["bevy_retrograde_ldtk"] [dependencies] bevy = { version = "0.5", default-features = false } -bevy_retrograde_macros = { version = "0.1", path = "crates/bevy_retrograde_macros" } -bevy_retrograde_core = { version = "0.1", path = "crates/bevy_retrograde_core" } -bevy_retrograde_audio = { version = "0.1", path = "crates/bevy_retrograde_audio", optional = true } -bevy_retrograde_ldtk = { version = "0.1", path = "crates/bevy_retrograde_ldtk", optional = true } -bevy_retrograde_text = { version = "0.1", path = "crates/bevy_retrograde_text", optional = true } -bevy_retrograde_ui = { version = "0.1", path = "crates/bevy_retrograde_ui", optional = true } -bevy_retrograde_epaint = { version = "0.1", path = "crates/bevy_retrograde_epaint", optional = true } -bevy_retrograde_physics = { version = "0.1", path = "crates/bevy_retrograde_physics", optional = true } +bevy_retrograde_macros = { version = "0.2", path = "crates/bevy_retrograde_macros" } +bevy_retrograde_core = { version = "0.2", path = "crates/bevy_retrograde_core" } +bevy_retrograde_audio = { version = "0.2", path = "crates/bevy_retrograde_audio", optional = true } +bevy_retrograde_ldtk = { version = "0.2", path = "crates/bevy_retrograde_ldtk", optional = true } +bevy_retrograde_text = { version = "0.2", path = "crates/bevy_retrograde_text", optional = true } +bevy_retrograde_ui = { version = "0.2", path = "crates/bevy_retrograde_ui", optional = true } +bevy_retrograde_epaint = { version = "0.2", path = "crates/bevy_retrograde_epaint", optional = true } +bevy_retrograde_physics = { version = "0.2", path = "crates/bevy_retrograde_physics", optional = true } [dev-dependencies] hex = "0.4.3" diff --git a/README.md b/README.md index 168d4a1..150afef 100644 --- a/README.md +++ b/README.md @@ -66,7 +66,7 @@ When depending on the `bevy` crate, you must be sure to set `default-features` t ```toml bevy = { version = "0.5", default-features = false } -bevy_retrograde = "0.1.0" +bevy_retrograde = "0.2.0" ``` diff --git a/crates/bevy_retrograde_audio/Cargo.toml b/crates/bevy_retrograde_audio/Cargo.toml index cd92b1a..d95e531 100644 --- a/crates/bevy_retrograde_audio/Cargo.toml +++ b/crates/bevy_retrograde_audio/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "bevy_retrograde_audio" -version = "0.1.0" +version = "0.2.0" authors = ["Katharos Technology LLC."] edition = "2018" diff --git a/crates/bevy_retrograde_core/Cargo.toml b/crates/bevy_retrograde_core/Cargo.toml index ef11af0..8697d7e 100644 --- a/crates/bevy_retrograde_core/Cargo.toml +++ b/crates/bevy_retrograde_core/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "bevy_retrograde_core" -version = "0.1.0" +version = "0.2.0" authors = ["Katharos Technology LLC."] edition = "2018" @@ -32,7 +32,7 @@ bmp = ["image/bmp"] [dependencies] bevy = { version = "0.5", default-features = false, features = ["bevy_winit", "x11"] } -bevy_retrograde_macros = { version = "0.1", path = "../bevy_retrograde_macros" } +bevy_retrograde_macros = { version = "0.2", path = "../bevy_retrograde_macros" } luminance = { version = "0.43.2", features = ["derive"] } luminance-glow = "0.1.0" winit = { version = "0.24", features = ["web-sys"] } diff --git a/crates/bevy_retrograde_epaint/Cargo.toml b/crates/bevy_retrograde_epaint/Cargo.toml index f3ceacf..9140e0b 100644 --- a/crates/bevy_retrograde_epaint/Cargo.toml +++ b/crates/bevy_retrograde_epaint/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "bevy_retrograde_epaint" -version = "0.1.0" +version = "0.2.0" authors = ["Katharos Technology LLC"] edition = "2018" @@ -19,6 +19,6 @@ categories = [ [dependencies] bevy = { version = "0.5", features = ["bevy_winit"], default-features = false } -bevy_retrograde_core = { version = "0.1", path = "../bevy_retrograde_core" } -bevy_retrograde_macros = { version = "0.1", path = "../bevy_retrograde_macros" } +bevy_retrograde_core = { version = "0.2", path = "../bevy_retrograde_core" } +bevy_retrograde_macros = { version = "0.2", path = "../bevy_retrograde_macros" } epaint = "0.13.0" diff --git a/crates/bevy_retrograde_ldtk/Cargo.toml b/crates/bevy_retrograde_ldtk/Cargo.toml index 602eafe..7e3afd8 100644 --- a/crates/bevy_retrograde_ldtk/Cargo.toml +++ b/crates/bevy_retrograde_ldtk/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "bevy_retrograde_ldtk" -version = "0.1.0" +version = "0.2.0" authors = ["Katharos Technology LLC."] edition = "2018" @@ -20,7 +20,7 @@ default = [] [dependencies] bevy = { version = "0.5", default-features = false } -bevy_retrograde_core = { version = "0.1", path = "../bevy_retrograde_core" } +bevy_retrograde_core = { version = "0.2", path = "../bevy_retrograde_core" } ldtk = { version = "0.4", features = ["ldtk-v0-9-3"] } anyhow = "1.0.37" serde_json = "1.0.61" diff --git a/crates/bevy_retrograde_macros/Cargo.toml b/crates/bevy_retrograde_macros/Cargo.toml index c7edcf3..3a1a061 100644 --- a/crates/bevy_retrograde_macros/Cargo.toml +++ b/crates/bevy_retrograde_macros/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "bevy_retrograde_macros" -version = "0.1.0" +version = "0.2.0" authors = ["Katharos Technology LLC."] edition = "2018" diff --git a/crates/bevy_retrograde_physics/Cargo.toml b/crates/bevy_retrograde_physics/Cargo.toml index d02d0b1..d9838f5 100644 --- a/crates/bevy_retrograde_physics/Cargo.toml +++ b/crates/bevy_retrograde_physics/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "bevy_retrograde_physics" -version = "0.1.0" +version = "0.2.0" authors = ["Katharos Technology LLC."] edition = "2018" @@ -24,8 +24,8 @@ default = [] [dependencies] bevy = { version = "0.5", default-features = false } -bevy_retrograde_core = { version = "0.1", path = "../bevy_retrograde_core" } -heron = { git = "https://github.com/katharostech/heron.git", branch = "ktech-patches", features = ["2d"], default-features = false } +bevy_retrograde_core = { version = "0.2", path = "../bevy_retrograde_core" } +heron = { version = "0.10.1", features = ["2d"], default-features = false } density-mesh-core = "1.5.0" density-mesh-image = "1.5.0" image = "0.23.14" diff --git a/crates/bevy_retrograde_physics/src/lib.rs b/crates/bevy_retrograde_physics/src/lib.rs index a71b171..8d6984c 100644 --- a/crates/bevy_retrograde_physics/src/lib.rs +++ b/crates/bevy_retrograde_physics/src/lib.rs @@ -3,7 +3,6 @@ use bevy::{ecs::component::ComponentDescriptor, prelude::*}; #[cfg(feature = "debug")] use bevy_retrograde_core::prelude::AppBuilderRenderHookExt; -use bevy_retrograde_core::prelude::Color; use bevy_retrograde_core::prelude::Image; use density_mesh_core::prelude::GenerateDensityMeshSettings; use density_mesh_core::prelude::PointsSeparation; @@ -24,12 +23,16 @@ use render_hook::PhysicsDebugRenderHook; /// Physics plugin for Bevy Retrograde pub struct RetroPhysicsPlugin; +#[cfg(feature = "debug")] +use bevy_retrograde_core::prelude::Color; +#[cfg(feature = "debug")] #[derive(Clone, Debug)] pub enum PhysicsDebugRendering { Disabled, Enabled { color: Color }, } +#[cfg(feature = "debug")] impl Default for PhysicsDebugRendering { fn default() -> Self { Self::Disabled @@ -38,11 +41,11 @@ impl Default for PhysicsDebugRendering { impl Plugin for RetroPhysicsPlugin { fn build(&self, app: &mut AppBuilder) { - app.add_plugin(PhysicsPlugin::default()) - .init_resource::(); + app.add_plugin(PhysicsPlugin::default()); #[cfg(feature = "debug")] - app.add_render_hook::(); + app.add_render_hook::() + .init_resource::(); app.register_component(ComponentDescriptor::new::( bevy::ecs::component::StorageType::SparseSet, diff --git a/crates/bevy_retrograde_text/Cargo.toml b/crates/bevy_retrograde_text/Cargo.toml index 6baaa4b..fc5c6d5 100644 --- a/crates/bevy_retrograde_text/Cargo.toml +++ b/crates/bevy_retrograde_text/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "bevy_retrograde_text" -version = "0.1.0" +version = "0.2.0" authors = ["Katharos Technology LLC."] edition = "2018" @@ -19,8 +19,8 @@ categories = [ [dependencies] bevy = { version = "0.5", default-features = false } -bevy_retrograde_core = { version = "0.1", path = "../bevy_retrograde_core" } -bevy_retrograde_macros = { version = "0.1", path = "../bevy_retrograde_macros" } +bevy_retrograde_core = { version = "0.2", path = "../bevy_retrograde_core" } +bevy_retrograde_macros = { version = "0.2", path = "../bevy_retrograde_macros" } peg = "0.7.0" unicode-linebreak = "0.1.1" diff --git a/crates/bevy_retrograde_ui/Cargo.toml b/crates/bevy_retrograde_ui/Cargo.toml index 8173aed..b133310 100644 --- a/crates/bevy_retrograde_ui/Cargo.toml +++ b/crates/bevy_retrograde_ui/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "bevy_retrograde_ui" -version = "0.1.0" +version = "0.2.0" authors = ["Katharos Technology LLC"] edition = "2018" @@ -19,8 +19,8 @@ categories = [ [dependencies] bevy = { version = "0.5", features = ["bevy_winit"], default-features = false } -bevy_retrograde_core = { version = "0.1", path = "../bevy_retrograde_core" } -bevy_retrograde_text = { version = "0.1", path = "../bevy_retrograde_text" } -bevy_retrograde_macros = { version = "0.1", path = "../bevy_retrograde_macros" } +bevy_retrograde_core = { version = "0.2", path = "../bevy_retrograde_core" } +bevy_retrograde_text = { version = "0.2", path = "../bevy_retrograde_text" } +bevy_retrograde_macros = { version = "0.2", path = "../bevy_retrograde_macros" } raui = { version = "0.37.1", features = ["material", "tesselate"] } diff --git a/src/lib.rs b/src/lib.rs index b79d143..aa24ef9 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -94,7 +94,7 @@ //! # Be sure to turn off the default features of Bevy to avoid conflicts with the //! # Bevy Retrograde renderer types. //! bevy = { version = "0.5", default-features = false } -//! bevy_retrograde = "0.1.0" +//! bevy_retrograde = "0.2.0" //! ``` //! # Sample //!