From 780ba4a216aa9ef68d7f10db4a2b67b866699f43 Mon Sep 17 00:00:00 2001 From: johnny-smitherson <127537716+johnny-smitherson@users.noreply.github.com> Date: Mon, 23 Oct 2023 16:21:07 +0000 Subject: update bevy 0.11 - fix compile errors --- src_testbed/lines/mod.rs | 32 ++++++++++++++++++++------------ src_testbed/lines/render_dim.rs | 37 ++++++++++++++++++++----------------- 2 files changed, 40 insertions(+), 29 deletions(-) (limited to 'src_testbed/lines') diff --git a/src_testbed/lines/mod.rs b/src_testbed/lines/mod.rs index 60d8098..c68b86e 100644 --- a/src_testbed/lines/mod.rs +++ b/src_testbed/lines/mod.rs @@ -19,7 +19,6 @@ use bevy::render::MainWorld; */ use bevy::{ asset::{Assets, HandleUntyped}, - pbr::{NotShadowCaster, NotShadowReceiver}, prelude::*, reflect::TypeUuid, render::{ @@ -27,8 +26,10 @@ use bevy::{ render_phase::AddRenderCommand, render_resource::PrimitiveTopology, render_resource::Shader, + RenderSet, }, }; +use bevy_pbr::{NotShadowCaster, NotShadowReceiver}; mod render_dim; @@ -38,8 +39,8 @@ mod render_dim; #[cfg(feature = "dim3")] mod dim { pub(crate) use super::render_dim::r3d::{queue, DebugLinePipeline, DrawDebugLines}; - pub(crate) use bevy::core_pipeline::core_3d::Opaque3d as Phase; use bevy::{asset::Handle, render::mesh::Mesh}; + pub(crate) use bevy_core_pipeline::core_3d::Opaque3d as Phase; pub(crate) type MeshHandle = Handle; pub(crate) fn from_handle(from: &MeshHandle) -> &Handle { @@ -54,8 +55,9 @@ mod dim { #[cfg(feature = "dim2")] mod dim { pub(crate) use super::render_dim::r2d::{queue, DebugLinePipeline, DrawDebugLines}; - pub(crate) use bevy::core_pipeline::core_2d::Transparent2d as Phase; - use bevy::{asset::Handle, render::mesh::Mesh, sprite::Mesh2dHandle}; + use bevy::{asset::Handle, render::mesh::Mesh}; + pub(crate) use bevy_core_pipeline::core_2d::Transparent2d as Phase; + use bevy_sprite::Mesh2dHandle; pub(crate) type MeshHandle = Mesh2dHandle; pub(crate) fn from_handle(from: &MeshHandle) -> &Handle { @@ -120,27 +122,33 @@ impl DebugLinesPlugin { Self { depth_test: val } } } - +use bevy::render::render_phase::DrawFunctions; +use bevy::render::Render; impl Plugin for DebugLinesPlugin { fn build(&self, app: &mut App) { - use bevy::render::{render_resource::SpecializedMeshPipelines, RenderApp, RenderStage}; + use bevy::render::{render_resource::SpecializedMeshPipelines, RenderApp}; let mut shaders = app.world.get_resource_mut::>().unwrap(); shaders.set_untracked( DEBUG_LINES_SHADER_HANDLE, - Shader::from_wgsl(dim::SHADER_FILE), + Shader::from_wgsl(dim::SHADER_FILE, file!()), ); app.init_resource::(); - app.add_startup_system(setup) - .add_system_to_stage(CoreStage::PostUpdate, update.label("draw_lines")); + + app.init_resource::>(); + + app.add_systems(Startup, setup) + .add_systems(PostUpdate, update); + app.sub_app_mut(RenderApp) + .init_resource::>() .add_render_command::() .insert_resource(DebugLinesConfig { depth_test: self.depth_test, }) .init_resource::() .init_resource::>() - .add_system_to_stage(RenderStage::Extract, extract) - .add_system_to_stage(RenderStage::Queue, dim::queue); + .add_systems(Render, extract.in_set(RenderSet::ExtractCommands)) + .add_systems(Render, dim::queue.in_set(RenderSet::Queue)); info!("Loaded {} debug lines plugin.", dim::DIMMENSION); } @@ -176,7 +184,7 @@ fn setup(mut cmds: Commands, mut meshes: ResMut>) { // https://github.com/Toqozz/bevy_debug_lines/issues/16 //mesh.set_indices(Some(Indices::U16(Vec::with_capacity(MAX_POINTS_PER_MESH)))); - cmds.spawn_bundle(( + cmds.spawn(( dim::into_handle(meshes.add(mesh)), NotShadowCaster, NotShadowReceiver, diff --git a/src_testbed/lines/render_dim.rs b/src_testbed/lines/render_dim.rs index 718cce0..f339cdb 100644 --- a/src_testbed/lines/render_dim.rs +++ b/src_testbed/lines/render_dim.rs @@ -1,10 +1,11 @@ pub mod r3d { + use bevy_core_pipeline::core_3d::Opaque3d; + use bevy_pbr::{ + DrawMesh, MeshPipeline, MeshPipelineKey, MeshUniform, SetMeshBindGroup, + SetMeshViewBindGroup, + }; + use bevy::{ - core_pipeline::core_3d::Opaque3d, - pbr::{ - DrawMesh, MeshPipeline, MeshPipelineKey, MeshUniform, SetMeshBindGroup, - SetMeshViewBindGroup, - }, prelude::*, render::{ mesh::MeshVertexBufferLayout, @@ -54,9 +55,9 @@ pub mod r3d { //use VertexFormat::{Float32x3, Float32x4}; let mut shader_defs = Vec::new(); - shader_defs.push("LINES_3D".to_string()); + shader_defs.push("LINES_3D".to_string().into()); if depth_test { - shader_defs.push("DEPTH_TEST_ENABLED".to_string()); + shader_defs.push("DEPTH_TEST_ENABLED".to_string().into()); } let vertex_buffer_layout = layout.get_layout(&[ @@ -64,7 +65,7 @@ pub mod r3d { Mesh::ATTRIBUTE_COLOR.at_shader_location(1), ])?; let (label, blend, depth_write_enabled); - if key.contains(MeshPipelineKey::TRANSPARENT_MAIN_PASS) { + if key.contains(MeshPipelineKey::BLEND_ALPHA) { label = "transparent_mesh_pipeline".into(); blend = Some(BlendState::ALPHA_BLENDING); // For the transparent pass, fragments that are closer will be alpha @@ -96,7 +97,7 @@ pub mod r3d { write_mask: ColorWrites::ALL, })], }), - layout: Some(vec![self.mesh_pipeline.view_layout.clone()]), + layout: vec![self.mesh_pipeline.view_layout.clone()], primitive: PrimitiveState { front_face: FrontFace::Ccw, cull_mode: None, @@ -128,6 +129,7 @@ pub mod r3d { alpha_to_coverage_enabled: false, }, label: Some(label), + push_constant_ranges: vec![], }) } } @@ -147,7 +149,7 @@ pub mod r3d { .read() .get_id::() .unwrap(); - let key = MeshPipelineKey::from_msaa_samples(msaa.samples); + let key = MeshPipelineKey::from_msaa_samples(msaa.samples()); for (view, mut transparent_phase) in views.iter_mut() { let view_matrix = view.transform.compute_matrix(); let view_row_2 = view_matrix.row(2); @@ -183,7 +185,6 @@ pub mod r3d { pub mod r2d { use bevy::{ asset::Handle, - core_pipeline::core_2d::Transparent2d, prelude::*, render::{ mesh::MeshVertexBufferLayout, @@ -200,12 +201,13 @@ pub mod r2d { texture::BevyDefault, view::{Msaa, VisibleEntities}, }, - sprite::{ - DrawMesh2d, Mesh2dHandle, Mesh2dPipeline, Mesh2dPipelineKey, Mesh2dUniform, - SetMesh2dBindGroup, SetMesh2dViewBindGroup, - }, utils::FloatOrd, }; + use bevy_core_pipeline::core_2d::Transparent2d; + use bevy_sprite::{ + DrawMesh2d, Mesh2dHandle, Mesh2dPipeline, Mesh2dPipelineKey, Mesh2dUniform, + SetMesh2dBindGroup, SetMesh2dViewBindGroup, + }; use crate::lines::{RenderDebugLinesMesh, DEBUG_LINES_SHADER_HANDLE}; @@ -264,7 +266,7 @@ pub mod r2d { write_mask: ColorWrites::ALL, })], }), - layout: Some(vec![self.mesh_pipeline.view_layout.clone()]), + layout: vec![self.mesh_pipeline.view_layout.clone()], primitive: PrimitiveState { front_face: FrontFace::Ccw, cull_mode: None, @@ -281,6 +283,7 @@ pub mod r2d { alpha_to_coverage_enabled: false, }, label: None, + push_constant_ranges: vec![], }) } } @@ -297,7 +300,7 @@ pub mod r2d { ) { for (view, mut phase) in views.iter_mut() { let draw_mesh2d = draw2d_functions.read().get_id::().unwrap(); - let msaa_key = Mesh2dPipelineKey::from_msaa_samples(msaa.samples); + let msaa_key = Mesh2dPipelineKey::from_msaa_samples(msaa.samples()); for visible_entity in &view.entities { if let Ok((uniform, mesh_handle)) = material_meshes.get(*visible_entity) { -- cgit From 23a7ed5beba12161d67184cdf7e63caa86be45eb Mon Sep 17 00:00:00 2001 From: Sébastien Crozet Date: Sun, 29 Oct 2023 18:59:47 +0100 Subject: Fix crashes on MacOS --- src_testbed/lines/debuglines.wgsl | 53 ----- src_testbed/lines/debuglines2d.wgsl | 32 --- src_testbed/lines/mod.rs | 389 ------------------------------------ src_testbed/lines/render_dim.rs | 340 ------------------------------- 4 files changed, 814 deletions(-) delete mode 100644 src_testbed/lines/debuglines.wgsl delete mode 100644 src_testbed/lines/debuglines2d.wgsl delete mode 100644 src_testbed/lines/mod.rs delete mode 100644 src_testbed/lines/render_dim.rs (limited to 'src_testbed/lines') diff --git a/src_testbed/lines/debuglines.wgsl b/src_testbed/lines/debuglines.wgsl deleted file mode 100644 index 364d9ac..0000000 --- a/src_testbed/lines/debuglines.wgsl +++ /dev/null @@ -1,53 +0,0 @@ -// This should work, but it's bugged right now so we have to use 2 shaders: https://github.com/bevyengine/bevy/issues/4011 -#ifdef LINES_3D - #import bevy_pbr::mesh_view_bind_group - //#import bevy_pbr::mesh_struct -#else - //#import bevy_sprite::mesh2d_view_bind_group -#endif - -struct Vertex { - [[location(0)]] pos: vec3; - [[location(1)]] color: u32; -}; - -struct VertexOutput { - [[builtin(position)]] clip_position: vec4; - [[location(0)]] color: vec4; -}; - -struct FragmentOutput { - [[builtin(frag_depth)]] depth: f32; - [[location(0)]] color: vec4; -}; - -[[stage(vertex)]] -fn vertex(vertex: Vertex) -> VertexOutput { - var out: VertexOutput; - out.clip_position = view.view_proj * vec4(vertex.pos, 1.0); - // https://github.com/bevyengine/bevy/blob/328c26d02c50de0bc77f0d24a376f43ba89517b1/examples/2d/mesh2d_manual.rs#L234 - // ... except the above doesn't seem to work in 3d. Not sure what's going on there. - var r = f32(vertex.color & 255u) / 255.0; - var g = f32(vertex.color >> 8u & 255u) / 255.0; - var b = f32(vertex.color >> 16u & 255u) / 255.0; - var a = f32(vertex.color >> 24u & 255u) / 255.0; - out.color = vec4(r, g, b, a); - - return out; -} - -[[stage(fragment)]] -fn fragment(in: VertexOutput) -> FragmentOutput { - var out: FragmentOutput; - -// This should be #ifdef DEPTH_TEST_ENABLED && LINES_3D, but the -// preprocessor doesn't support that yet. -// Luckily, DEPTH_TEST_ENABLED isn't set in 2d anyway. -#ifdef DEPTH_TEST_ENABLED - out.depth = in.clip_position.z; -#else - out.depth = 1.0; -#endif - out.color = in.color; - return out; -} diff --git a/src_testbed/lines/debuglines2d.wgsl b/src_testbed/lines/debuglines2d.wgsl deleted file mode 100644 index b722d8a..0000000 --- a/src_testbed/lines/debuglines2d.wgsl +++ /dev/null @@ -1,32 +0,0 @@ -#import bevy_sprite::mesh2d_view_bind_group -[[group(0), binding(0)]] -var view: View; - -struct Vertex { - //[[location(0)]] color: vec4; - [[location(0)]] place: vec3; - [[location(1)]] color: u32; -}; - -struct VertexOutput { - [[builtin(position)]] clip_position: vec4; - [[location(0)]] color: vec4; -}; - -[[stage(vertex)]] -fn vertex(vertex: Vertex) -> VertexOutput { - var out: VertexOutput; - out.clip_position = view.view_proj * vec4(vertex.place, 1.0); - var r = f32(vertex.color & 255u) / 255.0; - var g = f32(vertex.color >> 8u & 255u) / 255.0; - var b = f32(vertex.color >> 16u & 255u) / 255.0; - var a = f32(vertex.color >> 24u & 255u) / 255.0; - out.color = vec4(r, g, b, a); - - return out; -} - -[[stage(fragment)]] -fn fragment(in: VertexOutput) -> [[location(0)]] vec4 { - return in.color; -} diff --git a/src_testbed/lines/mod.rs b/src_testbed/lines/mod.rs deleted file mode 100644 index c68b86e..0000000 --- a/src_testbed/lines/mod.rs +++ /dev/null @@ -1,389 +0,0 @@ -#![allow(warnings)] -use bevy::render::mesh::MeshVertexAttribute; -use bevy::render::render_resource::VertexFormat; -use bevy::render::view::NoFrustumCulling; -use bevy::render::MainWorld; -/** - * - * NOTE: this module and its submodules are only temporary. It is a copy-paste of the bevy-debug-lines - * crate: https://github.com/Toqozz/bevy_debug_lines (MIT license) - * It has been partially updated to work with bevy 0.7, but hasn’t been released yet. - * So, in the mean time, we are keeping a version here that we will replace by the - * upstream dependency once: - * 1. The version compatible with bevy 0.7 is released to crates.io. - * 2. We find a way to make the 2D version work with our examples. The problem - * only happens when running our own examples because cargo’s unification of - * features will enable the `3d` feature of `bevy_debug_lines` when running - * a `2d` example. - * - */ -use bevy::{ - asset::{Assets, HandleUntyped}, - prelude::*, - reflect::TypeUuid, - render::{ - mesh::{/*Indices,*/ Mesh, VertexAttributeValues}, - render_phase::AddRenderCommand, - render_resource::PrimitiveTopology, - render_resource::Shader, - RenderSet, - }, -}; -use bevy_pbr::{NotShadowCaster, NotShadowReceiver}; - -mod render_dim; - -// This module exists to "isolate" the `#[cfg]` attributes to this part of the -// code. Otherwise, we would pollute the code with a lot of feature -// gates-specific code. -#[cfg(feature = "dim3")] -mod dim { - pub(crate) use super::render_dim::r3d::{queue, DebugLinePipeline, DrawDebugLines}; - use bevy::{asset::Handle, render::mesh::Mesh}; - pub(crate) use bevy_core_pipeline::core_3d::Opaque3d as Phase; - - pub(crate) type MeshHandle = Handle; - pub(crate) fn from_handle(from: &MeshHandle) -> &Handle { - from - } - pub(crate) fn into_handle(from: Handle) -> MeshHandle { - from - } - pub(crate) const SHADER_FILE: &str = include_str!("debuglines.wgsl"); - pub(crate) const DIMMENSION: &str = "3d"; -} -#[cfg(feature = "dim2")] -mod dim { - pub(crate) use super::render_dim::r2d::{queue, DebugLinePipeline, DrawDebugLines}; - use bevy::{asset::Handle, render::mesh::Mesh}; - pub(crate) use bevy_core_pipeline::core_2d::Transparent2d as Phase; - use bevy_sprite::Mesh2dHandle; - - pub(crate) type MeshHandle = Mesh2dHandle; - pub(crate) fn from_handle(from: &MeshHandle) -> &Handle { - &from.0 - } - pub(crate) fn into_handle(from: Handle) -> MeshHandle { - Mesh2dHandle(from) - } - pub(crate) const SHADER_FILE: &str = include_str!("debuglines2d.wgsl"); - pub(crate) const DIMMENSION: &str = "2d"; -} - -// See debuglines.wgsl for explanation on 2 shaders. -//pub(crate) const SHADER_FILE: &str = include_str!("debuglines.wgsl"); -pub(crate) const DEBUG_LINES_SHADER_HANDLE: HandleUntyped = - HandleUntyped::weak_from_u64(Shader::TYPE_UUID, 17477439189930443325); - -#[derive(Resource)] -pub(crate) struct DebugLinesConfig { - depth_test: bool, -} - -/// Bevy plugin, for initializing stuff. -/// -/// # Usage -/// -/// ```.ignore -/// use bevy::prelude::*; -/// use bevy_prototype_debug_lines::*; -/// -/// App::new() -/// .add_plugins(DefaultPlugins) -/// .add_plugin(DebugLinesPlugin::default()) -/// .run(); -/// ``` -/// -/// Alternatively, you can initialize the plugin with depth testing, so that -/// debug lines cut through geometry. To do this, use [`DebugLinesPlugin::with_depth_test(true)`]. -/// ```.ignore -/// use bevy::prelude::*; -/// use bevy_prototype_debug_lines::*; -/// -/// App::new() -/// .add_plugins(DefaultPlugins) -/// .add_plugin(DebugLinesPlugin::with_depth_test(true)) -/// .run(); -/// ``` -#[derive(Debug, Default, Clone)] -pub struct DebugLinesPlugin { - depth_test: bool, -} - -impl DebugLinesPlugin { - /// Controls whether debug lines should be drawn with depth testing enabled - /// or disabled. - /// - /// # Arguments - /// - /// * `val` - True if lines should intersect with other geometry, or false - /// if lines should always draw on top be drawn on top (the default). - pub fn with_depth_test(val: bool) -> Self { - Self { depth_test: val } - } -} -use bevy::render::render_phase::DrawFunctions; -use bevy::render::Render; -impl Plugin for DebugLinesPlugin { - fn build(&self, app: &mut App) { - use bevy::render::{render_resource::SpecializedMeshPipelines, RenderApp}; - let mut shaders = app.world.get_resource_mut::>().unwrap(); - shaders.set_untracked( - DEBUG_LINES_SHADER_HANDLE, - Shader::from_wgsl(dim::SHADER_FILE, file!()), - ); - app.init_resource::(); - - app.init_resource::>(); - - app.add_systems(Startup, setup) - .add_systems(PostUpdate, update); - - app.sub_app_mut(RenderApp) - .init_resource::>() - .add_render_command::() - .insert_resource(DebugLinesConfig { - depth_test: self.depth_test, - }) - .init_resource::() - .init_resource::>() - .add_systems(Render, extract.in_set(RenderSet::ExtractCommands)) - .add_systems(Render, dim::queue.in_set(RenderSet::Queue)); - - info!("Loaded {} debug lines plugin.", dim::DIMMENSION); - } -} - -// Number of meshes to separate line buffers into. -// We don't really do culling currently but this is a gateway to that. -const MESH_COUNT: usize = 4; -// Maximum number of points for each individual mesh. -const MAX_POINTS_PER_MESH: usize = 2_usize.pow(16); -const _MAX_LINES_PER_MESH: usize = MAX_POINTS_PER_MESH / 2; -/// Maximum number of points. -pub const MAX_POINTS: usize = MAX_POINTS_PER_MESH * MESH_COUNT; -/// Maximum number of unique lines to draw at once. -pub const MAX_LINES: usize = MAX_POINTS / 2; - -const ATTRIBUTE_COLOR: MeshVertexAttribute = - MeshVertexAttribute::new("Vertex_Color", 1, VertexFormat::Uint32); - -fn setup(mut cmds: Commands, mut meshes: ResMut>) { - // Spawn a bunch of meshes to use for lines. - for i in 0..MESH_COUNT { - // Create a new mesh with the number of vertices we need. - let mut mesh = Mesh::new(PrimitiveTopology::LineList); - mesh.insert_attribute( - Mesh::ATTRIBUTE_POSITION, - VertexAttributeValues::Float32x3(Vec::with_capacity(MAX_POINTS_PER_MESH)), - ); - mesh.insert_attribute( - ATTRIBUTE_COLOR, - VertexAttributeValues::Uint32(Vec::with_capacity(MAX_POINTS_PER_MESH)), - ); - // https://github.com/Toqozz/bevy_debug_lines/issues/16 - //mesh.set_indices(Some(Indices::U16(Vec::with_capacity(MAX_POINTS_PER_MESH)))); - - cmds.spawn(( - dim::into_handle(meshes.add(mesh)), - NotShadowCaster, - NotShadowReceiver, - NoFrustumCulling, - Transform::default(), - GlobalTransform::default(), - Visibility::default(), - ComputedVisibility::default(), - DebugLinesMesh(i), - )); - } -} - -fn update( - debug_line_meshes: Query<(&dim::MeshHandle, &DebugLinesMesh)>, - time: Res