Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion crates/bevy_camera/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,9 @@ bevy_asset = { path = "../bevy_asset", version = "0.18.0-dev" }
bevy_image = { path = "../bevy_image", version = "0.18.0-dev" }
bevy_mesh = { path = "../bevy_mesh", version = "0.18.0-dev" }
bevy_math = { path = "../bevy_math", version = "0.18.0-dev" }
bevy_reflect = { path = "../bevy_reflect", version = "0.18.0-dev" }
bevy_reflect = { path = "../bevy_reflect", version = "0.18.0-dev", features = [
"wgpu-types",
] }
bevy_ecs = { path = "../bevy_ecs", version = "0.18.0-dev" }
bevy_transform = { path = "../bevy_transform", version = "0.18.0-dev" }
bevy_derive = { path = "../bevy_derive", version = "0.18.0-dev" }
Expand Down
4 changes: 1 addition & 3 deletions crates/bevy_camera/src/camera.rs
Original file line number Diff line number Diff line change
Expand Up @@ -362,9 +362,7 @@ pub struct Camera {
pub computed: ComputedCameraValues,
/// The "target" that this camera will render to.
pub target: RenderTarget,
// todo: reflect this when #6042 lands
/// The [`CameraOutputMode`] for this camera.
#[reflect(ignore, clone)]
pub output_mode: CameraOutputMode,
/// If this is enabled, a previous camera exists that shares this camera's render target, and this camera has MSAA enabled, then the previous camera's
/// outputs will be written to the intermediate multi-sampled render target textures for this camera. This enables cameras with MSAA enabled to
Expand Down Expand Up @@ -777,7 +775,7 @@ impl Camera {
}

/// Control how this [`Camera`] outputs once rendering is completed.
#[derive(Debug, Clone, Copy)]
#[derive(Debug, Clone, Copy, Reflect)]
pub enum CameraOutputMode {
/// Writes the camera output to configured render target.
Write {
Expand Down
8 changes: 8 additions & 0 deletions crates/bevy_reflect/src/impls/wgpu_types.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,11 @@ impl_reflect_opaque!(::wgpu_types::TextureFormat(
Deserialize,
Serialize,
));
impl_reflect_opaque!(::wgpu_types::BlendState(
Clone,
Debug,
Hash,
PartialEq,
Deserialize,
Serialize,
));