|
@@ -1,7 +1,7 @@
|
|
|
use bevy::core::Stopwatch;
|
|
|
use bevy::prelude::*;
|
|
|
|
|
|
-use crate::assets::LOGO;
|
|
|
+use crate::assets::IMAGE_LOGO;
|
|
|
use crate::game_state::GameState;
|
|
|
|
|
|
#[derive(Clone, Debug)]
|
|
@@ -28,10 +28,10 @@ pub struct LogoPlugin;
|
|
|
fn setup_logo(
|
|
|
mut commands: Commands,
|
|
|
filename: Option<Res<LogoFilename>>,
|
|
|
- assert_server: Res<AssetServer>,
|
|
|
+ asset_server: Res<AssetServer>,
|
|
|
windows: Res<Windows>,
|
|
|
) {
|
|
|
- let path = filename.map_or_else(|| LOGO.to_string(), |res| res.0.clone());
|
|
|
+ let path = filename.map_or_else(|| IMAGE_LOGO.to_string(), |res| res.0.clone());
|
|
|
let window = windows.primary();
|
|
|
let (win_w, win_h) = (window.width(), window.height());
|
|
|
|
|
@@ -40,7 +40,7 @@ fn setup_logo(
|
|
|
.insert(Logo { path: path.clone() })
|
|
|
.insert(LogoMarker)
|
|
|
.insert_bundle(SpriteBundle {
|
|
|
- texture: assert_server.load(&path),
|
|
|
+ texture: asset_server.load(&path),
|
|
|
transform: Transform {
|
|
|
translation: Vec3::new(0.0, 0.0, 0.0),
|
|
|
..Default::default()
|
|
@@ -136,7 +136,6 @@ fn animate_logo(
|
|
|
impl Plugin for LogoPlugin {
|
|
|
fn build(&self, app: &mut App) {
|
|
|
let state = GameState::Logo;
|
|
|
- app.add_state(state);
|
|
|
app.add_system_set(SystemSet::on_enter(state).with_system(setup_logo));
|
|
|
app.add_system_set(SystemSet::on_update(state)
|
|
|
.with_system(resize_logo)
|