mirror of
https://github.com/bevyengine/bevy
synced 2024-12-23 19:43:07 +00:00
4c3b7679ec
# Objective Remove the limit of `RenderLayer` by using a growable mask using `SmallVec`. Changes adopted from @UkoeHB's initial PR here https://github.com/bevyengine/bevy/pull/12502 that contained additional changes related to propagating render layers. Changes ## Solution The main thing needed to unblock this is removing `RenderLayers` from our shader code. This primarily affects `DirectionalLight`. We are now computing a `skip` field on the CPU that is then used to skip the light in the shader. ## Testing Checked a variety of examples and did a quick benchmark on `many_cubes`. There were some existing problems identified during the development of the original pr (see: https://discord.com/channels/691052431525675048/1220477928605749340/1221190112939872347). This PR shouldn't change any existing behavior besides removing the layer limit (sans the comment in migration about `all` layers no longer being possible). --- ## Changelog Removed the limit on `RenderLayers` by using a growable bitset that only allocates when layers greater than 64 are used. ## Migration Guide - `RenderLayers::all()` no longer exists. Entities expecting to be visible on all layers, e.g. lights, should compute the active layers that are in use. --------- Co-authored-by: robtfm <50659922+robtfm@users.noreply.github.com>
203 lines
7.5 KiB
Rust
203 lines
7.5 KiB
Rust
//! A module for the [`GizmoConfig<T>`] [`Resource`].
|
|
|
|
use crate as bevy_gizmos;
|
|
pub use bevy_gizmos_macros::GizmoConfigGroup;
|
|
|
|
use bevy_ecs::{component::Component, reflect::ReflectResource, system::Resource};
|
|
use bevy_reflect::{std_traits::ReflectDefault, Reflect, TypePath};
|
|
use bevy_render::view::RenderLayers;
|
|
use bevy_utils::TypeIdMap;
|
|
use core::panic;
|
|
use std::{
|
|
any::TypeId,
|
|
ops::{Deref, DerefMut},
|
|
};
|
|
|
|
/// An enum configuring how line joints will be drawn.
|
|
#[derive(Debug, Default, Copy, Clone, Reflect, PartialEq, Eq, Hash)]
|
|
pub enum GizmoLineJoint {
|
|
/// Does not draw any line joints.
|
|
#[default]
|
|
None,
|
|
/// Extends both lines at the joining point until they meet in a sharp point.
|
|
Miter,
|
|
/// Draws a round corner with the specified resolution between the two lines.
|
|
///
|
|
/// The resolution determines the amount of triangles drawn per joint,
|
|
/// e.g. `GizmoLineJoint::Round(4)` will draw 4 triangles at each line joint.
|
|
Round(u32),
|
|
/// Draws a bevel, a straight line in this case, to connect the ends of both lines.
|
|
Bevel,
|
|
}
|
|
|
|
/// An enum used to configure the style of gizmo lines, similar to CSS line-style
|
|
#[derive(Copy, Clone, Debug, Default, Hash, PartialEq, Eq, Reflect)]
|
|
#[non_exhaustive]
|
|
pub enum GizmoLineStyle {
|
|
/// A solid line without any decorators
|
|
#[default]
|
|
Solid,
|
|
/// A dotted line
|
|
Dotted,
|
|
}
|
|
|
|
/// A trait used to create gizmo configs groups.
|
|
///
|
|
/// Here you can store additional configuration for you gizmo group not covered by [`GizmoConfig`]
|
|
///
|
|
/// Make sure to derive [`Default`] + [`Reflect`] and register in the app using `app.init_gizmo_group::<T>()`
|
|
pub trait GizmoConfigGroup: Reflect + TypePath + Default {}
|
|
|
|
/// The default gizmo config group.
|
|
#[derive(Default, Reflect, GizmoConfigGroup)]
|
|
pub struct DefaultGizmoConfigGroup;
|
|
|
|
/// A [`Resource`] storing [`GizmoConfig`] and [`GizmoConfigGroup`] structs
|
|
///
|
|
/// Use `app.init_gizmo_group::<T>()` to register a custom config group.
|
|
#[derive(Reflect, Resource, Default)]
|
|
#[reflect(Resource, Default)]
|
|
pub struct GizmoConfigStore {
|
|
// INVARIANT: must map TypeId::of::<T>() to correct type T
|
|
#[reflect(ignore)]
|
|
store: TypeIdMap<(GizmoConfig, Box<dyn Reflect>)>,
|
|
}
|
|
|
|
impl GizmoConfigStore {
|
|
/// Returns [`GizmoConfig`] and [`GizmoConfigGroup`] associated with [`TypeId`] of a [`GizmoConfigGroup`]
|
|
pub fn get_config_dyn(&self, config_type_id: &TypeId) -> Option<(&GizmoConfig, &dyn Reflect)> {
|
|
let (config, ext) = self.store.get(config_type_id)?;
|
|
Some((config, ext.deref()))
|
|
}
|
|
|
|
/// Returns [`GizmoConfig`] and [`GizmoConfigGroup`] associated with [`GizmoConfigGroup`] `T`
|
|
pub fn config<T: GizmoConfigGroup>(&self) -> (&GizmoConfig, &T) {
|
|
let Some((config, ext)) = self.get_config_dyn(&TypeId::of::<T>()) else {
|
|
panic!("Requested config {} does not exist in `GizmoConfigStore`! Did you forget to add it using `app.init_gizmo_group<T>()`?", T::type_path());
|
|
};
|
|
// hash map invariant guarantees that &dyn Reflect is of correct type T
|
|
let ext = ext.as_any().downcast_ref().unwrap();
|
|
(config, ext)
|
|
}
|
|
|
|
/// Returns mutable [`GizmoConfig`] and [`GizmoConfigGroup`] associated with [`TypeId`] of a [`GizmoConfigGroup`]
|
|
pub fn get_config_mut_dyn(
|
|
&mut self,
|
|
config_type_id: &TypeId,
|
|
) -> Option<(&mut GizmoConfig, &mut dyn Reflect)> {
|
|
let (config, ext) = self.store.get_mut(config_type_id)?;
|
|
Some((config, ext.deref_mut()))
|
|
}
|
|
|
|
/// Returns mutable [`GizmoConfig`] and [`GizmoConfigGroup`] associated with [`GizmoConfigGroup`] `T`
|
|
pub fn config_mut<T: GizmoConfigGroup>(&mut self) -> (&mut GizmoConfig, &mut T) {
|
|
let Some((config, ext)) = self.get_config_mut_dyn(&TypeId::of::<T>()) else {
|
|
panic!("Requested config {} does not exist in `GizmoConfigStore`! Did you forget to add it using `app.init_gizmo_group<T>()`?", T::type_path());
|
|
};
|
|
// hash map invariant guarantees that &dyn Reflect is of correct type T
|
|
let ext = ext.as_any_mut().downcast_mut().unwrap();
|
|
(config, ext)
|
|
}
|
|
|
|
/// Returns an iterator over all [`GizmoConfig`]s.
|
|
pub fn iter(&self) -> impl Iterator<Item = (&TypeId, &GizmoConfig, &dyn Reflect)> + '_ {
|
|
self.store
|
|
.iter()
|
|
.map(|(id, (config, ext))| (id, config, ext.deref()))
|
|
}
|
|
|
|
/// Returns an iterator over all [`GizmoConfig`]s, by mutable reference.
|
|
pub fn iter_mut(
|
|
&mut self,
|
|
) -> impl Iterator<Item = (&TypeId, &mut GizmoConfig, &mut dyn Reflect)> + '_ {
|
|
self.store
|
|
.iter_mut()
|
|
.map(|(id, (config, ext))| (id, config, ext.deref_mut()))
|
|
}
|
|
|
|
/// Inserts [`GizmoConfig`] and [`GizmoConfigGroup`] replacing old values
|
|
pub fn insert<T: GizmoConfigGroup>(&mut self, config: GizmoConfig, ext_config: T) {
|
|
// INVARIANT: hash map must correctly map TypeId::of::<T>() to &dyn Reflect of type T
|
|
self.store
|
|
.insert(TypeId::of::<T>(), (config, Box::new(ext_config)));
|
|
}
|
|
|
|
pub(crate) fn register<T: GizmoConfigGroup>(&mut self) {
|
|
self.insert(GizmoConfig::default(), T::default());
|
|
}
|
|
}
|
|
|
|
/// A struct that stores configuration for gizmos.
|
|
#[derive(Clone, Reflect)]
|
|
pub struct GizmoConfig {
|
|
/// Set to `false` to stop drawing gizmos.
|
|
///
|
|
/// Defaults to `true`.
|
|
pub enabled: bool,
|
|
/// Line width specified in pixels.
|
|
///
|
|
/// If `line_perspective` is `true` then this is the size in pixels at the camera's near plane.
|
|
///
|
|
/// Defaults to `2.0`.
|
|
pub line_width: f32,
|
|
/// Apply perspective to gizmo lines.
|
|
///
|
|
/// This setting only affects 3D, non-orthographic cameras.
|
|
///
|
|
/// Defaults to `false`.
|
|
pub line_perspective: bool,
|
|
/// Determine the style of gizmo lines.
|
|
pub line_style: GizmoLineStyle,
|
|
/// How closer to the camera than real geometry the line should be.
|
|
///
|
|
/// In 2D this setting has no effect and is effectively always -1.
|
|
///
|
|
/// Value between -1 and 1 (inclusive).
|
|
/// * 0 means that there is no change to the line position when rendering
|
|
/// * 1 means it is furthest away from camera as possible
|
|
/// * -1 means that it will always render in front of other things.
|
|
///
|
|
/// This is typically useful if you are drawing wireframes on top of polygons
|
|
/// and your wireframe is z-fighting (flickering on/off) with your main model.
|
|
/// You would set this value to a negative number close to 0.
|
|
pub depth_bias: f32,
|
|
/// Describes which rendering layers gizmos will be rendered to.
|
|
///
|
|
/// Gizmos will only be rendered to cameras with intersecting layers.
|
|
pub render_layers: RenderLayers,
|
|
|
|
/// Describe how lines should join
|
|
pub line_joints: GizmoLineJoint,
|
|
}
|
|
|
|
impl Default for GizmoConfig {
|
|
fn default() -> Self {
|
|
Self {
|
|
enabled: true,
|
|
line_width: 2.,
|
|
line_perspective: false,
|
|
line_style: GizmoLineStyle::Solid,
|
|
depth_bias: 0.,
|
|
render_layers: Default::default(),
|
|
|
|
line_joints: GizmoLineJoint::None,
|
|
}
|
|
}
|
|
}
|
|
|
|
#[derive(Component)]
|
|
pub(crate) struct GizmoMeshConfig {
|
|
pub line_perspective: bool,
|
|
pub line_style: GizmoLineStyle,
|
|
pub render_layers: RenderLayers,
|
|
}
|
|
|
|
impl From<&GizmoConfig> for GizmoMeshConfig {
|
|
fn from(item: &GizmoConfig) -> Self {
|
|
GizmoMeshConfig {
|
|
line_perspective: item.line_perspective,
|
|
line_style: item.line_style,
|
|
render_layers: item.render_layers.clone(),
|
|
}
|
|
}
|
|
}
|