forestia/bevy
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update traits

Browse Source
This commit is contained in:
Lynn Büttgenbach 2025-07-09 01:58:24 +02:00
parent 0ee937784e
commit 040ac67651
1 changed files with 142 additions and 123 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

265
crates/bevy_gizmos/src/primitives/dim3.rs
View File

@ -18,24 +18,43 @@ const DEFAULT_RESOLUTION: u32 = 5;
const INFINITE_LEN: f32 = 10_000.0; const INFINITE_LEN: f32 = 10_000.0;
/// A trait for rendering 3D geometric primitives (`P`) with [`GizmoBuffer`]. /// A trait for rendering 3D geometric primitives (`P`) with [`GizmoBuffer`].
pub trait GizmoPrimitive3d<P: Primitive3d> { pub trait GizmoPrimitive3d<Config, Clear> : Primitive3d
where
Config: GizmoConfigGroup,
Clear: 'static + Send + Sync
{
/// The output of `primitive_3d`. This is a builder to set non-default values. /// The output of `primitive_3d`. This is a builder to set non-default values.
type Output<'a> type Output<'a>
where where
Self: 'a; Self: 'a;
/// Renders a 3D primitive with its associated details. /// Renders a 3D primitive with its associated details.
fn primitive_3d( fn gizmos<'a, 'b: 'a>(
&mut self, &'a self,
primitive: &P, gizmos: &'b mut GizmoBuffer<Config, Clear>,
isometry: impl Into<Isometry3d>, isometry: impl Into<Isometry3d>,
color: impl Into<Color>, color: impl Into<Color>,
) -> Self::Output<'_>; ) -> Self::Output<'a>;
}
impl<Config, Clear> GizmoBuffer<Config, Clear>
where
Config: GizmoConfigGroup,
Clear: 'static + Send + Sync,
{
/// Renders a 3D primitive with its associated details.
pub fn primitive_3d<'a, 'b: 'a, P: GizmoPrimitive3d<Config, Clear>>(
&'b mut self,
primitive: &'a P,
isometry: impl Into<Isometry3d>,
color: impl Into<Color>,
) -> P::Output<'a> {
primitive.gizmos(self, isometry, color)
}
} }
// direction 3d // direction 3d
impl<Config, Clear> GizmoPrimitive3d<Dir3> for GizmoBuffer<Config, Clear> impl<Config, Clear> GizmoPrimitive3d<Config, Clear> for Dir3
where where
Config: GizmoConfigGroup, Config: GizmoConfigGroup,
Clear: 'static + Send + Sync, Clear: 'static + Send + Sync,
@ -45,22 +64,22 @@ where
where where
Self: 'a; Self: 'a;
fn primitive_3d( fn gizmos<'a, 'b: 'a>(
&mut self, &'a self,
primitive: &Dir3, gizmos: &'b mut GizmoBuffer<Config, Clear>,
isometry: impl Into<Isometry3d>, isometry: impl Into<Isometry3d>,
color: impl Into<Color>, color: impl Into<Color>,
) -> Self::Output<'_> { ) -> Self::Output<'a> {
let isometry = isometry.into(); let isometry = isometry.into();
let start = Vec3::ZERO; let start = Vec3::ZERO;
let end = primitive.as_vec3(); let end = self.as_vec3();
self.arrow(isometry * start, isometry * end, color); gizmos.arrow(isometry * start, isometry * end, color);
} }
} }
// sphere // sphere
impl<Config, Clear> GizmoPrimitive3d<Sphere> for GizmoBuffer<Config, Clear> impl<Config, Clear> GizmoPrimitive3d<Config, Clear> for Sphere
where where
Config: GizmoConfigGroup, Config: GizmoConfigGroup,
Clear: 'static + Send + Sync, Clear: 'static + Send + Sync,
@ -70,13 +89,13 @@ where
where where
Self: 'a; Self: 'a;
fn primitive_3d( fn gizmos<'a, 'b: 'a>(
&mut self, &'a self,
primitive: &Sphere, gizmos: &'b mut GizmoBuffer<Config, Clear>,
isometry: impl Into<Isometry3d>, isometry: impl Into<Isometry3d>,
color: impl Into<Color>, color: impl Into<Color>,
) -> Self::Output<'_> { ) -> Self::Output<'a> {
self.sphere(isometry, primitive.radius, color) gizmos.sphere(isometry, self.radius, color)
} }
} }
@ -121,7 +140,7 @@ where
} }
} }
impl<Config, Clear> GizmoPrimitive3d<Plane3d> for GizmoBuffer<Config, Clear> impl<Config, Clear> GizmoPrimitive3d<Config, Clear> for Plane3d
where where
Config: GizmoConfigGroup, Config: GizmoConfigGroup,
Clear: 'static + Send + Sync, Clear: 'static + Send + Sync,
@ -131,15 +150,15 @@ where
where where
Self: 'a; Self: 'a;
fn primitive_3d( fn gizmos<'a, 'b: 'a>(
&mut self, &'a self,
primitive: &Plane3d, gizmos: &'b mut GizmoBuffer<Config, Clear>,
isometry: impl Into<Isometry3d>, isometry: impl Into<Isometry3d>,
color: impl Into<Color>, color: impl Into<Color>,
) -> Self::Output<'_> { ) -> Self::Output<'a> {
Plane3dBuilder { Plane3dBuilder {
gizmos: self, gizmos,
normal: primitive.normal, normal: self.normal,
isometry: isometry.into(), isometry: isometry.into(),
color: color.into(), color: color.into(),
cell_count: UVec2::splat(3), cell_count: UVec2::splat(3),
@ -173,7 +192,7 @@ where
// line 3d // line 3d
impl<Config, Clear> GizmoPrimitive3d<Line3d> for GizmoBuffer<Config, Clear> impl<Config, Clear> GizmoPrimitive3d<Config, Clear> for Line3d
where where
Config: GizmoConfigGroup, Config: GizmoConfigGroup,
Clear: 'static + Send + Sync, Clear: 'static + Send + Sync,
@ -183,32 +202,32 @@ where
where where
Self: 'a; Self: 'a;
fn primitive_3d( fn gizmos<'a, 'b: 'a>(
&mut self, &'a self,
primitive: &Line3d, gizmos: &'b mut GizmoBuffer<Config, Clear>,
isometry: impl Into<Isometry3d>, isometry: impl Into<Isometry3d>,
color: impl Into<Color>, color: impl Into<Color>,
) -> Self::Output<'_> { ) -> Self::Output<'a> {
if !self.enabled { if !gizmos.enabled {
return; return;
} }
let isometry = isometry.into(); let isometry = isometry.into();
let color = color.into(); let color = color.into();
let direction = primitive.direction.as_vec3(); let direction = self.direction.as_vec3();
self.arrow(isometry * Vec3::ZERO, isometry * direction, color); gizmos.arrow(isometry * Vec3::ZERO, isometry * direction, color);
let [start, end] = [1.0, -1.0] let [start, end] = [1.0, -1.0]
.map(|sign| sign * INFINITE_LEN) .map(|sign| sign * INFINITE_LEN)
.map(|length| primitive.direction * length) .map(|length| self.direction * length)
.map(|offset| isometry * offset); .map(|offset| isometry * offset);
self.line(start, end, color); gizmos.line(start, end, color);
} }
} }
// segment 3d // segment 3d
impl<Config, Clear> GizmoPrimitive3d<Segment3d> for GizmoBuffer<Config, Clear> impl<Config, Clear> GizmoPrimitive3d<Config, Clear> for Segment3d
where where
Config: GizmoConfigGroup, Config: GizmoConfigGroup,
Clear: 'static + Send + Sync, Clear: 'static + Send + Sync,
@ -218,24 +237,24 @@ where
where where
Self: 'a; Self: 'a;
fn primitive_3d( fn gizmos<'a, 'b: 'a>(
&mut self, &'a self,
primitive: &Segment3d, gizmos: &'b mut GizmoBuffer<Config, Clear>,
isometry: impl Into<Isometry3d>, isometry: impl Into<Isometry3d>,
color: impl Into<Color>, color: impl Into<Color>,
) -> Self::Output<'_> { ) -> Self::Output<'a> {
if !self.enabled { if !gizmos.enabled {
return; return;
} }
let transformed = primitive.transformed(isometry); let transformed = self.transformed(isometry);
self.line(transformed.point1(), transformed.point2(), color); gizmos.line(transformed.point1(), transformed.point2(), color);
} }
} }
// polyline 3d // polyline 3d
impl<const N: usize, Config, Clear> GizmoPrimitive3d<Polyline3d<N>> for GizmoBuffer<Config, Clear> impl<const N: usize, Config, Clear> GizmoPrimitive3d<Config, Clear> for Polyline3d<N>
where where
Config: GizmoConfigGroup, Config: GizmoConfigGroup,
Clear: 'static + Send + Sync, Clear: 'static + Send + Sync,
@ -245,24 +264,24 @@ where
where where
Self: 'a; Self: 'a;
fn primitive_3d( fn gizmos<'a, 'b: 'a>(
&mut self, &'a self,
primitive: &Polyline3d<N>, gizmos: &'b mut GizmoBuffer<Config, Clear>,
isometry: impl Into<Isometry3d>, isometry: impl Into<Isometry3d>,
color: impl Into<Color>, color: impl Into<Color>,
) -> Self::Output<'_> { ) -> Self::Output<'a> {
if !self.enabled { if !gizmos.enabled {
return; return;
} }
let isometry = isometry.into(); let isometry = isometry.into();
self.linestrip(primitive.vertices.map(|vec3| isometry * vec3), color); gizmos.linestrip(self.vertices.map(|vec3| isometry * vec3), color);
} }
} }
// boxed polyline 3d // boxed polyline 3d
impl<Config, Clear> GizmoPrimitive3d<BoxedPolyline3d> for GizmoBuffer<Config, Clear> impl<Config, Clear> GizmoPrimitive3d<Config, Clear> for BoxedPolyline3d
where where
Config: GizmoConfigGroup, Config: GizmoConfigGroup,
Clear: 'static + Send + Sync, Clear: 'static + Send + Sync,
@ -272,19 +291,19 @@ where
where where
Self: 'a; Self: 'a;
fn primitive_3d( fn gizmos<'a, 'b: 'a>(
&mut self, &'a self,
primitive: &BoxedPolyline3d, gizmos: &'b mut GizmoBuffer<Config, Clear>,
isometry: impl Into<Isometry3d>, isometry: impl Into<Isometry3d>,
color: impl Into<Color>, color: impl Into<Color>,
) -> Self::Output<'_> { ) -> Self::Output<'a> {
if !self.enabled { if !gizmos.enabled {
return; return;
} }
let isometry = isometry.into(); let isometry = isometry.into();
self.linestrip( gizmos.linestrip(
primitive self
.vertices .vertices
.iter() .iter()
.copied() .copied()
@ -296,7 +315,7 @@ where
// triangle 3d // triangle 3d
impl<Config, Clear> GizmoPrimitive3d<Triangle3d> for GizmoBuffer<Config, Clear> impl<Config, Clear> GizmoPrimitive3d<Config, Clear> for Triangle3d
where where
Config: GizmoConfigGroup, Config: GizmoConfigGroup,
Clear: 'static + Send + Sync, Clear: 'static + Send + Sync,
@ -306,25 +325,25 @@ where
where where
Self: 'a; Self: 'a;
fn primitive_3d( fn gizmos<'a, 'b: 'a>(
&mut self, &'a self,
primitive: &Triangle3d, gizmos: &'b mut GizmoBuffer<Config, Clear>,
isometry: impl Into<Isometry3d>, isometry: impl Into<Isometry3d>,
color: impl Into<Color>, color: impl Into<Color>,
) -> Self::Output<'_> { ) -> Self::Output<'a> {
if !self.enabled { if !gizmos.enabled {
return; return;
} }
let isometry = isometry.into(); let isometry = isometry.into();
let [a, b, c] = primitive.vertices; let [a, b, c] = self.vertices;
self.linestrip([a, b, c, a].map(|vec3| isometry * vec3), color); gizmos.linestrip([a, b, c, a].map(|vec3| isometry * vec3), color);
} }
} }
// cuboid // cuboid
impl<Config, Clear> GizmoPrimitive3d<Cuboid> for GizmoBuffer<Config, Clear> impl<Config, Clear> GizmoPrimitive3d<Config, Clear> for Cuboid
where where
Config: GizmoConfigGroup, Config: GizmoConfigGroup,
Clear: 'static + Send + Sync, Clear: 'static + Send + Sync,
@ -334,13 +353,13 @@ where
where where
Self: 'a; Self: 'a;
fn primitive_3d( fn gizmos<'a, 'b: 'a>(
&mut self, &'a self,
primitive: &Cuboid, gizmos: &'b mut GizmoBuffer<Config, Clear>,
isometry: impl Into<Isometry3d>, isometry: impl Into<Isometry3d>,
color: impl Into<Color>, color: impl Into<Color>,
) -> Self::Output<'_> { ) -> Self::Output<'a> {
if !self.enabled { if !gizmos.enabled {
return; return;
} }
@ -358,7 +377,7 @@ where
[1.0, -1.0, -1.0], [1.0, -1.0, -1.0],
] ]
.map(Vec3::from) .map(Vec3::from)
.map(|vec3| vec3 * primitive.half_size) .map(|vec3| vec3 * self.half_size)
.map(|vec3| isometry * vec3); .map(|vec3| isometry * vec3);
// lines for the upper rectangle of the cuboid // lines for the upper rectangle of the cuboid
@ -379,7 +398,7 @@ where
.chain(lower) .chain(lower)
.chain(connections) .chain(connections)
.for_each(|(start, end)| { .for_each(|(start, end)| {
self.line(start, end, color); gizmos.line(start, end, color);
}); });
} }
} }
@ -419,7 +438,7 @@ where
} }
} }
impl<Config, Clear> GizmoPrimitive3d<Cylinder> for GizmoBuffer<Config, Clear> impl<Config, Clear> GizmoPrimitive3d<Config, Clear> for Cylinder
where where
Config: GizmoConfigGroup, Config: GizmoConfigGroup,
Clear: 'static + Send + Sync, Clear: 'static + Send + Sync,
@ -429,16 +448,16 @@ where
where where
Self: 'a; Self: 'a;
fn primitive_3d( fn gizmos<'a, 'b: 'a>(
&mut self, &'a self,
primitive: &Cylinder, gizmos: &'b mut GizmoBuffer<Config, Clear>,
isometry: impl Into<Isometry3d>, isometry: impl Into<Isometry3d>,
color: impl Into<Color>, color: impl Into<Color>,
) -> Self::Output<'_> { ) -> Self::Output<'a> {
Cylinder3dBuilder { Cylinder3dBuilder {
gizmos: self, gizmos,
radius: primitive.radius, radius: self.radius,
half_height: primitive.half_height, half_height: self.half_height,
isometry: isometry.into(), isometry: isometry.into(),
color: color.into(), color: color.into(),
resolution: DEFAULT_RESOLUTION, resolution: DEFAULT_RESOLUTION,
@ -505,7 +524,7 @@ where
} }
} }
impl<Config, Clear> GizmoPrimitive3d<Capsule3d> for GizmoBuffer<Config, Clear> impl<Config, Clear> GizmoPrimitive3d<Config, Clear> for Capsule3d
where where
Config: GizmoConfigGroup, Config: GizmoConfigGroup,
Clear: 'static + Send + Sync, Clear: 'static + Send + Sync,
@ -515,16 +534,16 @@ where
where where
Self: 'a; Self: 'a;
fn primitive_3d( fn gizmos<'a, 'b: 'a>(
&mut self, &'a self,
primitive: &Capsule3d, gizmos: &'b mut GizmoBuffer<Config, Clear>,
isometry: impl Into<Isometry3d>, isometry: impl Into<Isometry3d>,
color: impl Into<Color>, color: impl Into<Color>,
) -> Self::Output<'_> { ) -> Self::Output<'a> {
Capsule3dBuilder { Capsule3dBuilder {
gizmos: self, gizmos,
radius: primitive.radius, radius: self.radius,
half_length: primitive.half_length, half_length: self.half_length,
isometry: isometry.into(), isometry: isometry.into(),
color: color.into(), color: color.into(),
resolution: DEFAULT_RESOLUTION, resolution: DEFAULT_RESOLUTION,
@ -645,7 +664,7 @@ where
} }
} }
impl<Config, Clear> GizmoPrimitive3d<Cone> for GizmoBuffer<Config, Clear> impl<Config, Clear> GizmoPrimitive3d<Config, Clear> for Cone
where where
Config: GizmoConfigGroup, Config: GizmoConfigGroup,
Clear: 'static + Send + Sync, Clear: 'static + Send + Sync,
@ -655,16 +674,16 @@ where
where where
Self: 'a; Self: 'a;
fn primitive_3d( fn gizmos<'a, 'b: 'a>(
&mut self, &'a self,
primitive: &Cone, gizmos: &'b mut GizmoBuffer<Config, Clear>,
isometry: impl Into<Isometry3d>, isometry: impl Into<Isometry3d>,
color: impl Into<Color>, color: impl Into<Color>,
) -> Self::Output<'_> { ) -> Self::Output<'a> {
Cone3dBuilder { Cone3dBuilder {
gizmos: self, gizmos,
radius: primitive.radius, radius: self.radius,
height: primitive.height, height: self.height,
isometry: isometry.into(), isometry: isometry.into(),
color: color.into(), color: color.into(),
base_resolution: DEFAULT_RESOLUTION, base_resolution: DEFAULT_RESOLUTION,
@ -747,7 +766,7 @@ where
} }
} }
impl<Config, Clear> GizmoPrimitive3d<ConicalFrustum> for GizmoBuffer<Config, Clear> impl<Config, Clear> GizmoPrimitive3d<Config, Clear> for ConicalFrustum
where where
Config: GizmoConfigGroup, Config: GizmoConfigGroup,
Clear: 'static + Send + Sync, Clear: 'static + Send + Sync,
@ -757,17 +776,17 @@ where
where where
Self: 'a; Self: 'a;
fn primitive_3d( fn gizmos<'a, 'b: 'a>(
&mut self, &'a self,
primitive: &ConicalFrustum, gizmos: &'b mut GizmoBuffer<Config, Clear>,
isometry: impl Into<Isometry3d>, isometry: impl Into<Isometry3d>,
color: impl Into<Color>, color: impl Into<Color>,
) -> Self::Output<'_> { ) -> Self::Output<'a> {
ConicalFrustum3dBuilder { ConicalFrustum3dBuilder {
gizmos: self, gizmos,
radius_top: primitive.radius_top, radius_top: self.radius_top,
radius_bottom: primitive.radius_bottom, radius_bottom: self.radius_bottom,
height: primitive.height, height: self.height,
isometry: isometry.into(), isometry: isometry.into(),
color: color.into(), color: color.into(),
resolution: DEFAULT_RESOLUTION, resolution: DEFAULT_RESOLUTION,
@ -851,7 +870,7 @@ where
} }
} }
impl<Config, Clear> GizmoPrimitive3d<Torus> for GizmoBuffer<Config, Clear> impl<Config, Clear> GizmoPrimitive3d<Config, Clear> for Torus
where where
Config: GizmoConfigGroup, Config: GizmoConfigGroup,
Clear: 'static + Send + Sync, Clear: 'static + Send + Sync,
@ -861,16 +880,16 @@ where
where where
Self: 'a; Self: 'a;
fn primitive_3d( fn gizmos<'a, 'b: 'a>(
&mut self, &'a self,
primitive: &Torus, gizmos: &'b mut GizmoBuffer<Config, Clear>,
isometry: impl Into<Isometry3d>, isometry: impl Into<Isometry3d>,
color: impl Into<Color>, color: impl Into<Color>,
) -> Self::Output<'_> { ) -> Self::Output<'a> {
Torus3dBuilder { Torus3dBuilder {
gizmos: self, gizmos,
minor_radius: primitive.minor_radius, minor_radius: self.minor_radius,
major_radius: primitive.major_radius, major_radius: self.major_radius,
isometry: isometry.into(), isometry: isometry.into(),
color: color.into(), color: color.into(),
minor_resolution: DEFAULT_RESOLUTION, minor_resolution: DEFAULT_RESOLUTION,
@ -931,7 +950,7 @@ where
// tetrahedron // tetrahedron
impl<Config, Clear> GizmoPrimitive3d<Tetrahedron> for GizmoBuffer<Config, Clear> impl<Config, Clear> GizmoPrimitive3d<Config, Clear> for Tetrahedron
where where
Config: GizmoConfigGroup, Config: GizmoConfigGroup,
Clear: 'static + Send + Sync, Clear: 'static + Send + Sync,
@ -941,25 +960,25 @@ where
where where
Self: 'a; Self: 'a;
fn primitive_3d( fn gizmos<'a, 'b: 'a>(
&mut self, &'a self,
primitive: &Tetrahedron, gizmos: &'b mut GizmoBuffer<Config, Clear>,
isometry: impl Into<Isometry3d>, isometry: impl Into<Isometry3d>,
color: impl Into<Color>, color: impl Into<Color>,
) -> Self::Output<'_> { ) -> Self::Output<'a> {
if !self.enabled { if !gizmos.enabled {
return; return;
} }
let isometry = isometry.into(); let isometry = isometry.into();
let [a, b, c, d] = primitive.vertices.map(|vec3| isometry * vec3); let [a, b, c, d] = self.vertices.map(|vec3| isometry * vec3);
let lines = [(a, b), (a, c), (a, d), (b, c), (b, d), (c, d)]; let lines = [(a, b), (a, c), (a, d), (b, c), (b, d), (c, d)];
let color = color.into(); let color = color.into();
lines.into_iter().for_each(|(start, end)| { lines.into_iter().for_each(|(start, end)| {
self.line(start, end, color); gizmos.line(start, end, color);
}); });
} }
} }