Use new editor

2022-08-20 20:54:26 +02:00
parent 29a5687956
commit 84ed6d1ec1
4 changed files with 99 additions and 27 deletions
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4,9 +4,9 @@ version = 3

 [[package]]
 name = "ab_glyph"
-version = "0.2.15"
+version = "0.2.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "24606928a235e73cdef55a0c909719cadd72fce573e5713d58cb2952d8f5794c"
+checksum = "846ffacb9d0c8b879ef9e565b59e18fb76d6a61013e5bd24ecc659864e6b1a1f"
 dependencies = [
 "ab_glyph_rasterizer",
 "owned_ttf_parser",
@@ -245,7 +245,7 @@ name = "bevy-snake"
 version = "0.1.0"
 dependencies = [
 "bevy",
- "bevy-inspector-egui",
+ "bevy_editor_pls",
 "itertools",
 "iyes_loopless",
 "rand",
@@ -425,6 +425,42 @@ dependencies = [
 "syn",
 ]

+[[package]]
+name = "bevy_editor_pls"
+version = "0.1.1"
+source = "git+https://github.com/jakobhellermann/bevy_editor_pls#f327365d9bcab3b6f88abd38a00320fbf1c89e7e"
+dependencies = [
+ "bevy",
+ "bevy_editor_pls_core",
+ "bevy_editor_pls_default_windows",
+ "egui",
+]
+
+[[package]]
+name = "bevy_editor_pls_core"
+version = "0.1.1"
+source = "git+https://github.com/jakobhellermann/bevy_editor_pls#f327365d9bcab3b6f88abd38a00320fbf1c89e7e"
+dependencies = [
+ "bevy",
+ "bevy-inspector-egui",
+ "indexmap",
+]
+
+[[package]]
+name = "bevy_editor_pls_default_windows"
+version = "0.1.1"
+source = "git+https://github.com/jakobhellermann/bevy_editor_pls#f327365d9bcab3b6f88abd38a00320fbf1c89e7e"
+dependencies = [
+ "bevy",
+ "bevy-inspector-egui",
+ "bevy_editor_pls_core",
+ "bevy_mod_debugdump",
+ "bevy_mod_raycast",
+ "indexmap",
+ "opener",
+ "pretty-type-name",
+]
+
 [[package]]
 name = "bevy_egui"
 version = "0.15.1"
@@ -598,10 +634,31 @@ dependencies = [
 ]

 [[package]]
-name = "bevy_pbr"
-version = "0.8.0"
+name = "bevy_mod_debugdump"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed9a81bbd02f5e0a57899a41aec37d9cb14965e1e4d510547f3f680323d05c0f"
+checksum = "8f22cfad8fab6ca053d81c1c8795e325fe2174fa47f7455f7be7a959ef9bbaf3"
+dependencies = [
+ "bevy_app",
+ "bevy_ecs",
+ "bevy_render",
+ "pretty-type-name",
+]
+
+[[package]]
+name = "bevy_mod_raycast"
+version = "0.6.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7aead49a20f5e694f4fb59c7312f9a1813b65a2a0ac2c385d53d40f25cae896f"
+dependencies = [
+ "bevy",
+]
+
+[[package]]
+name = "bevy_pbr"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "176073021a4caeb8b448f24ce790fb57fde74b114f345064a8b102d2f7bed905"
 dependencies = [
 "bevy_app",
 "bevy_asset",
@@ -735,9 +792,9 @@ dependencies = [

 [[package]]
 name = "bevy_sprite"
-version = "0.8.0"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f83dfe8897d6c0d9d5ce3818d49a13e58ae2b9b9ecf4f4bb85aa31bb0678f68"
+checksum = "69c419f3db09d7ac1f4d45e0874d349d5d6f47f48bc10d55cd0da36413e2331e"
 dependencies = [
 "bevy_app",
 "bevy_asset",
@@ -825,9 +882,9 @@ dependencies = [

 [[package]]
 name = "bevy_ui"
-version = "0.8.0"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac181a7b637da61fad72981ff9d2e5b899283ca7d54b2b7ea49c431121331c53"
+checksum = "062ce086de1a4a470e5df48cb5c16a1dc97ab610e635cafabdef26c4a1ef5756"
 dependencies = [
 "bevy_app",
 "bevy_asset",
@@ -867,9 +924,9 @@ dependencies = [

 [[package]]
 name = "bevy_window"
-version = "0.8.0"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3bdc3a220a9bb2fad9bd30d5f44c6645725398fe1bc588fc87abf09f092696e"
+checksum = "707dbbebfac72b1e63e874e7a11a345feab8c440355c0bd71e6dff26709fba9a"
 dependencies = [
 "bevy_app",
 "bevy_ecs",
@@ -946,6 +1003,17 @@ version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a"

+[[package]]
+name = "bstr"
+version = "0.2.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ba3569f383e8f1598449f1a423e72e99569137b47740b1da11ef19af3d5c3223"
+dependencies = [
+ "lazy_static",
+ "memchr",
+ "regex-automata",
+]
+
 [[package]]
 name = "bumpalo"
 version = "3.11.0"
@@ -1971,9 +2039,9 @@ checksum = "6c8af84674fe1f223a982c933a0ee1086ac4d4052aa0fb8060c12c6ad838e754"

 [[package]]
 name = "iyes_loopless"
-version = "0.7.0"
+version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "83c256fe0800ac12ca8d37eb6018e7881893c79ac0849bbc3eb37e1be6922433"
+checksum = "fec251a82c60be9e282aec12056fa153666d5730b21d124655d7c22114d342c8"
 dependencies = [
 "bevy_app",
 "bevy_ecs",
@@ -2587,6 +2655,16 @@ version = "1.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "074864da206b4973b84eb91683020dbefd6a8c3f0f38e054d93954e891935e4e"

+[[package]]
+name = "opener"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ea3ebcd72a54701f56345f16785a6d3ac2df7e986d273eb4395c0b01db17952"
+dependencies = [
+ "bstr",
+ "winapi",
+]
+
 [[package]]
 name = "owned_ttf_parser"
 version = "0.15.1"
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -8,9 +8,9 @@ edition = "2021"
 [dependencies]
 iyes_loopless = "0.7.0"
 itertools = "0.10.3"
-bevy-inspector-egui = "0.12.1"
+# bevy-inspector-egui = "0.12.1"
 rand = "0.8.5"
-# bevy_editor_pls = { git = "https://github.com/jakobhellermann/bevy_editor_pls" }
+bevy_editor_pls = { git = "https://github.com/jakobhellermann/bevy_editor_pls" }

 [dependencies.bevy]
 version = "0.8.0"
--- a/src/fruit.rs
+++ b/src/fruit.rs
@@ -1,6 +1,6 @@
 use crate::{
    grid,
-    snake::{self, SnakeHead, Z_HEIGHT},
+    snake::{SnakeHead, Z_HEIGHT},
    tick::tick_triggered,
 };
 use bevy::prelude::*;
@@ -13,11 +13,7 @@ impl Plugin for FruitPlugin {
    fn build(&self, app: &mut App) {
        app.add_event::<EatenEvent>()
            .add_startup_system(spawn_fruit_system)
-            .add_system(
-                eat_fruit_system
-                    .run_if(tick_triggered)
-                    .before(snake::SystemLabel::SegmentMovement),
-            )
+            .add_system(eat_fruit_system.run_if(tick_triggered))
            .add_system(debug_eaten_event_system)
            .add_system(despawn_fruit_system)
            .add_system(spawn_fruit_system.run_if(eaten_event_sent));
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,7 +1,6 @@
-use bevy::{prelude::*, render::camera::ScalingMode};
-// use bevy_editor_pls::prelude::*;
 use crate::{canvas::CanvasPlugin, fruit::FruitPlugin, snake::SnakePlugin, tick::TickPlugin};
-use bevy_inspector_egui::WorldInspectorPlugin;
+use bevy::{prelude::*, render::camera::ScalingMode};
+use bevy_editor_pls::prelude::*;
 use grid::{SEGMENT_SIZE, SIZE};
 use iyes_loopless::prelude::*;

@@ -35,8 +34,7 @@ fn main() {
        })
        .add_loopless_state(AppState::Begin)
        .add_plugins(DefaultPlugins)
-        .add_plugin(WorldInspectorPlugin::new())
-        // .add_plugin(EditorPlugin)
+        .add_plugin(EditorPlugin)
        .add_plugin(TickPlugin)
        .add_plugin(SnakePlugin)
        .add_plugin(FruitPlugin)