Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to bevy 0.14 #59

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Update to bevy 0.14 #59

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b98b3fd
update bevy 0.14 + fix some warnings
Vrixyz Aug 26, 2024
8ec386d
rely on github rather than local path
Vrixyz Sep 9, 2024
c04e6a9
Merge remote-tracking branch 'upstream' into update-testbed-bevy_0.14
Vrixyz Sep 9, 2024
9b09a1c
Merge branch 'master' into update-testbed-bevy_0.14
Vrixyz Nov 22, 2024
f972eb8
pin rev dependency + remove obsolete wasm feature
Vrixyz Jan 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 24 additions & 24 deletions .github/workflows/salva-ci-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,17 @@ name: Salva CI build

on:
push:
branches: [ master ]
pull_request:
branches: [ master ]
branches: [master]
pull_request:
branches: [master]

jobs:
check-fmt:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Check formatting
run: cargo fmt -- --check
- uses: actions/checkout@v2
- name: Check formatting
run: cargo fmt -- --check
build-native:
runs-on: ubuntu-latest
env:
Expand All @@ -22,10 +22,10 @@ jobs:
package: [salva2d, salva3d]
feature: [default, parallel, sampling, parry, rapier, rapier-testbed]
steps:
- uses: actions/checkout@v2
- run: sudo apt-get install -y cmake libxcb-composite0-dev
- name: build ${{ matrix.package }} --features ${{ matrix.feature }}
run: cargo build --verbose -p ${{ matrix.package }} --features ${{ matrix.feature }}
- uses: actions/checkout@v2
- run: sudo apt-get install -y cmake libxcb-composite0-dev
- name: build ${{ matrix.package }} --features ${{ matrix.feature }}
run: cargo build --verbose -p ${{ matrix.package }} --features ${{ matrix.feature }}
all-features-native:
runs-on: ubuntu-latest
env:
Expand All @@ -34,10 +34,10 @@ jobs:
matrix:
package: [salva2d, salva3d]
steps:
- uses: actions/checkout@v2
- run: sudo apt-get install -y cmake
- name: build ${{ matrix.package }} --all-features
run: cargo build --verbose -p ${{ matrix.package }} --all-features
- uses: actions/checkout@v2
- run: sudo apt-get install -y cmake
- name: build ${{ matrix.package }} --all-features
run: cargo build --verbose -p ${{ matrix.package }} --all-features
test-native:
runs-on: ubuntu-latest
env:
Expand All @@ -46,10 +46,10 @@ jobs:
matrix:
package: [salva2d, salva3d]
steps:
- uses: actions/checkout@v2
- run: sudo apt-get install -y cmake
- name: test ${{ matrix.package }}
run: cargo test --verbose -p ${{ matrix.package }}
- uses: actions/checkout@v2
- run: sudo apt-get install -y cmake
- name: test ${{ matrix.package }}
run: cargo test --verbose -p ${{ matrix.package }}
examples-native:
runs-on: ubuntu-latest
env:
Expand All @@ -59,22 +59,22 @@ jobs:
package: [examples2d, examples3d]
feature: [default, parallel]
steps:
- uses: actions/checkout@v2
- run: sudo apt-get install -y cmake libxcb-composite0-dev libx11-dev libasound2-dev libudev-dev
- name: build ${{ matrix.package }} --features ${{ matrix.feature }}
run: cargo build --verbose -p ${{ matrix.package }} --features ${{ matrix.feature }}
- uses: actions/checkout@v2
- run: sudo apt-get install -y cmake libxcb-composite0-dev libx11-dev libasound2-dev libudev-dev
- name: build ${{ matrix.package }} --features ${{ matrix.feature }}
run: cargo build --verbose -p ${{ matrix.package }} --features ${{ matrix.feature }}
build-wasm:
runs-on: ubuntu-latest
env:
RUSTFLAGS: -D warnings
strategy:
matrix:
package: [salva2d, salva3d]
package: [salva2d, salva3d]
steps:
- uses: actions/checkout@v2
- run: rustup target add wasm32-unknown-unknown
- name: wasm build ${{ matrix.package }}
run: cargo build -p ${{ matrix.package }} --verbose --features wasm-bindgen --target wasm32-unknown-unknown;
run: cargo build -p ${{ matrix.package }} --verbose --target wasm32-unknown-unknown;
# build-wasm-emscripten:
# runs-on: ubuntu-latest
# env:
Expand Down
16 changes: 8 additions & 8 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,17 +22,17 @@ salva3d = { path = "./build/salva3d" }
#rapier_testbed2d = { git = "https://github.com/dimforge/rapier", branch = "split_geom" }
#rapier_testbed3d = { git = "https://github.com/dimforge/rapier", branch = "split_geom" }

#rapier2d = { git = "https://github.com/dimforge/rapier" }
#rapier3d = { git = "https://github.com/dimforge/rapier" }
#rapier_testbed2d = { git = "https://github.com/dimforge/rapier" }
#rapier_testbed3d = { git = "https://github.com/dimforge/rapier" }
rapier2d = { git = "https://github.com/dimforge/rapier", rev = "cf77b5bf574f8363794f979510deec5c08e58401" }
rapier3d = { git = "https://github.com/dimforge/rapier", rev = "cf77b5bf574f8363794f979510deec5c08e58401" }
rapier_testbed2d = { git = "https://github.com/dimforge/rapier", rev = "cf77b5bf574f8363794f979510deec5c08e58401" }
rapier_testbed3d = { git = "https://github.com/dimforge/rapier", rev = "cf77b5bf574f8363794f979510deec5c08e58401" }

# rapier2d = { git = "https://github.com/dimforge/rapier", rev = "3b0d256" }
# rapier3d = { git = "https://github.com/dimforge/rapier", rev = "3b0d256" }
# rapier_testbed2d = { git = "https://github.com/dimforge/rapier", rev = "3b0d256" }
# rapier_testbed3d = { git = "https://github.com/dimforge/rapier", rev = "3b0d256" }

# rapier2d = { path = "../rapier/build/rapier2d" }
# rapier3d = { path = "../rapier/build/rapier3d" }
# rapier_testbed2d = { path = "../rapier/build/rapier_testbed2d" }
# rapier_testbed3d = { path = "../rapier/build/rapier_testbed3d" }
# rapier2d = { path = "../rapier/crates/rapier2d" }
# rapier3d = { path = "../rapier/crates/rapier3d" }
# rapier_testbed2d = { path = "../rapier/crates/rapier_testbed2d" }
# rapier_testbed3d = { path = "../rapier/crates/rapier_testbed3d" }
23 changes: 11 additions & 12 deletions build/salva2d/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,11 @@ keywords = ["physics", "dynamics", "particles", "fluids", "SPH"]
license = "Apache-2.0"
edition = "2021"

[lints]
rust.unexpected_cfgs = { level = "warn", check-cfg = [
'cfg(feature, values("dim3"))',
] }

[badges]
maintenance = { status = "actively-developed" }

Expand All @@ -30,14 +35,8 @@ rapier = ["parry", "rapier2d"]
rapier-testbed = ["rapier", "rapier_testbed2d", "graphics"]
rapier-harness = ["rapier-testbed"]
parry = ["parry2d"]
wasm-bindgen = ["rapier2d/wasm-bindgen"]
graphics = ["bevy", "bevy_egui"]

[lints]
rust.unexpected_cfgs = { level = "warn", check-cfg = [
'cfg(feature, values("dim3"))',
] }

[lib]
name = "salva2d"
path = "../../src/lib.rs"
Expand All @@ -53,23 +52,23 @@ instant = { version = "0.1", features = ["now"] }
rayon = { version = "1.8", optional = true }

nalgebra = "0.33"
parry2d = { version = "0.16", optional = true }
rapier2d = { version = "0.21", optional = true }
rapier_testbed2d = { version = "0.21", optional = true }
parry2d = { version = "0.17", optional = true }
rapier2d = { version = "0.22", optional = true }
rapier_testbed2d = { version = "0.22", optional = true }

bevy_egui = { version = "0.26", features = ["immutable_ctx"], optional = true }
bevy_egui = { version = "0.29", features = ["immutable_ctx"], optional = true }
bitflags = "2"

[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
bevy = { version = "0.13.2", default-features = false, features = [
bevy = { version = "0.14", default-features = false, features = [
"bevy_winit",
"bevy_render",
"x11",
], optional = true }

# Dependencies for WASM only.
[target.'cfg(target_arch = "wasm32")'.dependencies]
bevy = { version = "0.13", default-features = false, features = [
bevy = { version = "0.14", default-features = false, features = [
"bevy_winit",
"bevy_render",
], optional = true }
13 changes: 6 additions & 7 deletions build/salva3d/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ sampling = ["rapier"]
rapier-testbed = ["rapier", "rapier_testbed3d", "graphics"]
rapier-harness = ["rapier-testbed"]
parry = ["parry3d"]
wasm-bindgen = ["rapier3d/wasm-bindgen"]
graphics = ["bevy", "bevy_egui"]

[lib]
Expand All @@ -43,23 +42,23 @@ instant = { version = "0.1", features = ["now"] }
rayon = { version = "1.8", optional = true }

nalgebra = "0.33"
parry3d = { version = "0.16", optional = true }
rapier3d = { version = "0.21", optional = true }
rapier_testbed3d = { version = "0.21", optional = true }
parry3d = { version = "0.17", optional = true }
rapier3d = { version = "0.22", optional = true }
rapier_testbed3d = { version = "0.22", optional = true }

bevy_egui = { version = "0.26", features = ["immutable_ctx"], optional = true }
bevy_egui = { version = "0.29", features = ["immutable_ctx"], optional = true }
bitflags = "2.6.0"

[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
bevy = { version = "0.13", default-features = false, features = [
bevy = { version = "0.14", default-features = false, features = [
"bevy_winit",
"bevy_render",
"x11",
], optional = true }

# Dependencies for WASM only.
[target.'cfg(target_arch = "wasm32")'.dependencies]
bevy = { version = "0.13", default-features = false, features = [
bevy = { version = "0.14", default-features = false, features = [
"bevy_winit",
"bevy_render",
], optional = true }
25 changes: 11 additions & 14 deletions examples2d/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,35 +1,32 @@
[package]
name = "examples2d"
name = "examples2d"
version = "0.1.0"
authors = [ "Sébastien Crozet <[email protected]>" ]
authors = ["Sébastien Crozet <[email protected]>"]
edition = "2018"

[features]
default = []
parallel = [ "rapier_testbed2d/parallel"]
parallel = ["rapier_testbed2d/parallel"]

[dependencies]
Inflector = "0.11"
nalgebra = "0.33"
parry2d = "0.16"
rapier2d = "0.21"
rapier_testbed2d = "0.21"
parry3d = "0.16"
bevy = "0.13.2"
Inflector = "0.11"
nalgebra = "0.33"
parry2d = "0.17"
rapier2d = "0.22"
rapier_testbed2d = "0.22"
parry3d = "0.17"
bevy = "0.14"

[dependencies.salva2d]
path = "../build/salva2d"
features = [ "rapier", "rapier-testbed", "sampling" ]
features = ["rapier", "rapier-testbed", "sampling"]

[target.wasm32-unknown-unknown.dependencies]
stdweb = "0.4"

[target.wasm32-unknown-emscripten.dependencies]
stdweb = "0.4"

[target.asmjs-unknown-emscripten.dependencies]
stdweb = "0.4"

[[bin]]
name = "all_examples2"
path = "./all_examples2.rs"
20 changes: 10 additions & 10 deletions examples3d/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
[package]
name = "examples3d"
name = "examples3d"
version = "0.1.0"
authors = [ "Sébastien Crozet <[email protected]>" ]
authors = ["Sébastien Crozet <[email protected]>"]
edition = "2018"

[features]
default = []
parallel = [ "rapier_testbed3d/parallel", "salva3d/parallel"]
parallel = ["rapier_testbed3d/parallel", "salva3d/parallel"]

[dependencies]
num-traits = "0.2"
Inflector = "0.11"
nalgebra = "0.33"
rapier3d = "0.21"
rapier_testbed3d = "0.21"
parry3d = "0.16"
bevy = "0.13.2"
Inflector = "0.11"
nalgebra = "0.33"
rapier3d = "0.22"
rapier_testbed3d = "0.22"
parry3d = "0.17"
bevy = "0.14"

[dependencies.salva3d]
path = "../build/salva3d"
features = [ "rapier", "rapier-testbed", "sampling", "rapier-harness" ]
features = ["rapier", "rapier-testbed", "sampling", "rapier-harness"]

[target.wasm32-unknown-unknown.dependencies]
stdweb = "0.4"
Expand Down
2 changes: 1 addition & 1 deletion src/integrations/rapier/fluids_pipeline.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ impl ColliderCouplingSet {
&'a mut self,
colliders: &'a ColliderSet,
bodies: &'a mut RigidBodySet,
) -> ColliderCouplingManager {
) -> ColliderCouplingManager<'a> {
ColliderCouplingManager {
coupling: self,
colliders,
Expand Down
Loading