From d58a4ddfe15f410130e558c0ccb866f8598d4d8c Mon Sep 17 00:00:00 2001 From: Bergmann89 Date: Thu, 17 Dec 2020 02:26:37 +0100 Subject: [PATCH] Renamed 'SelectFleet' to 'FleetSelect' --- space-crush-app/src/lib.rs | 4 ++-- .../src/render/{select_fleet.rs => fleet_select.rs} | 6 +++--- space-crush-app/src/render/mod.rs | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) rename space-crush-app/src/render/{select_fleet.rs => fleet_select.rs} (99%) diff --git a/space-crush-app/src/lib.rs b/space-crush-app/src/lib.rs index 60f6ef7..4c2039a 100644 --- a/space-crush-app/src/lib.rs +++ b/space-crush-app/src/lib.rs @@ -13,7 +13,7 @@ pub use error::Error; use debug::{Fleets as DebugFleets, Ships as DebugShips, Summary as DebugSummary}; 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 systems::{FleetInfoUpdate, StateUpdate}; @@ -52,7 +52,7 @@ impl<'a, 'b> App<'a, 'b> { .with_thread_local(Planets::new(world)?) .with_thread_local(Asteroids::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(DebugFleets::new(&text_manager)?) .with_thread_local(DebugSummary::new(&text_manager)?) diff --git a/space-crush-app/src/render/select_fleet.rs b/space-crush-app/src/render/fleet_select.rs similarity index 99% rename from space-crush-app/src/render/select_fleet.rs rename to space-crush-app/src/render/fleet_select.rs index e31b654..ae093a8 100644 --- a/space-crush-app/src/render/select_fleet.rs +++ b/space-crush-app/src/render/fleet_select.rs @@ -32,7 +32,7 @@ use crate::{ Error, }; -pub struct SelectFleet { +pub struct FleetSelect { program_simple: Program, program_detail: Program, @@ -107,7 +107,7 @@ macro_rules! position { }; } -impl SelectFleet { +impl FleetSelect { pub fn new(world: &World, text_manager: &TextManager) -> Result { let program_simple = world.load_program(vec![ (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>; fn run(&mut self, mut data: Self::SystemData) { diff --git a/space-crush-app/src/render/mod.rs b/space-crush-app/src/render/mod.rs index 3233ff8..4e95fbc 100644 --- a/space-crush-app/src/render/mod.rs +++ b/space-crush-app/src/render/mod.rs @@ -1,11 +1,11 @@ mod asteroids; +mod fleet_select; mod init; mod planets; -mod select_fleet; mod ships; pub use asteroids::Asteroids; +pub use fleet_select::FleetSelect; pub use init::Init; pub use planets::Planets; -pub use select_fleet::SelectFleet; pub use ships::Ships;