From cb8f4cc2c3c9b76344cecb9b345bea7199cb01eb Mon Sep 17 00:00:00 2001
From: Sergei Surovtsev <97428129+stillonearth@users.noreply.github.com>
Date: Mon, 1 Jul 2024 09:05:45 -0600
Subject: [PATCH] bevy 0.14

---
 Cargo.toml    | 12 ++++++------
 src/api.rs    |  2 +-
 src/lib.rs    | 20 ++++++++++----------
 src/render.rs |  3 ++-
 4 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 680247f..2277011 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,30 +1,30 @@
 [package]
 edition = "2021"
 name = "bevy_rl"
-version = "0.13.0"
+version = "0.14.0-rc.1"
 license = "MIT OR Apache-2.0"
 description = "Build environments for reinforcement learning with bevy"
 keywords = ["ai", "bevy", "gym", "rl"]
 repository = "https://github.com/stillonearth/bevy_rl"
 
 [dependencies]
-bevy = { version = "0.13" }
+bevy = { version = "0.14.0-rc.4" }
 bytemuck = "1.12.3"
 crossbeam = "0.8.2"
 crossbeam-channel = "0.5.6"
 futures = "0.3.23"
 gotham = "0.7.1"
-hyper = "0.14.20"
-image = "0.24.3"
+hyper = "0.14.20" # this dependencie is due to gotham no longer in development
+image = "0.25.1"
 mime = "0.3.16"
 serde = "1.0.89"
 serde_derive = "1.0.143"
 serde_json = "1.0.83"
-wgpu = "0.19.1"
+wgpu = "0.20.1"
 
 [dev-dependencies]
 bitflags = "2.0.2"
-reqwest = { version = "0.11.13", features = ["blocking"] }
+reqwest = { version = "0.12.5", features = ["blocking"] }
 
 [profile.dev]
 opt-level = 3
diff --git a/src/api.rs b/src/api.rs
index 56ff21f..7f97e81 100644
--- a/src/api.rs
+++ b/src/api.rs
@@ -106,7 +106,7 @@ fn visual_observations<
     }
 
     all_agents_image
-        .write_to(&mut Cursor::new(&mut bytes), image::ImageOutputFormat::Png)
+        .write_to(&mut Cursor::new(&mut bytes), image::ImageFormat::Png)
         .unwrap();
 
     let response = create_response::<Vec<u8>>(&state, StatusCode::OK, mime::IMAGE_PNG, bytes);
diff --git a/src/lib.rs b/src/lib.rs
index f782e11..0eff07c 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -68,7 +68,7 @@ impl<
         app.add_systems(Startup, setup::<T, P>);
 
         let ai_gym_state = app
-            .world
+            .world()
             .get_resource::<state::AIGymState<T, P>>()
             .unwrap()
             .clone();
@@ -101,13 +101,13 @@ impl<
                     .in_set(SimulationState::PausedForControl),
             );
 
-        if let Ok(render_app) = app.get_sub_app_mut(RenderApp) {
-            render_app.add_systems(
-                Update,
-                copy_from_gpu_to_ram::<T, P>.in_set(RenderSet::Render),
-            );
-            render_app.insert_resource(ai_gym_state);
-        }
+        let render_app = app.get_sub_app_mut(RenderApp).unwrap();
+
+        render_app.add_systems(
+            Update,
+            copy_from_gpu_to_ram::<T, P>.in_set(RenderSet::Render),
+        );
+        render_app.insert_resource(ai_gym_state);
     }
 }
 
@@ -169,7 +169,7 @@ pub(crate) fn setup<
 
     commands
         .spawn(Camera2dBundle::default())
-        .insert(second_pass_layer);
+        .insert(second_pass_layer.clone());
 
     // Show all camera views in tiled mode
     // let window = windows.get_primary_mut().unwrap();
@@ -199,7 +199,7 @@ pub(crate) fn setup<
                     transform: Transform::from_xyz(x - offset_x, y - offset_y, 0.0),
                     ..default()
                 })
-                .insert(second_pass_layer);
+                .insert(second_pass_layer.clone());
         }
     }
 }
diff --git a/src/render.rs b/src/render.rs
index 0b66c4d..7b80be1 100644
--- a/src/render.rs
+++ b/src/render.rs
@@ -6,6 +6,7 @@ use bevy::{
             Extent3d, TextureDescriptor, TextureDimension, TextureFormat, TextureUsages,
         },
         renderer::{RenderDevice, RenderQueue},
+        texture::GpuImage,
     },
 };
 
@@ -37,7 +38,7 @@ pub(crate) fn copy_from_gpu_to_ram<
     T: 'static + Send + Sync + Clone + std::panic::RefUnwindSafe,
     P: 'static + Send + Sync + Clone + std::panic::RefUnwindSafe + serde::Serialize,
 >(
-    gpu_images: Res<RenderAssets<Image>>,
+    gpu_images: Res<RenderAssets<GpuImage>>,
     render_device: Res<RenderDevice>,
     render_queue: Res<RenderQueue>,
     ai_gym_state: Res<state::AIGymState<T, P>>,