From c9f877a4b156be7d95c3f38672008fc2935bbb94 Mon Sep 17 00:00:00 2001
From: Bram Buurlage <brambuurlage@gmail.com>
Date: Tue, 11 Jul 2023 21:35:10 +0200
Subject: [PATCH] Migrated to bevy 0.11

---
 CHANGELOG.MD          |  3 +++
 Cargo.toml            |  8 ++------
 examples/skin_mesh.rs | 18 ++++++++----------
 src/lib.rs            |  5 +----
 4 files changed, 14 insertions(+), 20 deletions(-)

diff --git a/CHANGELOG.MD b/CHANGELOG.MD
index 87a1ecb..dedb6de 100644
--- a/CHANGELOG.MD
+++ b/CHANGELOG.MD
@@ -11,3 +11,6 @@
 
 # Version 0.3.0
 - Migrated to bevy 0.10
+
+# Version 0.4.0
+- Migrated to bevy 0.11
diff --git a/Cargo.toml b/Cargo.toml
index b2f6ed7..66fef61 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "bevy_mod_inverse_kinematics"
-version = "0.3.0"
+version = "0.4.0"
 authors = ["Bram Buurlage <brambuurlage@gmail.com>"]
 edition = "2021"
 categories = ["game-engines", "graphics", "rendering"]
@@ -10,8 +10,4 @@ keywords = ["gamedev", "graphics", "bevy", "animation"]
 license = "MIT OR Apache-2.0"
 
 [dependencies]
-bevy = "0.10"
-#bevy_prototype_debug_lines = { version = "0.9.1", features = ["3d"], optional = true }
-
-[features]
-#debug_lines = ["bevy_prototype_debug_lines"]
\ No newline at end of file
+bevy = "0.11"
diff --git a/examples/skin_mesh.rs b/examples/skin_mesh.rs
index 2edbe3b..4308330 100644
--- a/examples/skin_mesh.rs
+++ b/examples/skin_mesh.rs
@@ -13,10 +13,9 @@ fn main() {
             }),
             ..default()
         }))
-        .add_plugin(InverseKinematicsPlugin)
-        .add_startup_system(setup)
-        .add_system(setup_ik)
-        .add_system(manually_target)
+        .add_plugins(InverseKinematicsPlugin)
+        .add_systems(Startup, setup)
+        .add_systems(Update, (setup_ik, manually_target))
         .run();
 }
 
@@ -188,16 +187,15 @@ fn manually_target(
 
     if let Some(event) = cursor.iter().last() {
         let view = transform.compute_matrix();
-        let (viewport_min, viewport_max) = camera.logical_viewport_rect().unwrap();
-        let screen_size = camera.logical_target_size().unwrap();
-        let viewport_size = viewport_max - viewport_min;
-        let adj_cursor_pos =
-            event.position - Vec2::new(viewport_min.x, screen_size.y - viewport_max.y);
+        let viewport_rect = camera.logical_viewport_rect().unwrap();
+        let viewport_size = viewport_rect.size();
+        let adj_cursor_pos = event.position - Vec2::new(viewport_rect.min.x, viewport_rect.min.y);
 
         let projection = camera.projection_matrix();
         let far_ndc = projection.project_point3(Vec3::NEG_Z).z;
         let near_ndc = projection.project_point3(Vec3::Z).z;
-        let cursor_ndc = (adj_cursor_pos / viewport_size) * 2.0 - Vec2::ONE;
+        let cursor_ndc =
+            ((adj_cursor_pos / viewport_size) * 2.0 - Vec2::ONE) * Vec2::new(1.0, -1.0);
         let ndc_to_world: Mat4 = view * projection.inverse();
         let near = ndc_to_world.project_point3(cursor_ndc.extend(near_ndc));
         let far = ndc_to_world.project_point3(cursor_ndc.extend(far_ndc));
diff --git a/src/lib.rs b/src/lib.rs
index befbc3d..c7a95e2 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -30,9 +30,6 @@ pub struct IkConstraint {
 
 impl Plugin for InverseKinematicsPlugin {
     fn build(&self, app: &mut App) {
-        app.add_system(
-            solver::inverse_kinematics_system
-                //.after(bevy::transform::TransformSystem::TransformPropagate),
-        );
+        app.add_systems(Update, solver::inverse_kinematics_system);
     }
 }