Compare commits

..
Author SHA1 Message Date
EIREXE d342c9282c Remove UI multi cam setup
CI / build-and-test (pull_request) Failing after 56s
CI / production-build (pull_request) Failing after 1m34s
2026-09-20 18:17:37 +02:00
2 changed files with 12 additions and 7 deletions
+2 -1
View File
@@ -122,7 +122,8 @@ impl Plugin for MenuPlugin {
fn build(&self, app: &mut App) { fn build(&self, app: &mut App) {
app.add_systems( app.add_systems(
OnEnter(AppState::MainMenu), OnEnter(AppState::MainMenu),
build_menu::<MainMenu>, (build_menu::<MainMenu>, |mut commands: Commands| {
}),
) )
.add_message::<character_select::PlayerSlotAssigned>() .add_message::<character_select::PlayerSlotAssigned>()
.init_resource::<navigation::UINavigationActionState>() .init_resource::<navigation::UINavigationActionState>()
+10 -6
View File
@@ -7,14 +7,10 @@ use strum::IntoEnumIterator;
use strum_macros::EnumIter; use strum_macros::EnumIter;
use crate::{ use crate::{
AppState, AppState, game_settings::GameSettings, math::{int::FGi32, vec::FGVec2}, stage::{
game_settings::GameSettings,
math::vec::FGVec2,
stage::{
StagePoly, StagePoly,
line::{StageCollision, StagePolyLineSegmentType, StagePolyType}, line::{StageCollision, StagePolyLineSegmentType, StagePolyType},
}, }, texture_reference::TextureReference,
texture_reference::TextureReference,
}; };
use bevy::prelude::*; use bevy::prelude::*;
@@ -87,6 +83,14 @@ pub struct StageManifest {
pub icon: TextureReference, pub icon: TextureReference,
pub camera: StageCameraProfile, pub camera: StageCameraProfile,
pub polygons: Vec<StagePolyDefinition>, pub polygons: Vec<StagePolyDefinition>,
#[reflect(ignore)]
pub blast_zone_left: FGi32,
#[reflect(ignore)]
pub blast_zone_right: FGi32,
#[reflect(ignore)]
pub blast_zone_top: FGi32,
#[reflect(ignore)]
pub blast_zone_bottom: FGi32,
} }
#[derive(Resource)] #[derive(Resource)]