Merge branch 'main' into fix-double-builds

appsinacup · Oct 31, 2024 · ed5860f · ed5860f
2 parents ab48ba9 + b586afa
commit ed5860f
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 14 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## v0.8.8
+
+- Fix points getting removed and empty points warning.
+
 ## v0.8.7
 
 - Update state reload test. Also add gdlint to ghactions step.

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -10,7 +10,7 @@ publish = false
 crate-type = ["cdylib"]
 
 [features]
-default = ["build2d-f64", "test"]
+default = ["build2d", "test"]
 test = []
 build2d = ["single-dim2", "serde-serialize", "simd-stable"]
 build3d = ["single-dim3", "serde-serialize", "simd-stable"]

diff --git a/bin2d/addons/godot-rapier2d/plugin.info.cfg b/bin2d/addons/godot-rapier2d/plugin.info.cfg
@@ -3,6 +3,6 @@
 name="Godot Rapier 2D"
 description="A 2D and 3D drop-in replacement for the Godot engine that adds stability and fluids."
 author="appsinacup"
-version="0.8.7"
+version="0.8.8"
 flavour="<flavour>"
 script=""
diff --git a/bin3d/addons/godot-rapier3d/plugin.info.cfg b/bin3d/addons/godot-rapier3d/plugin.info.cfg
@@ -3,6 +3,6 @@
 name="Godot Rapier 3D"
 description="A 2D and 3D drop-in replacement for the Godot engine that adds stability and fluids."
 author="appsinacup"
-version="0.8.7"
+version="0.8.8"
 flavour="<flavour>"
 script=""
diff --git a/src/bodies/rapier_body.rs b/src/bodies/rapier_body.rs
@@ -411,7 +411,6 @@ impl RapierBody {
         } else {
             self.axis_lock & (!axis.ord() as u8)
         };
-        #[cfg(feature = "dim3")]
         self.apply_axis_lock(physics_engine);
     }
 
@@ -420,11 +419,6 @@ impl RapierBody {
         if !self.base.is_valid() {
             return;
         }
-        if self.base.mode == BodyMode::RIGID_LINEAR {
-            self.axis_lock |= LockedAxes::ROTATION_LOCKED.bits();
-        } else {
-            self.axis_lock &= !LockedAxes::ROTATION_LOCKED.bits();
-        }
         if let Some(axis_lock) = LockedAxes::from_bits(self.axis_lock) {
             physics_engine.body_set_axis_lock(
                 self.base.get_space_id(),

diff --git a/src/rapier_wrapper/shape.rs b/src/rapier_wrapper/shape.rs
@@ -64,7 +64,7 @@ impl PhysicsEngine {
         handle: ShapeHandle,
     ) {
         let points_vec = point_array_to_vec(points);
-        if let Some(shape_data) = SharedShape::convex_polyline(points_vec) {
+        if let Some(shape_data) = SharedShape::convex_polyline_from_points_raw(points_vec) {
             self.insert_shape(shape_data, handle)
         }
     }