| @@ -13,7 +13,7 @@ pub use error::Error; | |||||
| use debug::{Fleets as DebugFleets, Ships as DebugShips, Summary as DebugSummary}; | use debug::{Fleets as DebugFleets, Ships as DebugShips, Summary as DebugSummary}; | ||||
| use misc::{Events, TextManager, Window}; | use misc::{Events, TextManager, Window}; | ||||
| use render::{Asteroids, Init, Planets, SelectFleet, Ships}; | |||||
| use render::{Asteroids, FleetSelect, Init, Planets, Ships}; | |||||
| use resources::{Camera, Config, Geometry, InputState, PlayerState, Uniform}; | use resources::{Camera, Config, Geometry, InputState, PlayerState, Uniform}; | ||||
| use systems::{FleetInfoUpdate, StateUpdate}; | use systems::{FleetInfoUpdate, StateUpdate}; | ||||
| @@ -52,7 +52,7 @@ impl<'a, 'b> App<'a, 'b> { | |||||
| .with_thread_local(Planets::new(world)?) | .with_thread_local(Planets::new(world)?) | ||||
| .with_thread_local(Asteroids::new(world)?) | .with_thread_local(Asteroids::new(world)?) | ||||
| .with_thread_local(Ships::new(world)?) | .with_thread_local(Ships::new(world)?) | ||||
| .with_thread_local(SelectFleet::new(world, &text_manager)?) | |||||
| .with_thread_local(FleetSelect::new(world, &text_manager)?) | |||||
| .with_thread_local(DebugShips::default()) | .with_thread_local(DebugShips::default()) | ||||
| .with_thread_local(DebugFleets::new(&text_manager)?) | .with_thread_local(DebugFleets::new(&text_manager)?) | ||||
| .with_thread_local(DebugSummary::new(&text_manager)?) | .with_thread_local(DebugSummary::new(&text_manager)?) | ||||
| @@ -32,7 +32,7 @@ use crate::{ | |||||
| Error, | Error, | ||||
| }; | }; | ||||
| pub struct SelectFleet { | |||||
| pub struct FleetSelect { | |||||
| program_simple: Program, | program_simple: Program, | ||||
| program_detail: Program, | program_detail: Program, | ||||
| @@ -107,7 +107,7 @@ macro_rules! position { | |||||
| }; | }; | ||||
| } | } | ||||
| impl SelectFleet { | |||||
| impl FleetSelect { | |||||
| pub fn new(world: &World, text_manager: &TextManager) -> Result<Self, Error> { | pub fn new(world: &World, text_manager: &TextManager) -> Result<Self, Error> { | ||||
| let program_simple = world.load_program(vec![ | let program_simple = world.load_program(vec![ | ||||
| (Type::Vertex, "resources/shader/fleet_select/vert.glsl"), | (Type::Vertex, "resources/shader/fleet_select/vert.glsl"), | ||||
| @@ -517,7 +517,7 @@ impl SelectFleet { | |||||
| } | } | ||||
| } | } | ||||
| impl<'a> System<'a> for SelectFleet { | |||||
| impl<'a> System<'a> for FleetSelect { | |||||
| type SystemData = FleetSelectData<'a>; | type SystemData = FleetSelectData<'a>; | ||||
| fn run(&mut self, mut data: Self::SystemData) { | fn run(&mut self, mut data: Self::SystemData) { | ||||
| @@ -1,11 +1,11 @@ | |||||
| mod asteroids; | mod asteroids; | ||||
| mod fleet_select; | |||||
| mod init; | mod init; | ||||
| mod planets; | mod planets; | ||||
| mod select_fleet; | |||||
| mod ships; | mod ships; | ||||
| pub use asteroids::Asteroids; | pub use asteroids::Asteroids; | ||||
| pub use fleet_select::FleetSelect; | |||||
| pub use init::Init; | pub use init::Init; | ||||
| pub use planets::Planets; | pub use planets::Planets; | ||||
| pub use select_fleet::SelectFleet; | |||||
| pub use ships::Ships; | pub use ships::Ships; | ||||