feat: add support for bevy 0.8 (#27)

Author: jcornaz

.github/workflows/build.yml

@@ -9,7 +9,7 @@ on:
   workflow_dispatch:
 
 env:
-  RUST_VERSION: 1.58.1
+  RUST_VERSION: 1.62.0
 
 jobs:
   test:
@@ -28,29 +28,25 @@ jobs:
           profile: minimal
           target: thumbv6m-none-eabi
 
-      - run: cargo update -p async-global-executor --precise 2.0.4
       - run: cargo check --all-targets
 
       - name: Check no_std
         run: cargo check --no-default-features --target thumbv6m-none-eabi
 
       - run: cargo test --no-default-features
+      - run: cargo test
       - run: cargo test --no-default-features --features std
+      - run: cargo test --no-default-features --features bvh-arena
+      - run: cargo test --no-default-features --features bevy-transform-08
+      - run: cargo test --no-default-features --features bevy-ecs-08
+      - run: cargo test --no-default-features --features bevy-08
       - run: cargo test --no-default-features --features bevy-transform-07
       - run: cargo test --no-default-features --features bevy-ecs-07
       - run: cargo test --no-default-features --features bevy-07
       - run: cargo test --no-default-features --features bevy-transform-06
       - run: cargo test --no-default-features --features bevy-ecs-06
       - run: cargo test --no-default-features --features bevy-06
-      - run: cargo test
-      - run: cargo test --features bevy-transform-07
-      - run: cargo test --features bevy-ecs-07
-      - run: cargo test --features bevy-07
-      - run: cargo test --features bevy-transform-06
-      - run: cargo test --features bevy-ecs-06
-      - run: cargo test --features bevy-06
       - run: cargo test --all-features
-      - run: cargo test --all-features -- --ignored
 
   code-style:
     runs-on: ubuntu-latest

Cargo.toml

@@ -4,7 +4,7 @@ version = "1.4.0"
 license = "Unlicense"
 authors = ["Jonathan Cornaz"]
 edition = "2021"
-rust-version = "1.58"
+rust-version = "1.62"
 description = "2d collision test for arbitrary convex shapes"
 repository = "https://github.com/jcornaz/impacted"
 categories = ["game-development"]
@@ -16,16 +16,27 @@ all-features = true
 [features]
 default = ["std"]
 std = ["glam/std", "thiserror"]
-bevy-06 = ["bevy-transform-06", "bevy-ecs-06"]
+bevy-08 = ["bevy-transform-08", "bevy-ecs-08"]
+bevy-transform-08 = ["dep:bevy-transform-08", "bevy-math-08"]
 bevy-07 = ["bevy-transform-07", "bevy-ecs-07"]
+bevy-06 = ["bevy-transform-06", "bevy-ecs-06"]
 
 [dependencies]
 # Public
-bevy-transform-06 = { package = "bevy_transform", version = "0.6.0", default-features = false, optional = true }
+bvh-arena = { version = "1.1", default-features = false, optional = true }
+
+## Bevy 0.8
+bevy-ecs-08 = { package = "bevy_ecs", version = "0.8.0", default-features = false, optional = true }
+bevy-transform-08 = { package = "bevy_transform", version = "0.8.0", default-features = false, optional = true }
+bevy-math-08 = { package = "bevy_math", version = "0.8.0", default-features = false, optional = true }
+
+## Bevy 0.7
+bevy-ecs-07 = { package = "bevy_ecs", version = "0.7.0", default-features = false, optional = true }
 bevy-transform-07 = { package = "bevy_transform", version = "0.7.0", default-features = false, optional = true }
+
+## Bevy 0.6
 bevy-ecs-06 = { package = "bevy_ecs", version = "0.6.0", default-features = false, optional = true }
-bevy-ecs-07 = { package = "bevy_ecs", version = "0.7.0", default-features = false, optional = true }
-bvh-arena = { version = "1.1", default-features = false, optional = true }
+bevy-transform-06 = { package = "bevy_transform", version = "0.6.0", default-features = false, optional = true }
 
 # Private
 glam = { version = "0.20.5", default-features = false, features = ["libm"] }
@@ -34,7 +45,7 @@ smallvec = { version = "1.9", default-features = false }
 
 [dev-dependencies]
 rstest = "0.13.0"
-bevy = { version = "0.7.0", default-features = false, features = ["bevy_winit", "render", "x11"]}
+bevy = { version = "0.8.0", default-features = false, features = ["bevy_winit", "render", "x11"]}
 glam = { version = "0.20.5", default-features = false, features = ["libm", "approx"] }
 approx = "0.5.1"
 
@@ -43,4 +54,4 @@ rustc_version = "0.4.0"
 
 [[example]]
 name = "bevy"
-required-features = ["bevy-07"]
+required-features = ["bevy-08"]

README.md

@@ -72,19 +72,25 @@ impacted = { version = "1", features = ["bevy-07"] }
 
 ## Cargo features
 
-* `std` (enabled by default) Allow to use the standard library (need to be disabled for `no_std` crates)
-* `bvh-arena` Interoperability with [bvh-arena](https://crates.io/crates/bvh-arena) bounding volumes
-* `bevy-07` All [bevy](https://bevyengine.org) 0.7 interop (alias for `["bevy-transform-07", "bevy-ecs-07"]`)
-* `bevy-06` All [bevy](https://bevyengine.org) 0.6 interop (alias for `["bevy-transform-06", "bevy-ecs-06"]`)
-* `bevy-transform-07` Interoperability with [bevy_transform](https://crates.io/crates/bevy_transform) 0.7
-* `bevy-transform-06` Interoperability with [bevy_transform](https://crates.io/crates/bevy_transform) 0.6
-* `bevy-ecs-07` Interoperability with [bevy_ecs](https://crates.io/crates/bevy_ecs) 0.7
-* `bevy-ecs-06` Interoperability with [bevy_ecs](https://crates.io/crates/bevy_ecs) 0.6
-
+| Feature             | Description                                                                       |
+|---------------------|-----------------------------------------------------------------------------------|
+| `std` (default)     | Allow to use rust the standard library (need to be disabled for `no_std` crates)  |
+| `bvh-arena`         | Integration with [bvh-arena](https://crates.io/crates/bvh-arena) bounding volumes |
+| `bevy-ecs-08`       | Integration with [bevy_ecs](https://crates.io/crates/bevy_ecs) 0.8                |
+| `bevy-transform-08` | Integration with [bevy_transform](https://crates.io/crates/bevy_transform) 0.8    |
+| `bevy-08`           | All bevy 0.8 integrations (alias for `["bevy-ecs-08", "bevy-transform-08"]`)      |
+| `bevy-ecs-07`       | Integration with [bevy_ecs](https://crates.io/crates/bevy_ecs) 0.7                |
+| `bevy-transform-07` | Integration with [bevy_transform](https://crates.io/crates/bevy_transform) 0.7    |
+| `bevy-07`           | All bevy 0.7 integrations (alias for `["bevy-ecs-07", "bevy-transform-07"]`)      |
+| `bevy-ecs-06`       | Integration with [bevy_ecs](https://crates.io/crates/bevy_ecs) 0.6                |
+| `bevy-transform-06` | Integration with [bevy_transform](https://crates.io/crates/bevy_transform) 0.6    |
+| `bevy-06`           | All bevy 0.6 integrations (alias for `["bevy-ecs-06", "bevy-transform-06"]`)      |
+
+*Feature flags not listed in the table above are not part of the public API and are subject to breaking changes*
 
 ## MSRV
 
-The minimum supported rust version is currently: `1.58`
+The minimum supported rust version is currently: `1.62`
 
 It may be increased to a newer stable version in a minor release.
 

deny.toml

@@ -12,11 +12,13 @@ copyleft = "deny"
 allow = [
   "Unlicense",
   "MIT",
+  "MIT-0",
   "Apache-2.0",
   "Zlib",
   "BSD-3-Clause",
   "CC0-1.0",
   "ISC",
+  "Unicode-DFS-2016",
 ]
 
 

examples/bevy.rs

@@ -1,6 +1,5 @@
 use std::f32::consts;
 
-use bevy::input::system::exit_on_esc_system;
 use bevy::prelude::*;
 use bevy::transform::TransformSystem;
 
@@ -16,7 +15,6 @@ fn main() {
         .add_plugins(DefaultPlugins)
         .add_startup_system(startup)
         .add_system(control_shape)
-        .add_system(exit_on_esc_system)
         // Collision detection
         .add_system_to_stage(
             CoreStage::PostUpdate,
@@ -30,7 +28,7 @@ fn main() {
 /// Initialize the "game"
 fn startup(mut commands: Commands) {
     // Camera
-    commands.spawn_bundle(OrthographicCameraBundle::new_2d());
+    commands.spawn_bundle(Camera2dBundle::default());
 
     // Left shape (controlled)
     commands

src/lib.rs

@@ -186,3 +186,8 @@ impl bevy_ecs_06::prelude::Component for CollisionShape {
 impl bevy_ecs_07::prelude::Component for CollisionShape {
     type Storage = bevy_ecs_07::component::SparseStorage;
 }
+
+#[cfg(feature = "bevy-ecs-08")]
+impl bevy_ecs_08::prelude::Component for CollisionShape {
+    type Storage = bevy_ecs_08::component::SparseStorage;
+}

src/transform/bevy_transform_08.rs

@@ -0,0 +1,44 @@
+use bevy_math_08::{Quat, Vec3};
+use bevy_transform_08::prelude::GlobalTransform;
+
+#[cfg(feature = "bevy-transform-08")] // Repeated to appear in the docs
+impl From<GlobalTransform> for crate::Transform {
+    #[inline]
+    fn from(transform: GlobalTransform) -> Self {
+        let (scale, rotation, translation) = transform.to_scale_rotation_translation();
+        Self::from_scale_angle_translation(
+            scale.truncate(),
+            angle_2d_from_quat(rotation),
+            translation.truncate(),
+        )
+    }
+}
+
+fn angle_2d_from_quat(quat: Quat) -> f32 {
+    if quat.is_near_identity() {
+        return 0.0;
+    }
+    let projected = quat.to_scaled_axis().project_onto(Vec3::Z);
+    let angle = projected.length();
+    if projected.z < 0.0 {
+        -angle
+    } else {
+        angle
+    }
+}
+
+#[cfg(all(test, feature = "std"))]
+mod angle_from_quat {
+    use rstest::rstest;
+
+    use super::*;
+
+    #[rstest]
+    #[case(Quat::from_axis_angle(Vec3::Z, 1.0), 1.0)]
+    #[case(Quat::from_axis_angle(- Vec3::Z, 1.0), - 1.0)]
+    #[case(Quat::from_axis_angle(Vec3::Z, - 1.0), - 1.0)]
+    #[case(Quat::from_axis_angle(- Vec3::Z, - 1.0), 1.0)]
+    fn angle_from_quat(#[case] quat: Quat, #[case] expected: f32) {
+        assert!((angle_2d_from_quat(quat) - expected).abs() < f32::EPSILON);
+    }
+}

src/transform/mod.rs

@@ -8,6 +8,9 @@ mod bevy_transform_06;
 #[cfg(feature = "bevy-transform-07")]
 mod bevy_transform_07;
 
+#[cfg(feature = "bevy-transform-08")]
+mod bevy_transform_08;
+
 /// Transform that can be used for a [`CollisionShape`]
 #[derive(Debug, Clone)]
 pub struct Transform {