Scenes refactor pt. 2 (#220)

* Removing some methods from TopDownScene trait

* Removing impl of Tile for Zone tile kind

* Removing the Tile trait

main_game_lib/src/lib.rs

@@ -18,6 +18,7 @@ pub mod vec2_ext;
 use bevy::{app::AppExit, prelude::*};
 use bevy_pixel_camera::PixelCameraPlugin;
 pub use common_ext;
+use prelude::rscn::TscnInBevy;
 
 use crate::prelude::*;
 
@@ -48,7 +49,7 @@ pub fn windowed_app() -> App {
                 main_game_lib::top_down::environmental_objects::door=debug,\
                 main_game_lib::top_down::cameras=debug,\
                 main_game_lib::top_down::layout=debug,\
-                scene_building1_player_floor=trace,\
+                main_game_lib::rscn=debug,\
                 "
                 .to_string(),
                 ..default()
@@ -103,12 +104,12 @@ pub fn windowed_app() -> App {
         common_loading_screen::Plugin,
         common_store::Plugin,
         common_story::Plugin,
-        crate::top_down::Plugin,
         common_visuals::Plugin,
-        cutscene::Plugin,
-        PixelCameraPlugin,
-        crate::hud::Plugin,
+        crate::cutscene::Plugin,
         crate::dialog::Plugin,
+        crate::hud::Plugin,
+        crate::top_down::Plugin,
+        PixelCameraPlugin,
     ));
 
     info!("Plugins added");
@@ -139,3 +140,9 @@ fn begin_loading_static_assets_on_startup(
 fn exit(mut exit: EventWriter<AppExit>) {
     exit.send(AppExit::Success);
 }
+
+impl<T: TopDownScene> TscnInBevy for T {
+    fn tscn_asset_path() -> String {
+        format!("scenes/{}.tscn", T::name())
+    }
+}

main_game_lib/src/rscn.rs

@@ -43,8 +43,6 @@ pub use loader::{LoaderError, TscnLoader};
 use serde::{Deserialize, Serialize};
 pub use spawner::TscnSpawner;
 
-use crate::top_down::TopDownScene;
-
 /// A helper component that is always in an entity with
 /// [`bevy::prelude::SpatialBundle`].
 /// Translated a simple point from Godot.
@@ -171,8 +169,6 @@ pub struct SpriteFrames {
 }
 
 /// Marks scene as "can be loaded from .tscn".
-///
-/// Autoimplemented for [`TopDownScene`]s.
 pub trait TscnInBevy: Send + Sync + 'static {
     /// Asset path of the `.tscn` file associated with this scene.
     fn tscn_asset_path() -> String;
@@ -189,12 +185,6 @@ pub struct TscnTreeHandle<T> {
     _phantom: std::marker::PhantomData<T>,
 }
 
-impl<T: TopDownScene> TscnInBevy for T {
-    fn tscn_asset_path() -> String {
-        format!("scenes/{}.tscn", T::name())
-    }
-}
-
 /// Parses Godot's .tscn file with very strict requirements on the content.
 /// We only support nodes and parameters that are relevant to our game.
 /// We panic on unsupported content aggressively.

main_game_lib/src/top_down/actor.rs

@@ -23,7 +23,7 @@ use serde::{Deserialize, Serialize};
 
 use self::npc::BehaviorTree;
 use crate::top_down::{
-    layout::{ysort, Tile, TileIndex, TopDownScene, LAYOUT},
+    layout::{ysort, TileIndex, TopDownScene, LAYOUT},
     npc::NpcInTheMap,
     InspectLabelCategory, Player, TileKind, TileMap,
 };
@@ -972,10 +972,6 @@ mod tests {
     struct TestScene;
 
     impl TopDownScene for TestScene {
-        fn bounds() -> [i32; 4] {
-            [-1000, 1000, -1000, 1000]
-        }
-
         fn name() -> &'static str {
             unreachable!()
         }