Upgrade to Bevy 0.19 and harden editor workflows
CI / Format, lint, test, build (push) Has been cancelled
CI / Format, lint, test, build (push) Has been cancelled
This commit is contained in:
1 parent
3f85d25cc7
commit
b5e561904c
204 files changed
+6972
-29907
No files matched your search
+21
-21
@@ -64,85 +64,85 @@ name = "ui_blocked_gizmo"
|
||||
path = "examples/ui_blocked_gizmo.rs"
|
||||
|
||||
[dependencies.bevy_app]
|
||||
version = "0.18"
|
||||
version = "0.19"
|
||||
default-features = false
|
||||
|
||||
[dependencies.bevy_asset]
|
||||
version = "0.18"
|
||||
version = "0.19"
|
||||
default-features = false
|
||||
|
||||
[dependencies.bevy_camera]
|
||||
version = "0.18"
|
||||
version = "0.19"
|
||||
default-features = false
|
||||
|
||||
[dependencies.bevy_core_pipeline]
|
||||
version = "0.18"
|
||||
version = "0.19"
|
||||
default-features = false
|
||||
|
||||
[dependencies.bevy_derive]
|
||||
version = "0.18"
|
||||
version = "0.19"
|
||||
default-features = false
|
||||
|
||||
[dependencies.bevy_ecs]
|
||||
version = "0.18"
|
||||
version = "0.19"
|
||||
default-features = false
|
||||
|
||||
[dependencies.bevy_image]
|
||||
version = "0.18"
|
||||
version = "0.19"
|
||||
default-features = false
|
||||
|
||||
[dependencies.bevy_input]
|
||||
version = "0.18"
|
||||
version = "0.19"
|
||||
default-features = false
|
||||
|
||||
[dependencies.bevy_log]
|
||||
version = "0.18"
|
||||
version = "0.19"
|
||||
default-features = false
|
||||
|
||||
[dependencies.bevy_math]
|
||||
version = "0.18"
|
||||
version = "0.19"
|
||||
features = ["mint"]
|
||||
default-features = false
|
||||
|
||||
[dependencies.bevy_mesh]
|
||||
version = "0.18"
|
||||
version = "0.19"
|
||||
default-features = false
|
||||
|
||||
[dependencies.bevy_pbr]
|
||||
version = "0.18"
|
||||
version = "0.19"
|
||||
default-features = false
|
||||
|
||||
[dependencies.bevy_picking]
|
||||
version = "0.18"
|
||||
version = "0.19"
|
||||
optional = true
|
||||
default-features = false
|
||||
|
||||
[dependencies.bevy_platform]
|
||||
version = "0.18"
|
||||
version = "0.19"
|
||||
default-features = false
|
||||
|
||||
[dependencies.bevy_reflect]
|
||||
version = "0.18"
|
||||
version = "0.19"
|
||||
default-features = false
|
||||
|
||||
[dependencies.bevy_render]
|
||||
version = "0.18"
|
||||
version = "0.19"
|
||||
default-features = false
|
||||
|
||||
[dependencies.bevy_shader]
|
||||
version = "0.18"
|
||||
version = "0.19"
|
||||
default-features = false
|
||||
|
||||
[dependencies.bevy_transform]
|
||||
version = "0.18"
|
||||
version = "0.19"
|
||||
default-features = false
|
||||
|
||||
[dependencies.bevy_utils]
|
||||
version = "0.18"
|
||||
version = "0.19"
|
||||
default-features = false
|
||||
|
||||
[dependencies.bevy_window]
|
||||
version = "0.18"
|
||||
version = "0.19"
|
||||
default-features = false
|
||||
|
||||
[dependencies.bytemuck]
|
||||
@@ -155,7 +155,7 @@ version = "0.9.0"
|
||||
version = "1.17"
|
||||
|
||||
[dev-dependencies.bevy]
|
||||
version = "0.18"
|
||||
version = "0.19"
|
||||
|
||||
[lints.clippy]
|
||||
as_ptr_cast_mut = "deny"
|
||||
|
||||
+17
-15
@@ -598,20 +598,11 @@ fn draw_gizmos(
|
||||
mut draw_data_assets: ResMut<Assets<render::GizmoDrawData>>,
|
||||
mut draw_data_handles: ResMut<DrawDataHandles>,
|
||||
) {
|
||||
for (gizmo_uuid, gizmo) in &gizmo_storage.gizmos {
|
||||
let draw_data = gizmo.draw();
|
||||
|
||||
let mut bevy_draw_data = render::GizmoDrawData::default();
|
||||
|
||||
let (asset, is_new_asset) = if let Some(handle) = draw_data_handles.handles.get(gizmo_uuid)
|
||||
{
|
||||
(draw_data_assets.get_mut(handle).unwrap(), false)
|
||||
} else {
|
||||
(&mut bevy_draw_data, true)
|
||||
};
|
||||
|
||||
let viewport = &gizmo.config().viewport;
|
||||
|
||||
fn update_draw_data_asset(
|
||||
asset: &mut render::GizmoDrawData,
|
||||
draw_data: transform_gizmo::GizmoDrawData,
|
||||
viewport: &transform_gizmo::Rect,
|
||||
) {
|
||||
asset.0.vertices.clear();
|
||||
asset
|
||||
.0
|
||||
@@ -625,8 +616,19 @@ fn draw_gizmos(
|
||||
|
||||
asset.0.colors = draw_data.colors;
|
||||
asset.0.indices = draw_data.indices;
|
||||
}
|
||||
|
||||
if is_new_asset {
|
||||
for (gizmo_uuid, gizmo) in &gizmo_storage.gizmos {
|
||||
let draw_data = gizmo.draw();
|
||||
let viewport = &gizmo.config().viewport;
|
||||
|
||||
if let Some(handle) = draw_data_handles.handles.get(gizmo_uuid) {
|
||||
if let Some(mut asset) = draw_data_assets.get_mut(handle) {
|
||||
update_draw_data_asset(&mut asset, draw_data, viewport);
|
||||
}
|
||||
} else {
|
||||
let mut bevy_draw_data = render::GizmoDrawData::default();
|
||||
update_draw_data_asset(&mut bevy_draw_data, draw_data, viewport);
|
||||
let asset = draw_data_assets.add(bevy_draw_data);
|
||||
|
||||
draw_data_handles
|
||||
|
||||
+61
-25
@@ -1,18 +1,23 @@
|
||||
use bevy_app::{App, Plugin};
|
||||
use bevy_asset::{Asset, AssetId, Handle, RenderAssetUsages, load_internal_asset, uuid_handle};
|
||||
use bevy_camera::visibility::RenderLayers;
|
||||
use bevy_core_pipeline::core_3d::{CORE_3D_DEPTH_FORMAT, Transparent3d};
|
||||
use bevy_core_pipeline::core_3d::{
|
||||
CORE_3D_DEPTH_FORMAT, Transparent3d, TransparentSortingInfo3d,
|
||||
};
|
||||
use bevy_core_pipeline::prepass::{
|
||||
DeferredPrepass, DepthPrepass, MotionVectorPrepass, NormalPrepass,
|
||||
};
|
||||
use bevy_core_pipeline::tonemapping::{DebandDither, Tonemapping};
|
||||
use bevy_derive::{Deref, DerefMut};
|
||||
use bevy_ecs::prelude::*;
|
||||
use bevy_ecs::query::ROQueryItem;
|
||||
use bevy_ecs::system::SystemParamItem;
|
||||
use bevy_ecs::system::lifetimeless::{Read, SRes};
|
||||
use bevy_image::BevyDefault as _;
|
||||
use bevy_mesh::{PrimitiveTopology, VertexBufferLayout};
|
||||
use bevy_pbr::{ExtractedAtmosphere, MeshPipeline, MeshPipelineKey, SetMeshViewBindGroup};
|
||||
use bevy_pbr::{
|
||||
DistanceFog, ExtractedAtmosphere, MeshPipeline, MeshPipelineKey, MeshPipelineSystems,
|
||||
ScreenSpaceAmbientOcclusion, SetMeshViewBindGroup, tonemapping_pipeline_key,
|
||||
};
|
||||
use bevy_platform::collections::{HashMap, HashSet};
|
||||
use bevy_reflect::{Reflect, TypePath};
|
||||
use bevy_render::extract_component::ExtractComponent;
|
||||
@@ -28,13 +33,14 @@ use bevy_render::render_resource::{
|
||||
BlendState, Buffer, BufferInitDescriptor, BufferUsages, ColorTargetState, ColorWrites,
|
||||
CompareFunction, DepthBiasState, DepthStencilState, FragmentState, IndexFormat,
|
||||
MultisampleState, PipelineCache, PrimitiveState, RenderPipelineDescriptor,
|
||||
SpecializedRenderPipeline, SpecializedRenderPipelines, StencilState, TextureFormat,
|
||||
VertexAttribute, VertexFormat, VertexState, VertexStepMode,
|
||||
SpecializedRenderPipeline, SpecializedRenderPipelines, StencilState, VertexAttribute,
|
||||
VertexFormat, VertexState, VertexStepMode,
|
||||
};
|
||||
use bevy_render::renderer::RenderDevice;
|
||||
use bevy_render::sync_world::TemporaryRenderEntity;
|
||||
use bevy_render::view::{ExtractedView, ViewTarget};
|
||||
use bevy_render::{Extract, Render, RenderApp, RenderSystems};
|
||||
use bevy_render::view::ExtractedView;
|
||||
use bevy_render::{Extract, Render, RenderApp, RenderStartup, RenderSystems};
|
||||
use bevy_render::camera::ExtractedCamera;
|
||||
use bevy_shader::Shader;
|
||||
use bytemuck::cast_slice;
|
||||
use uuid::Uuid;
|
||||
@@ -75,7 +81,10 @@ impl Plugin for TransformGizmoRenderPlugin {
|
||||
|
||||
render_app
|
||||
.add_systems(ExtractSchedule, extract_gizmo_data)
|
||||
.init_resource::<TransformGizmoPipeline>();
|
||||
.add_systems(
|
||||
RenderStartup,
|
||||
init_transform_gizmo_pipeline.after(MeshPipelineSystems),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -221,12 +230,10 @@ struct TransformGizmoPipeline {
|
||||
mesh_pipeline: MeshPipeline,
|
||||
}
|
||||
|
||||
impl FromWorld for TransformGizmoPipeline {
|
||||
fn from_world(render_world: &mut World) -> Self {
|
||||
Self {
|
||||
mesh_pipeline: render_world.resource::<MeshPipeline>().clone(),
|
||||
}
|
||||
}
|
||||
fn init_transform_gizmo_pipeline(mut commands: Commands, mesh_pipeline: Res<MeshPipeline>) {
|
||||
commands.insert_resource(TransformGizmoPipeline {
|
||||
mesh_pipeline: mesh_pipeline.clone(),
|
||||
});
|
||||
}
|
||||
|
||||
#[derive(PartialEq, Eq, Hash, Clone)]
|
||||
@@ -249,11 +256,7 @@ impl SpecializedRenderPipeline for TransformGizmoPipeline {
|
||||
shader_defs.push("PERSPECTIVE".into());
|
||||
}
|
||||
|
||||
let format = if key.view_key.contains(MeshPipelineKey::HDR) {
|
||||
ViewTarget::TEXTURE_FORMAT_HDR
|
||||
} else {
|
||||
TextureFormat::bevy_default()
|
||||
};
|
||||
let format = key.view_key.target_format();
|
||||
|
||||
let view_layout = self
|
||||
.mesh_pipeline
|
||||
@@ -307,8 +310,8 @@ impl SpecializedRenderPipeline for TransformGizmoPipeline {
|
||||
},
|
||||
depth_stencil: Some(DepthStencilState {
|
||||
format: CORE_3D_DEPTH_FORMAT,
|
||||
depth_write_enabled: true,
|
||||
depth_compare: CompareFunction::Always,
|
||||
depth_write_enabled: Some(true),
|
||||
depth_compare: Some(CompareFunction::Always),
|
||||
stencil: StencilState::default(),
|
||||
bias: DepthBiasState::default(),
|
||||
}),
|
||||
@@ -317,7 +320,7 @@ impl SpecializedRenderPipeline for TransformGizmoPipeline {
|
||||
mask: !0,
|
||||
alpha_to_coverage_enabled: false,
|
||||
},
|
||||
push_constant_ranges: vec![],
|
||||
immediate_size: 0,
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -336,7 +339,9 @@ fn queue_transform_gizmos(
|
||||
mut views: Query<(
|
||||
Entity,
|
||||
&ExtractedView,
|
||||
Option<&ExtractedCamera>,
|
||||
Option<&Msaa>,
|
||||
(Option<&Tonemapping>, Option<&DebandDither>),
|
||||
Option<&RenderLayers>,
|
||||
(
|
||||
Has<NormalPrepass>,
|
||||
@@ -344,6 +349,8 @@ fn queue_transform_gizmos(
|
||||
Has<MotionVectorPrepass>,
|
||||
Has<DeferredPrepass>,
|
||||
Has<ExtractedAtmosphere>,
|
||||
Has<ScreenSpaceAmbientOcclusion>,
|
||||
Has<DistanceFog>,
|
||||
),
|
||||
)>,
|
||||
mut transparent_render_phases: ResMut<ViewSortedRenderPhases<Transparent3d>>,
|
||||
@@ -353,9 +360,19 @@ fn queue_transform_gizmos(
|
||||
for (
|
||||
view_entity,
|
||||
view,
|
||||
camera,
|
||||
entity_msaa,
|
||||
(tonemapping, dither),
|
||||
_render_layers,
|
||||
(normal_prepass, depth_prepass, motion_vector_prepass, deferred_prepass, atmosphere),
|
||||
(
|
||||
normal_prepass,
|
||||
depth_prepass,
|
||||
motion_vector_prepass,
|
||||
deferred_prepass,
|
||||
atmosphere,
|
||||
ssao,
|
||||
distance_fog,
|
||||
),
|
||||
) in &mut views
|
||||
{
|
||||
let Some(transparent_phase) = transparent_render_phases.get_mut(&view.retained_view_entity)
|
||||
@@ -370,7 +387,7 @@ fn queue_transform_gizmos(
|
||||
);
|
||||
|
||||
let mut view_key = MeshPipelineKey::from_msaa_samples(msaa_sample_count)
|
||||
| MeshPipelineKey::from_hdr(view.hdr);
|
||||
| MeshPipelineKey::from_target_format(view.target_format);
|
||||
|
||||
if normal_prepass {
|
||||
view_key |= MeshPipelineKey::NORMAL_PREPASS;
|
||||
@@ -392,6 +409,24 @@ fn queue_transform_gizmos(
|
||||
view_key |= MeshPipelineKey::ATMOSPHERE;
|
||||
}
|
||||
|
||||
if ssao {
|
||||
view_key |= MeshPipelineKey::SCREEN_SPACE_AMBIENT_OCCLUSION;
|
||||
}
|
||||
|
||||
if distance_fog {
|
||||
view_key |= MeshPipelineKey::DISTANCE_FOG;
|
||||
}
|
||||
|
||||
if !camera.is_some_and(|camera| camera.hdr) {
|
||||
if let Some(tonemapping) = tonemapping {
|
||||
view_key |= MeshPipelineKey::TONEMAP_IN_SHADER;
|
||||
view_key |= tonemapping_pipeline_key(*tonemapping);
|
||||
}
|
||||
if let Some(DebandDither::Enabled) = dither {
|
||||
view_key |= MeshPipelineKey::DEBAND_DITHER;
|
||||
}
|
||||
}
|
||||
|
||||
for (entity, handle) in &transform_gizmos {
|
||||
let Some(_) = transform_gizmo_assets.get(handle.0.id()) else {
|
||||
continue;
|
||||
@@ -406,7 +441,8 @@ fn queue_transform_gizmos(
|
||||
},
|
||||
);
|
||||
|
||||
transparent_phase.add(Transparent3d {
|
||||
transparent_phase.add_transient(Transparent3d {
|
||||
sorting_info: TransparentSortingInfo3d::AlwaysOnTop,
|
||||
entity: (entity, view_entity.into()),
|
||||
draw_function,
|
||||
pipeline,
|
||||
|
||||
Reference in new issue
Block a user