From 9dd504aebbaf9108d62f6a601f7e6e27b79d29b7 Mon Sep 17 00:00:00 2001 From: ghostlyzsh Date: Fri, 26 Apr 2024 12:06:47 -0500 Subject: [PATCH] stabilization iterations added --- Cargo.lock | 6 ++---- server/Cargo.toml | 2 +- server/config.toml | 1 + server/src/main.rs | 1 - 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 4d9ae53326c9882698867fab453c688800c30dc9..9f00dda3343d3fd748c13dab2ed00f0069495922 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -872,8 +872,7 @@ checksum = "ea003584000ef02b73800cc7cb62ee74792fff431e6a8df36863c43bf56fb491" [[package]] name = "bevy_rapier2d" version = "0.25.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc1f2ef2ae7fcf68ccb33f95c1dfc7c679bbc0e33b7f2e461353073065ff6e1e" +source = "git+https://github.com/ghostlyzsh/bevy_rapier.git#348c11dc7463a2c4b29c28cd118b4730c3d15035" dependencies = [ "bevy", "bitflags 2.5.0", @@ -3288,8 +3287,7 @@ checksum = "9c8a99fddc9f0ba0a85884b8d14e3592853e787d581ca1816c91349b10e4eeab" [[package]] name = "rapier2d" version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48a3ec4ae89e0837c0ff6f29af32a8e5d78dfabe2273dcd945cfaf3f5d2b1501" +source = "git+https://github.com/ghostlyzsh/rapier.git#0ac5a2906d4ffbfba346bf327ed91fac351e29aa" dependencies = [ "approx", "arrayvec", diff --git a/server/Cargo.toml b/server/Cargo.toml index c781e88ee9d83f0ab07231c32734dbb5715de7d9..2aa241d407798fdf306f3e88c0aa33652735ed64 100644 --- a/server/Cargo.toml +++ b/server/Cargo.toml @@ -8,7 +8,7 @@ license = "AGPL-3" bevy = { version = "0.13.1", default-features = false } serde = { version = "1", features = ["derive"] } serde_json = "1" -bevy_rapier2d = { version = "0.25", features = ["serde-serialize"] } +bevy_rapier2d = { git = "https://github.com/ghostlyzsh/bevy_rapier.git", features = ["serde-serialize"] } rand = "0.8.5" tracing-subscriber = "0.3" starkingdoms-common = { version = "0.1", path = "../starkingdoms-common" } diff --git a/server/config.toml b/server/config.toml index eaf31991c22aaa35bc55872bcdfe07e190aa0ed8..95f0e60f9496ef4cbff91e5d50a08ab4188eb514 100644 --- a/server/config.toml +++ b/server/config.toml @@ -12,6 +12,7 @@ prediction_distance = 0.002 num_solver_iterations = 4 num_additional_friction_iterations = 4 num_internal_pgs_iterations = 1 +num_stabilization_iterations = 16 min_island_size = 128 max_ccd_substeps = 1 diff --git a/server/src/main.rs b/server/src/main.rs index a15c14d9134f61021502d536c71a868220a71793..92933f40a40882175f350945933cdb8a73a829fe 100644 --- a/server/src/main.rs +++ b/server/src/main.rs @@ -1760,7 +1760,6 @@ fn on_close( }); } } - std::process::exit(0); } } }