Skip to content

Commit

Permalink
Readded bevy_rapier3d inclusion to rapier feature.
Browse files Browse the repository at this point in the history
Made default case use CFG IF to solve library collision.
  • Loading branch information
Aidan Sakovits committed Jun 7, 2024
1 parent 99a2d7e commit 3f55aac
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 2 deletions.
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ categories = ["game-development"]

[features]
default = []
rapier = []
rapier = ["bevy_rapier3d"]
xpbd = ["bevy_xpbd_3d", "parry3d_xpbd"]
debug_draw = ["bevy/bevy_gizmos", "bevy/bevy_render"]
trace = []
Expand Down
10 changes: 9 additions & 1 deletion tests/parry3d.rs
Original file line number Diff line number Diff line change
@@ -1,12 +1,20 @@
use std::{num::NonZeroU16, time::Duration};

use bevy::prelude::*;
use cfg_if::cfg_if;
use oxidized_navigation::{
colliders::OxidizedCollider, query::find_path, ActiveGenerationTasks, NavMesh, NavMeshAffector,
NavMeshSettings, OxidizedNavigationPlugin,
};

use parry3d_rapier as parry3d;
cfg_if! {
if #[cfg(feature = "xpbd")] {
use parry3d_xpbd as parry3d;
} else {
use parry3d_rapier as parry3d;
}
}

use parry3d::shape::SharedShape;

const TIMEOUT_DURATION: Duration = Duration::new(15, 0);
Expand Down

0 comments on commit 3f55aac

Please sign in to comment.