Fixing code broken by new bevy version

Author: catilac

crates/processing_render/src/geometry/attribute.rs

@@ -1,6 +1,7 @@
 use std::ops::Range;
 
 use bevy::{
+    asset::AssetMut,
     mesh::{Indices, MeshVertexAttribute, VertexAttributeValues},
     prelude::*,
     render::render_resource::VertexFormat,
@@ -31,7 +32,7 @@ fn get_mesh_mut<'a>(
     entity: Entity,
     geometries: &Query<&Geometry>,
     meshes: &'a mut Assets<Mesh>,
-) -> Result<&'a mut Mesh> {
+) -> Result<AssetMut<'a, Mesh>> {
     let geometry = geometries
         .get(entity)
         .map_err(|_| ProcessingError::GeometryNotFound)?;
@@ -89,7 +90,7 @@ macro_rules! impl_setter {
             geometries: Query<&Geometry>,
             mut meshes: ResMut<Assets<Mesh>>,
         ) -> Result<()> {
-            let mesh = get_mesh_mut(entity, &geometries, &mut meshes)?;
+            let mut mesh = get_mesh_mut(entity, &geometries, &mut meshes)?;
             match mesh.attribute_mut($attr) {
                 Some(VertexAttributeValues::$variant(data)) => {
                     let idx = index as usize;
@@ -335,7 +336,7 @@ pub fn set_attribute(
     geometries: Query<&Geometry>,
     mut meshes: ResMut<Assets<Mesh>>,
 ) -> Result<()> {
-    let mesh = get_mesh_mut(entity, &geometries, &mut meshes)?;
+    let mut mesh = get_mesh_mut(entity, &geometries, &mut meshes)?;
     let idx = index as usize;
 
     let attr = mesh.attribute_mut(attribute_id).ok_or_else(|| {

crates/processing_render/src/geometry/mod.rs

@@ -250,7 +250,7 @@ pub fn vertex(
         .get(geometry.layout)
         .map_err(|_| ProcessingError::LayoutNotFound)?;
 
-    let mesh = meshes
+    let mut mesh = meshes
         .get_mut(&geometry.handle)
         .ok_or(ProcessingError::GeometryNotFound)?;
 
@@ -323,7 +323,7 @@ pub fn index(
         .get(entity)
         .map_err(|_| ProcessingError::GeometryNotFound)?;
 
-    let mesh = meshes
+    let mut mesh = meshes
         .get_mut(&geometry.handle)
         .ok_or(ProcessingError::GeometryNotFound)?;
 

crates/processing_render/src/graphics.rs

@@ -5,7 +5,7 @@
 //! configured to render to a specific surface (either a window or an offscreen image).
 use bevy::{
     camera::{
-        CameraMainTextureUsages, CameraOutputMode, CameraProjection, ClearColorConfig,
+        CameraMainTextureUsages, CameraOutputMode, CameraProjection, ClearColorConfig, Hdr,
         ImageRenderTarget, MsaaWriteback, Projection, RenderTarget, visibility::RenderLayers,
     },
     core_pipeline::tonemapping::Tonemapping,
@@ -20,7 +20,7 @@ use bevy::{
         },
         renderer::{RenderDevice, RenderQueue},
         sync_world::MainEntity,
-        view::{Hdr, ViewTarget, prepare_view_targets},
+        view::{ViewTarget, prepare_view_targets},
     },
     window::WindowRef,
 };
@@ -51,7 +51,7 @@ impl Plugin for GraphicsPlugin {
             .add_systems(
                 Render,
                 send_view_targets
-                    .in_set(RenderSystems::ManageViews)
+                    .in_set(RenderSystems::Specialize)
                     .after(prepare_view_targets),
             )
             .insert_resource(GraphicsTargetSender(tx));
@@ -293,6 +293,10 @@ pub fn mode_3d(
     let near = camera_z / 10.0;
     let far = camera_z * 10.0;
 
+    // TODO: Setting this as a default, but we need to think about API around
+    // a user defined value
+    let near_clip_plane = vec4(0.0, 0.0, -1.0, -near);
+
     let mut projection = projections
         .get_mut(entity)
         .map_err(|_| ProcessingError::GraphicsNotFound)?;
@@ -302,6 +306,7 @@ pub fn mode_3d(
         aspect_ratio: aspect,
         near,
         far,
+        near_clip_plane,
     });
 
     let mut transform = transforms
@@ -351,6 +356,7 @@ pub fn perspective(
             aspect_ratio,
             near,
             far,
+            near_clip_plane,
         },
     )): In<(Entity, PerspectiveProjection)>,
     mut projections: Query<&mut Projection>,
@@ -364,6 +370,7 @@ pub fn perspective(
         aspect_ratio,
         near,
         far,
+        near_clip_plane,
     });
 
     Ok(())
@@ -526,7 +533,8 @@ pub fn readback(
     });
 
     render_device
-        .poll(PollType::Wait)
+        // TODO: should this have a timeout?
+        .poll(PollType::wait_indefinitely())
         .expect("Failed to poll device for map async");
 
     r.recv().expect("Failed to receive the map_async message");

crates/processing_render/src/image.rs

@@ -255,14 +255,15 @@ pub fn readback(
     });
 
     render_device
-        .poll(PollType::Wait)
+        // TODO: Should this be a timeout instead?
+        .poll(PollType::wait_indefinitely())
         .expect("Failed to poll device for map async");
 
     r.recv().expect("Failed to receive the map_async message");
 
     let data = buffer_slice.get_mapped_range().to_vec();
 
-    let image = images
+    let mut image = images
         .get_mut(&p_image.handle)
         .ok_or(ProcessingError::ImageNotFound)?;
     image.data = Some(data.clone());

crates/processing_render/src/lib.rs

@@ -517,6 +517,7 @@ pub fn graphics_perspective(
     aspect_ratio: f32,
     near: f32,
     far: f32,
+    near_clip_plane: Vec4,
 ) -> error::Result<()> {
     app_mut(|app| {
         flush(app, graphics_entity)?;
@@ -530,6 +531,7 @@ pub fn graphics_perspective(
                         aspect_ratio,
                         near,
                         far,
+                        near_clip_plane,
                     },
                 ),
             )

crates/processing_render/src/material/mod.rs

@@ -66,10 +66,10 @@ pub fn set_property(
         .clone()
         .try_typed::<StandardMaterial>()
         .map_err(|_| ProcessingError::MaterialNotFound)?;
-    let standard = standard_materials
+    let mut standard = standard_materials
         .get_mut(&handle)
         .ok_or(ProcessingError::MaterialNotFound)?;
-    pbr::set_property(standard, &name, &value)?;
+    pbr::set_property(&mut standard, &name, &value)?;
     Ok(())
 }
 

crates/processing_render/src/material/pbr.rs

@@ -1,5 +1,4 @@
 use bevy::prelude::*;
-use bevy::render::alpha::AlphaMode;
 
 use super::MaterialValue;
 use crate::error::{ProcessingError, Result};

crates/processing_render/src/render/material.rs

@@ -1,4 +1,4 @@
-use bevy::{prelude::*, render::alpha::AlphaMode};
+use bevy::prelude::*;
 use std::ops::Deref;
 
 /// A component that holds an untyped handle to a material. This allows the main render loop

crates/processing_render/src/sketch.rs

@@ -73,7 +73,7 @@ pub struct Sketch {
 ///
 /// Currently supports `.py` files, but the loader is designed to be extended
 /// for other languages in the future.
-#[derive(Default)]
+#[derive(Default, TypePath)]
 pub struct SketchLoader;
 
 impl AssetLoader for SketchLoader {