From 780ba4a216aa9ef68d7f10db4a2b67b866699f43 Mon Sep 17 00:00:00 2001 From: johnny-smitherson <127537716+johnny-smitherson@users.noreply.github.com> Date: Mon, 23 Oct 2023 16:21:07 +0000 Subject: update bevy 0.11 - fix compile errors --- crates/rapier2d-f64/Cargo.toml | 2 +- crates/rapier2d/Cargo.toml | 6 +++--- crates/rapier3d-f64/Cargo.toml | 2 +- crates/rapier3d/Cargo.toml | 2 +- crates/rapier_testbed2d-f64/Cargo.toml | 13 ++++++++----- crates/rapier_testbed2d/Cargo.toml | 13 ++++++++----- crates/rapier_testbed3d-f64/Cargo.toml | 13 ++++++++----- crates/rapier_testbed3d/Cargo.toml | 19 +++++++++++-------- 8 files changed, 41 insertions(+), 29 deletions(-) (limited to 'crates') diff --git a/crates/rapier2d-f64/Cargo.toml b/crates/rapier2d-f64/Cargo.toml index 3d88ee8..90ee6b5 100644 --- a/crates/rapier2d-f64/Cargo.toml +++ b/crates/rapier2d-f64/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "rapier2d-f64" -version = "0.17.2" +version = "0.18.0" authors = [ "Sébastien Crozet " ] description = "2-dimensional physics engine in Rust." documentation = "https://docs.rs/rapier2d" diff --git a/crates/rapier2d/Cargo.toml b/crates/rapier2d/Cargo.toml index 9d51771..9553750 100644 --- a/crates/rapier2d/Cargo.toml +++ b/crates/rapier2d/Cargo.toml @@ -1,9 +1,9 @@ [package] name = "rapier2d" -version = "0.17.2" +version = "0.18.0" authors = [ "Sébastien Crozet " ] -description = "2-dimensional physics engine in Rust." -documentation = "https://docs.rs/rapier2d" +description = "3-dimensional physics engine in Rust." +documentation = "https://docs.rs/rapier3d" homepage = "https://rapier.rs" repository = "https://github.com/dimforge/rapier" readme = "README.md" diff --git a/crates/rapier3d-f64/Cargo.toml b/crates/rapier3d-f64/Cargo.toml index bf8c984..12c71b7 100644 --- a/crates/rapier3d-f64/Cargo.toml +++ b/crates/rapier3d-f64/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "rapier3d-f64" -version = "0.17.2" +version = "0.18.0" authors = [ "Sébastien Crozet " ] description = "3-dimensional physics engine in Rust." documentation = "https://docs.rs/rapier3d" diff --git a/crates/rapier3d/Cargo.toml b/crates/rapier3d/Cargo.toml index 72903ff..1d3605b 100644 --- a/crates/rapier3d/Cargo.toml +++ b/crates/rapier3d/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "rapier3d" -version = "0.17.2" +version = "0.18.0" authors = [ "Sébastien Crozet " ] description = "3-dimensional physics engine in Rust." documentation = "https://docs.rs/rapier3d" diff --git a/crates/rapier_testbed2d-f64/Cargo.toml b/crates/rapier_testbed2d-f64/Cargo.toml index 85a0a82..7f0efb4 100644 --- a/crates/rapier_testbed2d-f64/Cargo.toml +++ b/crates/rapier_testbed2d-f64/Cargo.toml @@ -40,21 +40,24 @@ bincode = "1" Inflector = "0.11" md5 = "0.7" -bevy_egui = "0.18" -bevy_ecs = "0.9" +bevy_egui = "0.22" +bevy_ecs = "0.11" +bevy_core_pipeline = "0.11" +bevy_pbr = "0.11" +bevy_sprite = "0.11" #bevy_prototype_debug_lines = "0.7" # Dependencies for native only. [target.'cfg(not(target_arch = "wasm32"))'.dependencies] -bevy = {version = "0.9", default-features = false, features = ["bevy_winit", "render", "x11"]} +bevy = {version = "0.11", default-features = false, features = ["bevy_winit", "x11"]} # Dependencies for WASM only. [target.'cfg(target_arch = "wasm32")'.dependencies] -bevy = {version = "0.9", default-features = false, features = ["bevy_winit", "render"]} +bevy = {version = "0.11", default-features = false, features = ["bevy_winit"]} #bevy_webgl2 = "0.5" [dependencies.rapier] package = "rapier2d-f64" path = "../rapier2d-f64" -version = "0.17.0" +version = "0.18.0" features = [ "serde-serialize", "debug-render", "profiler" ] diff --git a/crates/rapier_testbed2d/Cargo.toml b/crates/rapier_testbed2d/Cargo.toml index 776edae..d891760 100644 --- a/crates/rapier_testbed2d/Cargo.toml +++ b/crates/rapier_testbed2d/Cargo.toml @@ -40,21 +40,24 @@ bincode = "1" Inflector = "0.11" md5 = "0.7" -bevy_egui = "0.18" -bevy_ecs = "0.9" +bevy_egui = "0.22" +bevy_ecs = "0.11" +bevy_core_pipeline = "0.11" +bevy_pbr = "0.11" +bevy_sprite = "0.11" #bevy_prototype_debug_lines = "0.7" # Dependencies for native only. [target.'cfg(not(target_arch = "wasm32"))'.dependencies] -bevy = {version = "0.9", default-features = false, features = ["bevy_winit", "render", "x11"]} +bevy = {version = "0.11", default-features = false, features = ["bevy_winit", "x11"]} # Dependencies for WASM only. [target.'cfg(target_arch = "wasm32")'.dependencies] -bevy = {version = "0.9", default-features = false, features = ["bevy_winit", "render"]} +bevy = {version = "0.11", default-features = false, features = ["bevy_winit",]} #bevy_webgl2 = "0.5" [dependencies.rapier] package = "rapier2d" path = "../rapier2d" -version = "0.17.0" +version = "0.18.0" features = [ "serde-serialize", "debug-render", "profiler" ] diff --git a/crates/rapier_testbed3d-f64/Cargo.toml b/crates/rapier_testbed3d-f64/Cargo.toml index 17b29b4..ddfc890 100644 --- a/crates/rapier_testbed3d-f64/Cargo.toml +++ b/crates/rapier_testbed3d-f64/Cargo.toml @@ -39,21 +39,24 @@ md5 = "0.7" Inflector = "0.11" serde = { version = "1", features = [ "derive" ] } -bevy_egui = "0.18" -bevy_ecs = "0.9" +bevy_egui = "0.22" +bevy_ecs = "0.11" +bevy_core_pipeline = "0.11" +bevy_pbr = "0.11" +bevy_sprite = "0.11" #bevy_prototype_debug_lines = { version = "0.7", features = [ "3d" ] } # Dependencies for native only. [target.'cfg(not(target_arch = "wasm32"))'.dependencies] -bevy = {version = "0.9", default-features = false, features = ["bevy_winit", "render", "x11"]} +bevy = {version = "0.11", default-features = false, features = ["bevy_winit", "x11"]} # Dependencies for WASM only. [target.'cfg(target_arch = "wasm32")'.dependencies] -bevy = {version = "0.9", default-features = false, features = ["bevy_winit", "render"]} +bevy = {version = "0.11", default-features = false, features = ["bevy_winit"]} #bevy_webgl2 = "0.5" [dependencies.rapier] package = "rapier3d-f64" path = "../rapier3d-f64" -version = "0.17.0" +version = "0.18.0" features = [ "serde-serialize", "debug-render", "profiler" ] diff --git a/crates/rapier_testbed3d/Cargo.toml b/crates/rapier_testbed3d/Cargo.toml index 1f1005f..b44b075 100644 --- a/crates/rapier_testbed3d/Cargo.toml +++ b/crates/rapier_testbed3d/Cargo.toml @@ -33,31 +33,34 @@ rand = "0.8" rand_pcg = "0.3" instant = { version = "0.1", features = [ "web-sys", "now" ]} bitflags = "1" -glam = { version = "0.20", optional = true } # For Physx +glam = { version = "0.24", optional = true } # For Physx num_cpus = { version = "1", optional = true } -physx = { version = "0.16", features = [ "glam" ], optional = true } -physx-sys = { version = "0.8", optional = true } +physx = { version = "0.19", features = [ "glam" ], optional = true } +physx-sys = { version = "0.11", optional = true } crossbeam = "0.8" bincode = "1" md5 = "0.7" Inflector = "0.11" serde = { version = "1", features = [ "derive" ] } -bevy_egui = "0.18" -bevy_ecs = "0.9" +bevy_egui = "0.22" +bevy_ecs = "0.11" +bevy_core_pipeline = "0.11" +bevy_pbr = "0.11" +bevy_sprite = "0.11" #bevy_prototype_debug_lines = { version = "0.7", features = [ "3d" ] } # Dependencies for native only. [target.'cfg(not(target_arch = "wasm32"))'.dependencies] -bevy = {version = "0.9", default-features = false, features = ["bevy_winit", "render", "x11"]} +bevy = {version = "0.11", default-features = false, features = ["bevy_winit", "x11"]} # Dependencies for WASM only. [target.'cfg(target_arch = "wasm32")'.dependencies] -bevy = {version = "0.9", default-features = false, features = ["bevy_winit", "render"]} +bevy = {version = "0.11", default-features = false, features = ["bevy_winit"]} #bevy_webgl2 = "0.5" [dependencies.rapier] package = "rapier3d" path = "../rapier3d" -version = "0.17.0" +version = "0.18.0" features = [ "serde-serialize", "debug-render", "profiler" ] -- cgit From 23a7ed5beba12161d67184cdf7e63caa86be45eb Mon Sep 17 00:00:00 2001 From: Sébastien Crozet Date: Sun, 29 Oct 2023 18:59:47 +0100 Subject: Fix crashes on MacOS --- crates/rapier_testbed2d-f64/Cargo.toml | 4 ++-- crates/rapier_testbed2d/Cargo.toml | 4 ++-- crates/rapier_testbed3d-f64/Cargo.toml | 4 ++-- crates/rapier_testbed3d/Cargo.toml | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) (limited to 'crates') diff --git a/crates/rapier_testbed2d-f64/Cargo.toml b/crates/rapier_testbed2d-f64/Cargo.toml index 7f0efb4..d906869 100644 --- a/crates/rapier_testbed2d-f64/Cargo.toml +++ b/crates/rapier_testbed2d-f64/Cargo.toml @@ -49,11 +49,11 @@ bevy_sprite = "0.11" # Dependencies for native only. [target.'cfg(not(target_arch = "wasm32"))'.dependencies] -bevy = {version = "0.11", default-features = false, features = ["bevy_winit", "x11"]} +bevy = {version = "0.11", default-features = false, features = ["bevy_asset", "bevy_winit", "x11", "tonemapping_luts", "ktx2", "zstd", "bevy_render", "bevy_pbr", "bevy_gizmos"]} # Dependencies for WASM only. [target.'cfg(target_arch = "wasm32")'.dependencies] -bevy = {version = "0.11", default-features = false, features = ["bevy_winit"]} +bevy = {version = "0.11", default-features = false, features = ["bevy_asset", "bevy_winit", "tonemapping_luts", "ktx2", "zstd", "bevy_render", "bevy_pbr", "bevy_gizmos"]} #bevy_webgl2 = "0.5" [dependencies.rapier] diff --git a/crates/rapier_testbed2d/Cargo.toml b/crates/rapier_testbed2d/Cargo.toml index d891760..8bf8b26 100644 --- a/crates/rapier_testbed2d/Cargo.toml +++ b/crates/rapier_testbed2d/Cargo.toml @@ -49,11 +49,11 @@ bevy_sprite = "0.11" # Dependencies for native only. [target.'cfg(not(target_arch = "wasm32"))'.dependencies] -bevy = {version = "0.11", default-features = false, features = ["bevy_winit", "x11"]} +bevy = {version = "0.11", default-features = false, features = ["bevy_sprite", "bevy_winit", "x11", "tonemapping_luts", "ktx2", "zstd", "bevy_render", "bevy_pbr", "bevy_gizmos"]} # Dependencies for WASM only. [target.'cfg(target_arch = "wasm32")'.dependencies] -bevy = {version = "0.11", default-features = false, features = ["bevy_winit",]} +bevy = {version = "0.11", default-features = false, features = ["bevy_sprite", "bevy_winit", "tonemapping_luts", "ktx2", "zstd", "bevy_render", "bevy_pbr", "bevy_gizmos"]} #bevy_webgl2 = "0.5" [dependencies.rapier] diff --git a/crates/rapier_testbed3d-f64/Cargo.toml b/crates/rapier_testbed3d-f64/Cargo.toml index ddfc890..0bfeefa 100644 --- a/crates/rapier_testbed3d-f64/Cargo.toml +++ b/crates/rapier_testbed3d-f64/Cargo.toml @@ -48,11 +48,11 @@ bevy_sprite = "0.11" # Dependencies for native only. [target.'cfg(not(target_arch = "wasm32"))'.dependencies] -bevy = {version = "0.11", default-features = false, features = ["bevy_winit", "x11"]} +bevy = {version = "0.11", default-features = false, features = ["bevy_winit", "x11", "tonemapping_luts", "ktx2", "zstd", "bevy_render", "bevy_pbr", "bevy_gizmos"]} # Dependencies for WASM only. [target.'cfg(target_arch = "wasm32")'.dependencies] -bevy = {version = "0.11", default-features = false, features = ["bevy_winit"]} +bevy = {version = "0.11", default-features = false, features = ["bevy_winit", "tonemapping_luts", "ktx2", "zstd", "bevy_render", "bevy_pbr", "bevy_gizmos"]} #bevy_webgl2 = "0.5" [dependencies.rapier] diff --git a/crates/rapier_testbed3d/Cargo.toml b/crates/rapier_testbed3d/Cargo.toml index b44b075..eed41c9 100644 --- a/crates/rapier_testbed3d/Cargo.toml +++ b/crates/rapier_testbed3d/Cargo.toml @@ -52,11 +52,11 @@ bevy_sprite = "0.11" # Dependencies for native only. [target.'cfg(not(target_arch = "wasm32"))'.dependencies] -bevy = {version = "0.11", default-features = false, features = ["bevy_winit", "x11"]} +bevy = {version = "0.11", default-features = false, features = ["bevy_winit", "x11", "tonemapping_luts", "ktx2", "zstd", "bevy_render", "bevy_pbr", "bevy_gizmos"]} # Dependencies for WASM only. [target.'cfg(target_arch = "wasm32")'.dependencies] -bevy = {version = "0.11", default-features = false, features = ["bevy_winit"]} +bevy = {version = "0.11", default-features = false, features = ["bevy_winit", "tonemapping_luts", "ktx2", "zstd", "bevy_render", "bevy_pbr", "bevy_gizmos"]} #bevy_webgl2 = "0.5" [dependencies.rapier] -- cgit From c57a0a3b888e8308ac8e659fbda1ef638df8fc1b Mon Sep 17 00:00:00 2001 From: Sébastien Crozet Date: Sat, 4 Nov 2023 18:11:47 +0100 Subject: Fix typo --- crates/rapier2d/Cargo.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'crates') diff --git a/crates/rapier2d/Cargo.toml b/crates/rapier2d/Cargo.toml index 9553750..0d8bc24 100644 --- a/crates/rapier2d/Cargo.toml +++ b/crates/rapier2d/Cargo.toml @@ -2,8 +2,8 @@ name = "rapier2d" version = "0.18.0" authors = [ "Sébastien Crozet " ] -description = "3-dimensional physics engine in Rust." -documentation = "https://docs.rs/rapier3d" +description = "2-dimensional physics engine in Rust." +documentation = "https://docs.rs/rapier2d" homepage = "https://rapier.rs" repository = "https://github.com/dimforge/rapier" readme = "README.md" -- cgit From 1886c6f362139d780596baa6a0d6208a2c49212f Mon Sep 17 00:00:00 2001 From: Sébastien Crozet Date: Sat, 4 Nov 2023 18:15:01 +0100 Subject: Leave the version bumps to another pr --- crates/rapier2d-f64/Cargo.toml | 2 +- crates/rapier2d/Cargo.toml | 2 +- crates/rapier3d-f64/Cargo.toml | 2 +- crates/rapier3d/Cargo.toml | 2 +- crates/rapier_testbed2d-f64/Cargo.toml | 2 +- crates/rapier_testbed2d/Cargo.toml | 2 +- crates/rapier_testbed3d-f64/Cargo.toml | 2 +- crates/rapier_testbed3d/Cargo.toml | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) (limited to 'crates') diff --git a/crates/rapier2d-f64/Cargo.toml b/crates/rapier2d-f64/Cargo.toml index 90ee6b5..3d88ee8 100644 --- a/crates/rapier2d-f64/Cargo.toml +++ b/crates/rapier2d-f64/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "rapier2d-f64" -version = "0.18.0" +version = "0.17.2" authors = [ "Sébastien Crozet " ] description = "2-dimensional physics engine in Rust." documentation = "https://docs.rs/rapier2d" diff --git a/crates/rapier2d/Cargo.toml b/crates/rapier2d/Cargo.toml index 0d8bc24..9d51771 100644 --- a/crates/rapier2d/Cargo.toml +++ b/crates/rapier2d/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "rapier2d" -version = "0.18.0" +version = "0.17.2" authors = [ "Sébastien Crozet " ] description = "2-dimensional physics engine in Rust." documentation = "https://docs.rs/rapier2d" diff --git a/crates/rapier3d-f64/Cargo.toml b/crates/rapier3d-f64/Cargo.toml index 12c71b7..bf8c984 100644 --- a/crates/rapier3d-f64/Cargo.toml +++ b/crates/rapier3d-f64/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "rapier3d-f64" -version = "0.18.0" +version = "0.17.2" authors = [ "Sébastien Crozet " ] description = "3-dimensional physics engine in Rust." documentation = "https://docs.rs/rapier3d" diff --git a/crates/rapier3d/Cargo.toml b/crates/rapier3d/Cargo.toml index 1d3605b..72903ff 100644 --- a/crates/rapier3d/Cargo.toml +++ b/crates/rapier3d/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "rapier3d" -version = "0.18.0" +version = "0.17.2" authors = [ "Sébastien Crozet " ] description = "3-dimensional physics engine in Rust." documentation = "https://docs.rs/rapier3d" diff --git a/crates/rapier_testbed2d-f64/Cargo.toml b/crates/rapier_testbed2d-f64/Cargo.toml index d906869..23bac9f 100644 --- a/crates/rapier_testbed2d-f64/Cargo.toml +++ b/crates/rapier_testbed2d-f64/Cargo.toml @@ -59,5 +59,5 @@ bevy = {version = "0.11", default-features = false, features = ["bevy_asset", "b [dependencies.rapier] package = "rapier2d-f64" path = "../rapier2d-f64" -version = "0.18.0" +version = "0.17.2" features = [ "serde-serialize", "debug-render", "profiler" ] diff --git a/crates/rapier_testbed2d/Cargo.toml b/crates/rapier_testbed2d/Cargo.toml index 8bf8b26..97fc6de 100644 --- a/crates/rapier_testbed2d/Cargo.toml +++ b/crates/rapier_testbed2d/Cargo.toml @@ -59,5 +59,5 @@ bevy = {version = "0.11", default-features = false, features = ["bevy_sprite", " [dependencies.rapier] package = "rapier2d" path = "../rapier2d" -version = "0.18.0" +version = "0.17.2" features = [ "serde-serialize", "debug-render", "profiler" ] diff --git a/crates/rapier_testbed3d-f64/Cargo.toml b/crates/rapier_testbed3d-f64/Cargo.toml index 0bfeefa..40ae54f 100644 --- a/crates/rapier_testbed3d-f64/Cargo.toml +++ b/crates/rapier_testbed3d-f64/Cargo.toml @@ -58,5 +58,5 @@ bevy = {version = "0.11", default-features = false, features = ["bevy_winit", "t [dependencies.rapier] package = "rapier3d-f64" path = "../rapier3d-f64" -version = "0.18.0" +version = "0.17.2" features = [ "serde-serialize", "debug-render", "profiler" ] diff --git a/crates/rapier_testbed3d/Cargo.toml b/crates/rapier_testbed3d/Cargo.toml index eed41c9..fc52bc3 100644 --- a/crates/rapier_testbed3d/Cargo.toml +++ b/crates/rapier_testbed3d/Cargo.toml @@ -62,5 +62,5 @@ bevy = {version = "0.11", default-features = false, features = ["bevy_winit", "t [dependencies.rapier] package = "rapier3d" path = "../rapier3d" -version = "0.18.0" +version = "0.17.2" features = [ "serde-serialize", "debug-render", "profiler" ] -- cgit