move all extension traits into utils

examples/kinematic.rs

@@ -6,8 +6,8 @@ use std::ffi::c_void;
 use bevy::prelude::*;
 use bevy::window::PrimaryWindow;
 use bevy_mod_physx::prelude::{self as bpx, *};
-use bevy_mod_physx::raycast::SceneQueryFilter;
 use bevy_mod_physx::utils::get_actor_entity_from_ptr;
+use bevy_mod_physx::utils::raycast::SceneQueryFilter;
 use physx_sys::{PxFilterData, PxQueryHitType, PxRigidActor, PxShape};
 
 #[derive(Component)]

examples/test_convex_shapes.rs

@@ -4,7 +4,6 @@ use bevy::prelude::*;
 use bevy::render::mesh::Indices;
 use bevy::render::render_resource::PrimitiveTopology;
 use bevy_mod_physx::assets::GeometryInner;
-use bevy_mod_physx::physx_extras::ConvexMeshExtras;
 use bevy_mod_physx::prelude::{self as bpx, *};
 
 fn main() {

src/assets.rs

@@ -26,7 +26,7 @@ use physx_sys::{
  PxMeshScale_new_3,
 };
 
-use crate::physx_extras::HeightFieldSample;
+use crate::utils::physx_extras::HeightFieldSample;
 use crate::prelude::{self as bpx, *};
 use crate::types::PxMaterial;
 

src/lib.rs

@@ -49,7 +49,6 @@ pub mod components;
 pub mod events;
 pub mod plugins;
 pub mod prelude;
-pub mod raycast;
 pub mod resources;
 pub mod systems;
 pub mod types;
@@ -58,7 +57,6 @@ pub mod utils;
 // reexport physx to avoid version conflicts
 pub use physx;
 pub use physx_sys;
-pub mod physx_extras;
 
 use crate::prelude as bpx;
 use crate::resources::{DefaultMaterial, DefaultMaterialHandle};

src/plugins/sleep.rs

@@ -19,7 +19,6 @@ use physx_sys::{
 
 use crate::types::OnWakeSleep;
 use crate::components::{ArticulationRootHandle, RigidDynamicHandle};
-use crate::physx_extras::ActorMapExtras;
 use crate::prelude::{Scene, *};
 
 #[derive(Component, Debug, Default, PartialEq, Eq, Clone, Copy, Hash, Reflect)]

src/prelude.rs

@@ -4,8 +4,6 @@
 //! (e.g. [Material] vs [bevy::prelude::Material], [Scene] vs [bevy::prelude::Scene]).
 //! Suggestions on how to resolve these conflicts are welcome.
 
-pub use crate::utils::type_bridge::*;
-
 pub use crate::{
  FoundationDescriptor,
  PhysicsCore,
@@ -47,5 +45,8 @@ pub use crate::plugins::shape_filter_data::ShapeFilterData;
 pub use crate::plugins::sleep::{SleepControl, Sleeping};
 pub use crate::plugins::velocity::{MaxVelocity, Velocity};
 
-pub use crate::raycast::{RaycastHit, SceneQueryExt};
 pub use crate::resources::{Physics, Scene};
+
+pub use crate::utils::physx_extras::{ActorMapExtras, ConvexMeshExtras, HeightFieldExtras, TriangleMeshExtras};
+pub use crate::utils::raycast::{RaycastHit, SceneQueryExt};
+pub use crate::utils::type_bridge::*;

src/utils/mod.rs

@@ -1,4 +1,6 @@
 //! Various helpers and extension traits.
+pub mod physx_extras;
+pub mod raycast;
 pub mod type_bridge;
 
 use bevy::prelude::*;
@@ -7,7 +9,7 @@ use physx_sys::PxBase_getConcreteType;
 
 use crate::types::*;
 
-/// Get actor [Entity] from raw PxRigidActor pointer from PhysX.
+/// Get actor [Entity] from raw [PxRigidActor](physx_sys::PxRigidActor) pointer from PhysX.
 ///
 /// # Safety
 /// User must ensure that pointer is valid and created by bevy_mod_physx crate
@@ -49,7 +51,7 @@ pub unsafe fn get_actor_entity_from_ptr(actor: *const physx_sys::PxRigidActor) -
  }
 }
 
-/// Get shape [Entity] from raw PxShape pointer from PhysX.
+/// Get shape [Entity] from raw [PxShape](physx_sys::PxShape) pointer from PhysX.
 ///
 /// # Safety
 /// User must ensure that pointer is valid and created by bevy_mod_physx crate

src/raycast.rs → src/utils/raycast.rs

@@ -1,3 +1,4 @@
+//! Extension trait for Scene that adds raycasts.
 use std::ffi::c_void;
 use std::mem::MaybeUninit;
 use std::ptr::{drop_in_place, null_mut};