Bevy 0.18 (#72)

komadori · web-flow · commit cb5a20c8bc86 · 2026-02-17T22:55:18.000Z
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "bevy_mod_outline"
-version = "0.11.0"
+version = "0.12.0"
 edition = "2021"
 license = "MIT OR Apache-2.0"
 description = "A mesh outlining plugin for Bevy."
@@ -11,7 +11,7 @@ keywords = ["gamedev", "bevy", "outline"]
 categories = ["game-engines", "rendering"]
 
 [dependencies]
-bevy = { version = "0.17.0", default-features = false, features = [
+bevy = { version = "0.18", default-features = false, features = [
     "std",
     "async_executor",
     "bevy_log",
@@ -23,7 +23,7 @@ bitfield = "0.15"
 interpolation = { version = "0.3", optional = true }
 thiserror = "1.0"
 nonmax = "0.5"
-wgpu-types = "26"
+wgpu-types = "27"
 itertools = { version = "0.14", optional = true }
 
 [features]
@@ -33,11 +33,11 @@ reflect = []
 scene = ["bevy/bevy_scene"]
 
 [dev-dependencies]
-bevy = { version = "0.17.0", default-features = false, features = [
-    "animation",
+bevy = { version = "0.18", default-features = false, features = [
+    "gltf_animation",
     "bevy_anti_alias",
     "bevy_gltf",
-    "bevy_mesh_picking_backend",
+    "mesh_picking",
     "bevy_pbr",
     "bevy_post_process",
     "bevy_sprite",
diff --git a/README.md b/README.md
@@ -12,7 +12,7 @@ vertex extrusion and jump flood methods.
 
 ```toml
 [dependencies]
-bevy_mod_outline = "0.11"
+bevy_mod_outline = "0.12"
 ```
 
 ## Examples
@@ -96,6 +96,7 @@ cargo run --example picking
 
 | This Version | Bevy version |
 |--------------|--------------|
+| 0.12.x       | 0.18.x       |
 | 0.11.x       | 0.17.x       |
 | 0.10.x       | 0.16.x       |
 | 0.9.x        | 0.15.x       |
diff --git a/examples/animated_fox.rs b/examples/animated_fox.rs
@@ -15,7 +15,7 @@ fn main() {
             OutlinePlugin,
             AutoGenerateOutlineNormalsPlugin::default(),
         ))
-        .insert_resource(AmbientLight::default())
+        .insert_resource(GlobalAmbientLight::default())
         .add_systems(Startup, setup)
         .add_systems(Update, setup_scene_once_loaded)
         .run();
diff --git a/examples/hollow.rs b/examples/hollow.rs
@@ -15,7 +15,7 @@ fn main() {
             ),
         )
         .add_plugins(OutlinePlugin)
-        .insert_resource(AmbientLight::default())
+        .insert_resource(GlobalAmbientLight::default())
         .add_systems(Startup, setup)
         .add_systems(
             Update,
diff --git a/examples/morph_targets.rs b/examples/morph_targets.rs
@@ -25,7 +25,7 @@ fn main() {
             OutlinePlugin,
             AutoGenerateOutlineNormalsPlugin::default(),
         ))
-        .insert_resource(AmbientLight::default())
+        .insert_resource(GlobalAmbientLight::default())
         .add_systems(Startup, setup)
         .add_systems(Update, (name_morphs, setup_outlines, setup_animations))
         .run();
diff --git a/examples/ui_aa.rs b/examples/ui_aa.rs
@@ -140,10 +140,10 @@ fn setup(
                             border: UiRect::all(Val::Px(5.0)),
                             justify_content: JustifyContent::Center,
                             align_items: AlignItems::Center,
+                            border_radius: BorderRadius::MAX,
                             ..default()
                         },
                         BorderColor::all(Color::BLACK),
-                        BorderRadius::MAX,
                         BackgroundColor(Color::srgb(0.2, 0.2, 0.2)),
                         mode,
                     ))
diff --git a/examples/ui_mode.rs b/examples/ui_mode.rs
@@ -211,10 +211,10 @@ fn create_buttons<T: Component + States>(builder: &mut ChildSpawnerCommands, val
                             border: UiRect::all(Val::Px(5.0)),
                             justify_content: JustifyContent::Center,
                             align_items: AlignItems::Center,
+                            border_radius: BorderRadius::MAX,
                             ..default()
                         },
                         BorderColor::all(Color::BLACK),
-                        BorderRadius::MAX,
                         BackgroundColor(Color::srgb(0.2, 0.2, 0.2)),
                         value.clone(),
                     ))
diff --git a/src/common.wgsl b/src/common.wgsl
@@ -1,7 +1,6 @@
 #define_import_path bevy_mod_outline::common
 
 struct OutlineViewUniform {
-    @align(16)
     clip_from_world: mat4x4<f32>,
     world_from_view_a: mat2x4<f32>,
     world_from_view_b: f32,
diff --git a/src/flood/compose_output.rs b/src/flood/compose_output.rs
@@ -6,9 +6,10 @@ use bevy::{
         extract_component::{ComponentUniforms, DynamicUniformIndex},
         render_resource::{
             binding_types::{sampler, texture_2d, uniform_buffer},
-            BindGroupEntries, BindGroupLayout, BindGroupLayoutEntries, CachedRenderPipelineId,
-            FragmentState, PipelineCache, RenderPassDescriptor, RenderPipeline,
-            RenderPipelineDescriptor, Sampler, SamplerDescriptor, ShaderType, StoreOp,
+            BindGroupEntries, BindGroupLayoutDescriptor, BindGroupLayoutEntries,
+            CachedRenderPipelineId, FragmentState, PipelineCache, RenderPassDescriptor,
+            RenderPipeline, RenderPipelineDescriptor, Sampler, SamplerDescriptor, ShaderType,
+            StoreOp,
         },
         renderer::{RenderContext, RenderDevice},
         texture::CachedTexture,
@@ -27,7 +28,6 @@ use super::{DrawMode, OutlineViewUniform, COMPOSE_OUTPUT_SHADER_HANDLE};
 
 #[derive(Clone, Component, ShaderType)]
 pub(crate) struct ComposeOutputUniform {
-    #[align(16)]
     pub volume_offset: f32,
     pub volume_colour: Vec4,
 }
@@ -48,7 +48,7 @@ pub(crate) fn prepare_compose_output_uniform(
 
 #[derive(Clone, Resource)]
 pub(crate) struct ComposeOutputPipeline {
-    pub(crate) layout: BindGroupLayout,
+    pub(crate) layout: BindGroupLayoutDescriptor,
     pub(crate) sampler: Sampler,
     pub(crate) pipeline_cache: HashMap<ViewPipelineKey, CachedRenderPipelineId>,
 }
@@ -57,7 +57,7 @@ impl FromWorld for ComposeOutputPipeline {
     fn from_world(world: &mut World) -> Self {
         let render_device = world.resource::<RenderDevice>();
 
-        let layout = render_device.create_bind_group_layout(
+        let layout = BindGroupLayoutDescriptor::new(
             "outline_flood_compose_output_bind_group_layout",
             &BindGroupLayoutEntries::sequential(
                 ShaderStages::FRAGMENT,
@@ -193,6 +193,7 @@ impl<'w> ComposeOutputPass<'w> {
         view_entity: Entity,
         render_entity: Entity,
         input: &CachedTexture,
+        pipeline_cache: &PipelineCache,
         bounds: &URect,
     ) {
         let view_dynamic_index = self
@@ -210,7 +211,7 @@ impl<'w> ComposeOutputPass<'w> {
 
         let bind_group = render_context.render_device().create_bind_group(
             "outline_flood_compose_output_bind_group",
-            &self.pipeline.layout,
+            &pipeline_cache.get_bind_group_layout(&self.pipeline.layout),
             &BindGroupEntries::sequential((
                 &input.default_view,
                 &self.pipeline.sampler,
diff --git a/src/flood/compose_output.wgsl b/src/flood/compose_output.wgsl
@@ -2,7 +2,6 @@
 #import bevy_mod_outline::common::OutlineViewUniform
 
 struct ComposeOutputUniform {
-    @align(16)
     volume_offset: f32,
     volume_colour: vec4<f32>,
 }
diff --git a/src/flood/jump_flood.rs b/src/flood/jump_flood.rs
@@ -4,8 +4,8 @@ use bevy::{
     render::{
         render_resource::{
             binding_types::{sampler, texture_2d, uniform_buffer},
-            BindGroupEntries, BindGroupLayout, BindGroupLayoutEntries, CachedRenderPipelineId,
-            DynamicUniformBuffer, FragmentState, Operations, PipelineCache,
+            BindGroupEntries, BindGroupLayoutDescriptor, BindGroupLayoutEntries,
+            CachedRenderPipelineId, DynamicUniformBuffer, FragmentState, Operations, PipelineCache,
             RenderPassColorAttachment, RenderPassDescriptor, RenderPipeline,
             RenderPipelineDescriptor, Sampler, SamplerDescriptor, ShaderType,
         },
@@ -22,13 +22,13 @@ use super::JUMP_FLOOD_SHADER_HANDLE;
 
 #[derive(ShaderType)]
 pub(crate) struct JumpFloodUniform {
-    #[align(16)]
     pub(crate) size: u32,
+    _padding: Vec3,
 }
 
 #[derive(Resource)]
 pub(crate) struct JumpFloodPipeline {
-    pub(crate) layout: BindGroupLayout,
+    pub(crate) layout: BindGroupLayoutDescriptor,
     pub(crate) sampler: Sampler,
     pub(crate) pipeline_id: CachedRenderPipelineId,
     pub(crate) lookup_buffer: DynamicUniformBuffer<JumpFloodUniform>,
@@ -39,7 +39,7 @@ impl FromWorld for JumpFloodPipeline {
     fn from_world(world: &mut World) -> Self {
         let render_device = world.resource::<RenderDevice>();
 
-        let layout = render_device.create_bind_group_layout(
+        let layout = BindGroupLayoutDescriptor::new(
             "outline_jump_flood_bind_group_layout",
             &BindGroupLayoutEntries::sequential(
                 ShaderStages::FRAGMENT,
@@ -85,7 +85,10 @@ impl FromWorld for JumpFloodPipeline {
         );
         let mut offsets = Vec::new();
         for bit in 0..32 {
-            offsets.push(uniform_buffer.push(&JumpFloodUniform { size: 1 << bit }));
+            offsets.push(uniform_buffer.push(&JumpFloodUniform {
+                size: 1 << bit,
+                _padding: Vec3::default(),
+            }));
         }
         uniform_buffer.write_buffer(render_device, render_queue);
 
@@ -121,12 +124,13 @@ impl<'w> JumpFloodPass<'w> {
         render_context: &mut RenderContext<'_>,
         input: &CachedTexture,
         output: &CachedTexture,
+        pipeline_cache: &PipelineCache,
         size: u32,
         bounds: &URect,
     ) {
         let bind_group = render_context.render_device().create_bind_group(
             "outline_jump_flood_bind_group",
-            &self.pipeline.layout,
+            &pipeline_cache.get_bind_group_layout(&self.pipeline.layout),
             &BindGroupEntries::sequential((
                 &input.default_view,
                 &self.pipeline.sampler,
diff --git a/src/flood/jump_flood.wgsl b/src/flood/jump_flood.wgsl
@@ -1,8 +1,8 @@
 #import bevy_core_pipeline::fullscreen_vertex_shader::FullscreenVertexOutput
 
 struct JumpFloodUniform {
-    @align(16)
     step_length: u32,
+    _padding: vec3<f32>
 }
 
 @group(0) @binding(0) var screen_texture: texture_2d<f32>;
diff --git a/src/flood/node.rs b/src/flood/node.rs
@@ -10,7 +10,7 @@ use bevy::{
         camera::ExtractedCamera,
         render_graph::{NodeRunError, RenderGraphContext, ViewNode},
         render_phase::{PhaseItemExtraIndex, SortedPhaseItem},
-        render_resource::CachedRenderPipelineId,
+        render_resource::{CachedRenderPipelineId, PipelineCache},
         renderer::RenderContext,
         sync_world::MainEntity,
         view::ViewTarget,
@@ -127,6 +127,7 @@ impl ViewNode for FloodNode {
         world: &'w World,
     ) -> Result<(), NodeRunError> {
         let view_entity = graph.view_entity();
+        let pipeline_cache = world.resource::<PipelineCache>();
         let Some(flood_phase) = world
             .get_resource::<ViewSortedRenderPhases<FloodOutline>>()
             .and_then(|ps| ps.get(&view.retained_view_entity))
@@ -187,6 +188,7 @@ impl ViewNode for FloodNode {
                     render_context,
                     flood_textures.input(),
                     flood_textures.output(),
+                    pipeline_cache,
                     size,
                     &screen_space_bounds,
                 );
@@ -198,6 +200,7 @@ impl ViewNode for FloodNode {
                 view_entity,
                 first_item.entity,
                 flood_textures.input(),
+                pipeline_cache,
                 &screen_space_bounds,
             );
         }
diff --git a/src/lib.rs b/src/lib.rs
@@ -572,7 +572,8 @@ impl Plugin for OutlinePlugin {
             .init_resource::<AlphaMaskBindGroups>();
 
         let render_device = render_app.world().resource::<RenderDevice>();
-        let instance_buffer = BatchedInstanceBuffer::<OutlineInstanceUniform>::new(render_device);
+        let instance_buffer =
+            BatchedInstanceBuffer::<OutlineInstanceUniform>::new(&render_device.limits());
         render_app.insert_resource(instance_buffer).add_systems(
             Render,
             write_batched_instance_buffer::<OutlinePipeline>
diff --git a/src/msaa.rs b/src/msaa.rs
@@ -63,8 +63,11 @@ impl ViewNode for MsaaExtraWritebackNode {
             occlusion_query_set: None,
         };
 
-        let bind_group =
-            blit_pipeline.create_bind_group(render_context.render_device(), post_process.source);
+        let bind_group = blit_pipeline.create_bind_group(
+            render_context.render_device(),
+            post_process.source,
+            pipeline_cache,
+        );
 
         let mut render_pass = render_context
             .command_encoder()
diff --git a/src/pipeline.rs b/src/pipeline.rs
@@ -10,13 +10,14 @@ use bevy::render::batching::{gpu_preprocessing, GetBatchData, GetFullBatchData};
 use bevy::render::mesh::allocator::MeshAllocator;
 use bevy::render::render_resource::binding_types::{sampler, texture_2d, uniform_buffer_sized};
 use bevy::render::render_resource::{
-    BindGroupLayout, BindGroupLayoutEntries, BlendState, ColorTargetState, ColorWrites,
+    BindGroupLayoutDescriptor, BindGroupLayoutEntries, BlendState, ColorTargetState, ColorWrites,
     CompareFunction, DepthBiasState, DepthStencilState, Face, FragmentState, FrontFace,
-    GpuArrayBuffer, MultisampleState, PolygonMode, PrimitiveState, ShaderStages, ShaderType,
-    StencilState, TextureFormat, VertexState,
+    GpuArrayBuffer, MultisampleState, PolygonMode, PrimitiveState, PushConstantRange,
+    SamplerBindingType, ShaderStages, ShaderType, StencilState, TextureFormat, TextureSampleType,
+    VertexState,
 };
 use bevy::render::renderer::RenderDevice;
-use bevy::render::settings::WgpuSettings;
+use bevy::render::settings::{Backends, WgpuSettings};
 use bevy::render::sync_world::MainEntity;
 use bevy::render::view::ViewTarget;
 use bevy::shader::ShaderDefVal;
@@ -27,7 +28,6 @@ use bevy::{
     },
 };
 use nonmax::NonMaxU32;
-use wgpu_types::{Backends, PushConstantRange, SamplerBindingType, TextureSampleType};
 
 use crate::pipeline_key::{DerivedPipelineKey, PassType};
 use crate::uniforms::{DepthMode, OutlineInstanceUniform, RenderOutlineInstances};
@@ -46,9 +46,9 @@ pub(crate) const FRAGMENT_SHADER_HANDLE: Handle<Shader> =
 #[derive(Resource)]
 pub(crate) struct OutlinePipeline {
     mesh_pipeline: MeshPipeline,
-    pub outline_view_bind_group_layout: BindGroupLayout,
-    pub outline_instance_bind_group_layout: BindGroupLayout,
-    pub alpha_mask_bind_group_layout: BindGroupLayout,
+    pub outline_view_bind_group_layout: BindGroupLayoutDescriptor,
+    pub outline_instance_bind_group_layout: BindGroupLayoutDescriptor,
+    pub alpha_mask_bind_group_layout: BindGroupLayoutDescriptor,
     pub instance_batch_size: Option<u32>,
     pub skins_use_uniform_buffers: bool,
 }
@@ -57,21 +57,22 @@ impl FromWorld for OutlinePipeline {
     fn from_world(world: &mut World) -> Self {
         let mesh_pipeline = world.get_resource::<MeshPipeline>().unwrap().clone();
         let render_device = world.get_resource::<RenderDevice>().unwrap();
-        let outline_view_bind_group_layout = render_device.create_bind_group_layout(
+        let limits = render_device.limits();
+        let outline_view_bind_group_layout = BindGroupLayoutDescriptor::new(
             "outline_view_bind_group_layout",
             &BindGroupLayoutEntries::single(
                 ShaderStages::VERTEX,
                 uniform_buffer_sized(true, Some(OutlineViewUniform::min_size())),
             ),
         );
-        let outline_instance_bind_group_layout = render_device.create_bind_group_layout(
+        let outline_instance_bind_group_layout = BindGroupLayoutDescriptor::new(
             "outline_instance_bind_group_layout",
             &BindGroupLayoutEntries::single(
                 ShaderStages::VERTEX,
-                GpuArrayBuffer::<OutlineInstanceUniform>::binding_layout(render_device),
+                GpuArrayBuffer::<OutlineInstanceUniform>::binding_layout(&limits),
             ),
         );
-        let alpha_mask_bind_group_layout = render_device.create_bind_group_layout(
+        let alpha_mask_bind_group_layout = BindGroupLayoutDescriptor::new(
             "alpha_mask_bind_group_layout",
             &BindGroupLayoutEntries::sequential(
                 ShaderStages::FRAGMENT,
@@ -82,9 +83,8 @@ impl FromWorld for OutlinePipeline {
             ),
         );
 
-        let instance_batch_size =
-            GpuArrayBuffer::<OutlineInstanceUniform>::batch_size(render_device);
-        let skins_use_uniform_buffers = skins_use_uniform_buffers(render_device);
+        let instance_batch_size = GpuArrayBuffer::<OutlineInstanceUniform>::batch_size(&limits);
+        let skins_use_uniform_buffers = skins_use_uniform_buffers(&limits);
         OutlinePipeline {
             mesh_pipeline,
             outline_view_bind_group_layout,
diff --git a/src/pipeline_key.rs b/src/pipeline_key.rs
diff --git a/src/queue.rs b/src/queue.rs
diff --git a/src/uniforms.rs b/src/uniforms.rs
diff --git a/src/view_uniforms.rs b/src/view_uniforms.rs

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ fn main() {`
`15`	`15`	`),`
`16`	`16`	`)`
`17`	`17`	`.add_plugins(OutlinePlugin)`
`18`		`- .insert_resource(AmbientLight::default())`
	`18`	`+ .insert_resource(GlobalAmbientLight::default())`
`19`	`19`	`.add_systems(Startup, setup)`
`20`	`20`	`.add_systems(`
`21`	`21`	`Update,`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,6 @@`
`2`	`2`	`#import bevy_mod_outline::common::OutlineViewUniform`
`3`	`3`
`4`	`4`	`struct ComposeOutputUniform {`
`5`		`- @align(16)`
`6`	`5`	`volume_offset: f32,`
`7`	`6`	`volume_colour: vec4<f32>,`
`8`	`7`	`}`