fix 3d builds

Author: Ughuuu

Cargo.lock

@@ -10,8 +10,9 @@ publish = false
 crate-type = ["cdylib", "staticlib"]
 
 [features]
-default = ["build2d", "test"]
+default = ["build3d", "test"]
 test = []
+function-logs = []
 build2d = ["single-dim2", "serde-serialize", "simd-stable"]
 build3d = ["single-dim3", "serde-serialize", "simd-stable"]
 build2d-f64 = ["double-dim2", "serde-serialize", "simd-stable"]
@@ -24,7 +25,7 @@ enhanced-determinism = ["rapier2d/enhanced-determinism", "rapier2d-f64/enhanced-
 serde-serialize = ["serde", "hashbrown/serde", "bincode", "serde_json", "godot/serde", "rapier2d/serde-serialize", "rapier2d-f64/serde-serialize", "rapier3d/serde-serialize", "rapier3d-f64/serde-serialize" ]
 simd-stable = ["rapier2d/simd-stable", "rapier2d-f64/simd-stable", "rapier3d/simd-stable", "rapier3d-f64/simd-stable"]
 simd-nightly = ["rapier2d/simd-nightly", "rapier2d-f64/simd-nightly", "rapier3d/simd-nightly", "rapier3d-f64/simd-nightly"]
-parallel = ["rapier2d/parallel", "rapier2d-f64/parallel", "rapier3d/parallel", "rapier3d-f64/parallel"]
+parallel = ["rapier2d/parallel", "rapier2d-f64/parallel", "rapier3d/parallel", "rapier3d-f64/parallel", "experimental-threads"]
 experimental-wasm-nothreads = ["godot/experimental-wasm-nothreads", "godot/lazy-function-tables"]
 experimental-wasm = ["godot/experimental-wasm", "godot/lazy-function-tables"]
 experimental-threads = ["godot/experimental-threads"]
@@ -63,8 +64,7 @@ parry3d = {git = "https://github.com/ughuuu/parry", branch = "custom-changes"}
 parry3d-f64 = {git = "https://github.com/ughuuu/parry", branch = "custom-changes"}
 
 [profile.release]
-#opt-level = 3
-opt-level = "z"
+opt-level = 3
 #debug = 2
 strip = "debuginfo"
 lto = "fat"

Cargo.toml

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

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

@@ -1,7 +1,7 @@
 cargo fmt -- --config-path rustfmt.toml
 cargo clippy --fix --allow-dirty
 if [ "${OSTYPE#darwin}" != "$OSTYPE" ]; then
-    cargo build --features="build2d,test" --no-default-features --verbose
+    cargo build --features="build2d,test" --no-default-features # --verbose
     echo "Running on macOS"
     rm -f bin2d/addons/godot-rapier2d/bin/libgodot_rapier.macos.framework/libgodot_rapier.macos.dylib
     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,6 +1,6 @@
 cargo fmt -- --config-path rustfmt.toml
 cargo clippy --fix --allow-dirty
-cargo build --release --features="single-dim2,simd-stable,serde-serialize" --no-default-features
+cargo build --release --features="single-dim2,simd-stable,serde-serialize,parallel" --no-default-features
 rm bin2d/addons/godot-rapier2d/bin/libgodot_rapier.macos.framework/libgodot_rapier.macos.dylib
 rm /Users/dragosdaian/Documents/Godot-Physics-Tests/addons/godot-rapier2d/bin/libgodot_rapier.macos.framework/libgodot_rapier.macos.dylib
 cp target/release/libgodot_rapier.dylib bin2d/addons/godot-rapier2d/bin/libgodot_rapier.macos.framework/libgodot_rapier.macos.dylib

scripts/build-rel-2d.sh

@@ -94,17 +94,17 @@ impl RapierCollisionObjectBase {
         }
         let project_settings = ProjectSettings::singleton();
         let activation_angular_threshold = project_settings
-            .get_setting_with_override(SLEEP_THRESHOLD_ANGULAR.into())
+            .get_setting_with_override(SLEEP_THRESHOLD_ANGULAR)
             .try_to()
             .unwrap_or_default();
         let length_unit = RapierProjectSettings::get_length_unit();
         let mut activation_linear_threshold = project_settings
-            .get_setting_with_override(SLEEP_THRESHOLD_LINEAR.into())
+            .get_setting_with_override(SLEEP_THRESHOLD_LINEAR)
             .try_to()
             .unwrap_or_default();
         activation_linear_threshold /= length_unit;
         let activation_time_until_sleep = project_settings
-            .get_setting_with_override(TIME_BEFORE_SLEEP.into())
+            .get_setting_with_override(TIME_BEFORE_SLEEP)
             .try_to()
             .unwrap_or_default();
         Self {

src/bodies/rapier_collision_object_base.rs

@@ -31,7 +31,7 @@ pub fn register_server() {
     let mut manager = PhysicsServer3DManager::singleton();
     let factory =
         crate::servers::rapier_physics_server_3d::RapierPhysicsServerFactory3D::new_alloc();
-    manager.register_server("Rapier3D", factory.callable("create_server"));
+    manager.register_server("Rapier3D", &factory.callable("create_server"));
 }
 #[cfg(feature = "dim2")]
 fn print_version() {
@@ -63,19 +63,15 @@ fn print_version() {
 #[cfg(feature = "dim3")]
 fn print_version() {
     let mut config_file = ConfigFile::new_gd();
-    let err = config_file
-        .load(GString::from_str("res://addons/godot-rapier3d/plugin.info.cfg").unwrap_or_default());
+    let err = config_file.load("res://addons/godot-rapier3d/plugin.info.cfg");
     if err != global::Error::OK {
         godot_error!("Error loading plugin.info.cfg: {:?}", err);
         return;
     }
-    let version = config_file.get_value(
-        GString::from_str("plugin").unwrap_or_default(),
-        GString::from_str("version").unwrap_or_default(),
-    );
+    let version = config_file.get_value("plugin", "version");
     let project_settings = ProjectSettings::singleton();
     let physics_engine: String = project_settings
-        .get_setting(GString::from_str("physics/3d/physics_engine").unwrap_or_default())
+        .get_setting("physics/3d/physics_engine")
         .try_to()
         .unwrap_or_default();
     if physics_engine != "Rapier3D" {