diff options
| author | Sébastien Crozet <developer@crozet.re> | 2022-08-08 09:10:59 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-08 09:10:59 +0200 |
| commit | abdbf5ffec5cd7f3c2a1bfd17491b3740561a4e1 (patch) | |
| tree | c5ff894118ffa0495196e342116d6ed7bc3d129d /src_testbed/lines/render_dim.rs | |
| parent | 90c97341b1e9c032375ece0aa6a00348702b7e8b (diff) | |
| parent | c4f078daf35d093c59905860296abb2ff3655a5c (diff) | |
| download | rapier-abdbf5ffec5cd7f3c2a1bfd17491b3740561a4e1.tar.gz rapier-abdbf5ffec5cd7f3c2a1bfd17491b3740561a4e1.tar.bz2 rapier-abdbf5ffec5cd7f3c2a1bfd17491b3740561a4e1.zip | |
Merge pull request #374 from SludgePhD/update-bevy-wgpu
Update bevy (and thus wgpu)
Diffstat (limited to 'src_testbed/lines/render_dim.rs')
| -rw-r--r-- | src_testbed/lines/render_dim.rs | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src_testbed/lines/render_dim.rs b/src_testbed/lines/render_dim.rs index 92215f2..be23321 100644 --- a/src_testbed/lines/render_dim.rs +++ b/src_testbed/lines/render_dim.rs @@ -1,6 +1,6 @@ pub mod r3d { use bevy::{ - core_pipeline::Opaque3d, + core_pipeline::core_3d::Opaque3d, pbr::{ DrawMesh, MeshPipeline, MeshPipelineKey, MeshUniform, SetMeshBindGroup, SetMeshViewBindGroup, @@ -89,11 +89,11 @@ pub mod r3d { shader: self.shader.clone_weak(), shader_defs, entry_point: "fragment".into(), - targets: vec![ColorTargetState { + targets: vec![Some(ColorTargetState { format: TextureFormat::bevy_default(), blend, write_mask: ColorWrites::ALL, - }], + })], }), layout: Some(vec![self.mesh_pipeline.view_layout.clone()]), primitive: PrimitiveState { @@ -182,8 +182,7 @@ pub mod r3d { pub mod r2d { use bevy::{ asset::Handle, - core::FloatOrd, - core_pipeline::Transparent2d, + core_pipeline::core_2d::Transparent2d, prelude::*, render::{ mesh::MeshVertexBufferLayout, @@ -204,6 +203,7 @@ pub mod r2d { DrawMesh2d, Mesh2dHandle, Mesh2dPipeline, Mesh2dPipelineKey, Mesh2dUniform, SetMesh2dBindGroup, SetMesh2dViewBindGroup, }, + utils::FloatOrd, }; use crate::lines::{RenderDebugLinesMesh, DEBUG_LINES_SHADER_HANDLE}; @@ -256,11 +256,11 @@ pub mod r2d { shader: self.shader.clone_weak(), shader_defs: vec![], entry_point: "fragment".into(), - targets: vec![ColorTargetState { + targets: vec![Some(ColorTargetState { format: TextureFormat::bevy_default(), blend: Some(BlendState::ALPHA_BLENDING), write_mask: ColorWrites::ALL, - }], + })], }), layout: Some(vec![self.mesh_pipeline.view_layout.clone()]), primitive: PrimitiveState { |