From 1f88118974a15f3174a4a7076a5dd203c26a751f Mon Sep 17 00:00:00 2001 From: Dmitry Stepanov Date: Mon, 15 Jun 2026 23:23:34 +0300 Subject: [PATCH] fixed re-export issues - re-exporting only `shape::*` is kinda pointless, since it does not have any actual shapes defined - re-exporting the whole `geometry` module is much better, because it solves the issue above --- fyrox-impl/src/scene/dim2/physics.rs | 4 ++-- fyrox-impl/src/scene/graph/physics.rs | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/fyrox-impl/src/scene/dim2/physics.rs b/fyrox-impl/src/scene/dim2/physics.rs index 1eb2e54ce..44717b4dc 100644 --- a/fyrox-impl/src/scene/dim2/physics.rs +++ b/fyrox-impl/src/scene/dim2/physics.rs @@ -58,7 +58,7 @@ use crate::{ tilemap::TileMap, }, }; -pub use rapier2d::geometry::shape::*; +pub use rapier2d::geometry; use rapier2d::math::{Pose2, Vec2}; use rapier2d::parry::query::DefaultQueryDispatcher; use rapier2d::{ @@ -840,7 +840,7 @@ impl PhysicsWorld { pub fn cast_shape( &self, graph: &Graph, - shape: &dyn Shape, + shape: &dyn geometry::Shape, shape_pos: &Isometry2, shape_vel: &Vector2, max_toi: f32, diff --git a/fyrox-impl/src/scene/graph/physics.rs b/fyrox-impl/src/scene/graph/physics.rs index 870e1cd8e..4593effb6 100644 --- a/fyrox-impl/src/scene/graph/physics.rs +++ b/fyrox-impl/src/scene/graph/physics.rs @@ -79,7 +79,7 @@ use std::{ use strum_macros::{AsRefStr, EnumString, VariantNames}; use fyrox_graph::{NodeWrapper, SceneGraph}; -pub use rapier3d::geometry::shape::*; +pub use rapier3d::geometry; use rapier3d::math::{Pose3, Vec3}; use rapier3d::parry::query::DefaultQueryDispatcher; use rapier3d::prelude::FrictionModel; @@ -1288,7 +1288,7 @@ impl PhysicsWorld { pub fn cast_shape( &self, graph: &Graph, - shape: &dyn Shape, + shape: &dyn geometry::Shape, shape_pos: &Isometry3, shape_vel: &Vector3, max_toi: f32,