DEVELOPMENT ENVIRONMENT

~liljamo/deck-builder

db6de810ff1eccf9923febdcbdefb1a416407f94 — Jonni Liljamo 2 years ago 6c25443
Move menu to plugins mod
12 files changed, 3 insertions(+), 3 deletions(-)

M sdbclient/src/main.rs
R sdbclient/src/{menu/accountloginui.rs => plugins/menu/accountloginui.rs}
R sdbclient/src/{menu/accountregisterui.rs => plugins/menu/accountregisterui.rs}
R sdbclient/src/{menu/accountscreenloggedin.rs => plugins/menu/accountscreenloggedin.rs}
R sdbclient/src/{menu/accountscreenloggedout.rs => plugins/menu/accountscreenloggedout.rs}
R sdbclient/src/{menu/mainmenuscreen.rs => plugins/menu/mainmenuscreen.rs}
R sdbclient/src/{menu/mod.rs => plugins/menu/mod.rs}
R sdbclient/src/{menu/settingsaudioscreen.rs => plugins/menu/settingsaudioscreen.rs}
R sdbclient/src/{menu/settingsdisplayscreen.rs => plugins/menu/settingsdisplayscreen.rs}
R sdbclient/src/{menu/settingsmenuscreen.rs => plugins/menu/settingsmenuscreen.rs}
R sdbclient/src/{menu/settingsmiscscreen.rs => plugins/menu/settingsmiscscreen.rs}
M sdbclient/src/plugins/mod.rs
M sdbclient/src/main.rs => sdbclient/src/main.rs +1 -2
@@ 15,7 15,6 @@ use bevy_egui::EguiPlugin;
use bevy_inspector_egui::WorldInspectorPlugin;

mod cfg;
mod menu;
mod plugins;
mod util;



@@ 92,7 91,7 @@ fn main() {
    app.add_startup_system(setup).add_state(GameState::Splash);

    app.add_plugin(plugins::splash::SplashPlugin)
        .add_plugin(menu::MenuPlugin);
        .add_plugin(plugins::menu::MenuPlugin);

    app.run();
}

R sdbclient/src/menu/accountloginui.rs => sdbclient/src/plugins/menu/accountloginui.rs +0 -0
R sdbclient/src/menu/accountregisterui.rs => sdbclient/src/plugins/menu/accountregisterui.rs +0 -0
R sdbclient/src/menu/accountscreenloggedin.rs => sdbclient/src/plugins/menu/accountscreenloggedin.rs +0 -0
R sdbclient/src/menu/accountscreenloggedout.rs => sdbclient/src/plugins/menu/accountscreenloggedout.rs +0 -0
R sdbclient/src/menu/mainmenuscreen.rs => sdbclient/src/plugins/menu/mainmenuscreen.rs +0 -0
R sdbclient/src/menu/mod.rs => sdbclient/src/plugins/menu/mod.rs +1 -1
@@ 10,7 10,7 @@ use bevy::{app::AppExit, prelude::*};

use crate::cfg::CfgUser;

use super::{despawn_screen, GameState};
use crate::{despawn_screen, GameState};

mod mainmenuscreen;
use mainmenuscreen::*;

R sdbclient/src/menu/settingsaudioscreen.rs => sdbclient/src/plugins/menu/settingsaudioscreen.rs +0 -0
R sdbclient/src/menu/settingsdisplayscreen.rs => sdbclient/src/plugins/menu/settingsdisplayscreen.rs +0 -0
R sdbclient/src/menu/settingsmenuscreen.rs => sdbclient/src/plugins/menu/settingsmenuscreen.rs +0 -0
R sdbclient/src/menu/settingsmiscscreen.rs => sdbclient/src/plugins/menu/settingsmiscscreen.rs +0 -0
M sdbclient/src/plugins/mod.rs => sdbclient/src/plugins/mod.rs +1 -0
@@ 6,4 6,5 @@
 * See LICENSE for licensing information.
 */

pub mod menu;
pub mod splash;