Skip to content

Commit 2349ba7

Browse files
committed
fix 3d builds
1 parent 84ddde1 commit 2349ba7

7 files changed

+40
-44
lines changed

Cargo.lock

+26-26
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

+4-4
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,9 @@ publish = false
1010
crate-type = ["cdylib", "staticlib"]
1111

1212
[features]
13-
default = ["build2d", "test"]
13+
default = ["build3d", "test"]
1414
test = []
15+
function-logs = []
1516
build2d = ["single-dim2", "serde-serialize", "simd-stable"]
1617
build3d = ["single-dim3", "serde-serialize", "simd-stable"]
1718
build2d-f64 = ["double-dim2", "serde-serialize", "simd-stable"]
@@ -24,7 +25,7 @@ enhanced-determinism = ["rapier2d/enhanced-determinism", "rapier2d-f64/enhanced-
2425
serde-serialize = ["serde", "hashbrown/serde", "bincode", "serde_json", "godot/serde", "rapier2d/serde-serialize", "rapier2d-f64/serde-serialize", "rapier3d/serde-serialize", "rapier3d-f64/serde-serialize" ]
2526
simd-stable = ["rapier2d/simd-stable", "rapier2d-f64/simd-stable", "rapier3d/simd-stable", "rapier3d-f64/simd-stable"]
2627
simd-nightly = ["rapier2d/simd-nightly", "rapier2d-f64/simd-nightly", "rapier3d/simd-nightly", "rapier3d-f64/simd-nightly"]
27-
parallel = ["rapier2d/parallel", "rapier2d-f64/parallel", "rapier3d/parallel", "rapier3d-f64/parallel"]
28+
parallel = ["rapier2d/parallel", "rapier2d-f64/parallel", "rapier3d/parallel", "rapier3d-f64/parallel", "experimental-threads"]
2829
experimental-wasm-nothreads = ["godot/experimental-wasm-nothreads", "godot/lazy-function-tables"]
2930
experimental-wasm = ["godot/experimental-wasm", "godot/lazy-function-tables"]
3031
experimental-threads = ["godot/experimental-threads"]
@@ -63,8 +64,7 @@ parry3d = {git = "https://github.com/ughuuu/parry", branch = "custom-changes"}
6364
parry3d-f64 = {git = "https://github.com/ughuuu/parry", branch = "custom-changes"}
6465

6566
[profile.release]
66-
#opt-level = 3
67-
opt-level = "z"
67+
opt-level = 3
6868
#debug = 2
6969
strip = "debuginfo"
7070
lto = "fat"

scripts/build-dev-2d-f64.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ cargo clippy --fix --allow-dirty
33
export GODOT4_BIN=godot
44
export LLVM_PATH=/opt/homebrew/opt/llvm/bin
55
if [ "${OSTYPE#darwin}" != "$OSTYPE" ]; then
6-
cargo build --features="build2d-f64,test" --no-default-features
6+
cargo build --features="build2d-f64,test,parallel" --no-default-features
77
echo "Running on macOS"
88
rm -f bin2d/addons/godot-rapier2d/bin/libgodot_rapier.macos.framework/libgodot_rapier.macos.dylib
99
cp target/debug/libgodot_rapier.dylib bin2d/addons/godot-rapier2d/bin/libgodot_rapier.macos.framework/libgodot_rapier.macos.dylib

scripts/build-dev-2d.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
cargo fmt -- --config-path rustfmt.toml
22
cargo clippy --fix --allow-dirty
33
if [ "${OSTYPE#darwin}" != "$OSTYPE" ]; then
4-
cargo build --features="build2d,test" --no-default-features --verbose
4+
cargo build --features="build2d,test" --no-default-features # --verbose
55
echo "Running on macOS"
66
rm -f bin2d/addons/godot-rapier2d/bin/libgodot_rapier.macos.framework/libgodot_rapier.macos.dylib
77
cp target/debug/libgodot_rapier.dylib bin2d/addons/godot-rapier2d/bin/libgodot_rapier.macos.framework/libgodot_rapier.macos.dylib

scripts/build-rel-2d.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
cargo fmt -- --config-path rustfmt.toml
22
cargo clippy --fix --allow-dirty
3-
cargo build --release --features="single-dim2,simd-stable,serde-serialize" --no-default-features
3+
cargo build --release --features="single-dim2,simd-stable,serde-serialize,parallel" --no-default-features
44
rm bin2d/addons/godot-rapier2d/bin/libgodot_rapier.macos.framework/libgodot_rapier.macos.dylib
55
rm /Users/dragosdaian/Documents/Godot-Physics-Tests/addons/godot-rapier2d/bin/libgodot_rapier.macos.framework/libgodot_rapier.macos.dylib
66
cp target/release/libgodot_rapier.dylib bin2d/addons/godot-rapier2d/bin/libgodot_rapier.macos.framework/libgodot_rapier.macos.dylib

src/bodies/rapier_collision_object_base.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -94,17 +94,17 @@ impl RapierCollisionObjectBase {
9494
}
9595
let project_settings = ProjectSettings::singleton();
9696
let activation_angular_threshold = project_settings
97-
.get_setting_with_override(SLEEP_THRESHOLD_ANGULAR.into())
97+
.get_setting_with_override(SLEEP_THRESHOLD_ANGULAR)
9898
.try_to()
9999
.unwrap_or_default();
100100
let length_unit = RapierProjectSettings::get_length_unit();
101101
let mut activation_linear_threshold = project_settings
102-
.get_setting_with_override(SLEEP_THRESHOLD_LINEAR.into())
102+
.get_setting_with_override(SLEEP_THRESHOLD_LINEAR)
103103
.try_to()
104104
.unwrap_or_default();
105105
activation_linear_threshold /= length_unit;
106106
let activation_time_until_sleep = project_settings
107-
.get_setting_with_override(TIME_BEFORE_SLEEP.into())
107+
.get_setting_with_override(TIME_BEFORE_SLEEP)
108108
.try_to()
109109
.unwrap_or_default();
110110
Self {

src/servers/mod.rs

+4-8
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ pub fn register_server() {
3131
let mut manager = PhysicsServer3DManager::singleton();
3232
let factory =
3333
crate::servers::rapier_physics_server_3d::RapierPhysicsServerFactory3D::new_alloc();
34-
manager.register_server("Rapier3D", factory.callable("create_server"));
34+
manager.register_server("Rapier3D", &factory.callable("create_server"));
3535
}
3636
#[cfg(feature = "dim2")]
3737
fn print_version() {
@@ -63,19 +63,15 @@ fn print_version() {
6363
#[cfg(feature = "dim3")]
6464
fn print_version() {
6565
let mut config_file = ConfigFile::new_gd();
66-
let err = config_file
67-
.load(GString::from_str("res://addons/godot-rapier3d/plugin.info.cfg").unwrap_or_default());
66+
let err = config_file.load("res://addons/godot-rapier3d/plugin.info.cfg");
6867
if err != global::Error::OK {
6968
godot_error!("Error loading plugin.info.cfg: {:?}", err);
7069
return;
7170
}
72-
let version = config_file.get_value(
73-
GString::from_str("plugin").unwrap_or_default(),
74-
GString::from_str("version").unwrap_or_default(),
75-
);
71+
let version = config_file.get_value("plugin", "version");
7672
let project_settings = ProjectSettings::singleton();
7773
let physics_engine: String = project_settings
78-
.get_setting(GString::from_str("physics/3d/physics_engine").unwrap_or_default())
74+
.get_setting("physics/3d/physics_engine")
7975
.try_to()
8076
.unwrap_or_default();
8177
if physics_engine != "Rapier3D" {

0 commit comments

Comments
 (0)