From a7de172a7d71376f1df4b537ebd3cc552b6406f0 Mon Sep 17 00:00:00 2001
From: Mika Vatanen <blaind@blaind.net>
Date: Thu, 25 Aug 2022 21:42:23 +0300
Subject: [PATCH] Upgrade to bevy 0.8.0

---
 Cargo.toml              | 8 ++++----
 README.md               | 1 +
 examples/3d_scene.rs    | 2 +-
 examples/performance.rs | 4 ++--
 src/mesh_system.rs      | 2 +-
 5 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 22c1f71..d24adf9 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "bevy_text_mesh"
-version = "0.2.0"
+version = "0.3.0"
 edition = "2021"
 description = "A bevy 3D text mesh generator for displaying text"
 repository = "https://github.com/blaind/bevy_text_mesh"
@@ -18,15 +18,15 @@ anyhow = "1.0"
 glyph_brush_layout = "0.2.3"
 
 [dependencies.bevy]
-version = "0.7.0"
+version = "0.8.0"
 default-features = false
-features = ["render"]
+features = ["render", "bevy_asset"]
 
 [dev-dependencies]
 rand = "0.8.4"
 
 [dev-dependencies.bevy]
-version = "0.7.0"
+version = "0.8.0"
 default-features = false
 features = [
   "bevy_winit",
diff --git a/README.md b/README.md
index e9f712e..24cee82 100644
--- a/README.md
+++ b/README.md
@@ -28,6 +28,7 @@ Consider this as a preview of the plugin for gathering feedback about the API:
 
 | bevy | bevy_text_mesh |
 | ---- | -------------- |
+| 0.8  | 0.3.0          |
 | 0.7  | 0.2.0          |
 | 0.6  | 0.1.0          |
 | 0.5  | 0.0.2          |
diff --git a/examples/3d_scene.rs b/examples/3d_scene.rs
index 43d9a18..dabdaa9 100644
--- a/examples/3d_scene.rs
+++ b/examples/3d_scene.rs
@@ -125,7 +125,7 @@ fn setup(
         transform: Transform::from_xyz(4.0, 8.0, 4.0),
         ..Default::default()
     });
-    commands.spawn_bundle(PerspectiveCameraBundle {
+    commands.spawn_bundle(Camera3dBundle {
         transform: Transform::from_xyz(-2.0, 2.5, 5.0).looking_at(Vec3::ZERO, Vec3::Y),
         ..Default::default()
     });
diff --git a/examples/performance.rs b/examples/performance.rs
index 53599e2..d876641 100644
--- a/examples/performance.rs
+++ b/examples/performance.rs
@@ -200,7 +200,7 @@ fn update_text_mesh(
     }
 
     state.text_update_count += update_count;
-    diagnostics.add_measurement(TEXT_MESH_UPDATES, state.text_update_count as f64);
+    diagnostics.add_measurement(TEXT_MESH_UPDATES, || { state.text_update_count as f64 });
 }
 
 fn rotate_camera(mut camera: Query<&mut Transform, With<Camera>>, time: Res<Time>) {
@@ -265,7 +265,7 @@ fn setup(
         transform: Transform::from_xyz(4.0, 8.0, 4.0),
         ..Default::default()
     });
-    commands.spawn_bundle(PerspectiveCameraBundle {
+    commands.spawn_bundle(Camera3dBundle {
         transform: Transform::from_xyz(-2.0, 2.5, 5.0).looking_at(Vec3::ZERO, Vec3::Y),
         ..Default::default()
     });
diff --git a/src/mesh_system.rs b/src/mesh_system.rs
index 88910eb..986cbdd 100644
--- a/src/mesh_system.rs
+++ b/src/mesh_system.rs
@@ -51,7 +51,7 @@ pub(crate) fn text_mesh(
 
         match mesh {
             Some(mesh) => {
-                let mesh = meshes.get_mut(mesh.clone()).unwrap();
+                let mesh = meshes.get_mut(mesh).unwrap();
                 apply_mesh(ttf2_mesh, mesh);
 
                 // TODO: handle color updates