small fixes: derive Deref DerefMut, un-pub inactive_half_space

Author: kfc35

crates/bevy_camera/src/primitives.rs

@@ -1,6 +1,6 @@
 use core::borrow::Borrow;
-use core::ops::{Deref, DerefMut};
 
+use bevy_derive::{Deref, DerefMut};
 use bevy_ecs::{component::Component, entity::EntityHashMap, reflect::ReflectComponent};
 use bevy_math::{
     bounding::{Aabb3d, BoundingVolume},
@@ -216,24 +216,10 @@ impl Sphere {
 /// [`GlobalTransform`]: bevy_transform::components::GlobalTransform
 /// [`Camera2d`]: crate::Camera2d
 /// [`Camera3d`]: crate::Camera3d
-#[derive(Component, Clone, Copy, Debug, Default, Reflect)]
+#[derive(Component, Clone, Copy, Debug, Default, Deref, DerefMut, Reflect)]
 #[reflect(Component, Default, Debug, Clone)]
 pub struct Frustum(pub ViewFrustum);
 
-impl Deref for Frustum {
-    type Target = ViewFrustum;
-
-    fn deref(&self) -> &Self::Target {
-        &self.0
-    }
-}
-
-impl DerefMut for Frustum {
-    fn deref_mut(&mut self) -> &mut Self::Target {
-        &mut self.0
-    }
-}
-
 impl Frustum {
     /// Checks if a sphere intersects the frustum.
     #[inline]

crates/bevy_math/src/primitives/view_frustum.rs

@@ -7,7 +7,7 @@ use bevy_reflect::{ReflectDeserialize, ReflectSerialize};
 
 /// A region of 3D space defined by the intersection of 6 [`HalfSpace`]s.
 ///
-/// Frustums are typically an apex-truncated square pyramid (a pyramid without the top) or a cuboid.
+/// View Frustums are typically an apex-truncated square pyramid (a pyramid without the top) or a cuboid.
 ///
 /// Half spaces are ordered left, right, top, bottom, near, far. The normal vectors
 /// of the half-spaces point towards the interior of the frustum.
@@ -36,17 +36,17 @@ impl ViewFrustum {
     /// Vec4 representing an inactive half space.
     /// The bisecting plane's unit normal is set to (0, 0, 0).
     /// The signed distance along the normal from the plane to the origin is set to `f32::INFINITY`.
-    pub const INACTIVE_HALF_SPACE: Vec4 = Vec4::new(0.0, 0.0, 0.0, f32::INFINITY);
+    const INACTIVE_HALF_SPACE: Vec4 = Vec4::new(0.0, 0.0, 0.0, f32::INFINITY);
 
-    /// Returns a frustum derived from `clip_from_world`.
+    /// Returns a view frustum derived from `clip_from_world`.
     #[inline]
     pub fn from_clip_from_world(clip_from_world: &Mat4) -> Self {
         let mut frustum = ViewFrustum::from_clip_from_world_no_far(clip_from_world);
         frustum.half_spaces[Self::FAR_PLANE_IDX] = HalfSpace::new(clip_from_world.row(2));
         frustum
     }
 
-    /// Returns a frustum derived from `clip_from_world`,
+    /// Returns a view frustum derived from `clip_from_world`,
     /// but with a custom far plane.
     #[inline]
     pub fn from_clip_from_world_custom_far(
@@ -65,7 +65,7 @@ impl ViewFrustum {
     // NOTE: This approach of extracting the frustum half-space from the view
     // projection matrix is from Foundations of Game Engine Development 2
     // Rendering by Lengyel.
-    /// Returns a frustum derived from `view_projection`,
+    /// Returns a view frustum derived from `view_projection`,
     /// without a far plane.
     fn from_clip_from_world_no_far(clip_from_world: &Mat4) -> Self {
         let row0 = clip_from_world.row(0);