diff --git a/examples/bevy_gltf_blueprints/animation/Cargo.toml b/examples/bevy_gltf_blueprints/animation/Cargo.toml index ee87ff2..15cd5b1 100644 --- a/examples/bevy_gltf_blueprints/animation/Cargo.toml +++ b/examples/bevy_gltf_blueprints/animation/Cargo.toml @@ -5,11 +5,8 @@ edition = "2021" license = "MIT OR Apache-2.0" [dependencies] -bevy="0.12" +bevy="0.13" bevy_gltf_blueprints = { path = "../../../crates/bevy_gltf_blueprints" } bevy_gltf_worlflow_examples_common = { path = "../../common" } - -bevy_rapier3d = { version = "0.23.0", features = [ "serde-serialize", "debug-render-3d", "enhanced-determinism"] } -bevy_asset_loader = { version = "0.18", features = ["standard_dynamic_assets" ]} -bevy_editor_pls = { version = "0.6" } +bevy_rapier3d = { version = "0.25.0", features = [ "serde-serialize", "debug-render-3d", "enhanced-determinism"] } rand = "0.8.5" diff --git a/examples/bevy_gltf_blueprints/animation/src/game/in_game.rs b/examples/bevy_gltf_blueprints/animation/src/game/in_game.rs index d8651fa..6633a95 100644 --- a/examples/bevy_gltf_blueprints/animation/src/game/in_game.rs +++ b/examples/bevy_gltf_blueprints/animation/src/game/in_game.rs @@ -43,12 +43,12 @@ pub fn setup_game( } pub fn spawn_test( - keycode: Res>, + keycode: Res>, mut commands: Commands, mut game_world: Query<(Entity, &Children), With>, ) { - if keycode.just_pressed(KeyCode::T) { + if keycode.just_pressed(KeyCode::KeyT) { let world = game_world.single_mut(); let world = world.1[0]; @@ -165,11 +165,11 @@ pub fn animation_control( mut animation_players: Query<&mut AnimationPlayer>, - keycode: Res>, + keycode: Res>, // mut entities_with_animations : Query<(&mut AnimationPlayer, &mut Animations)>, ) { // robots - if keycode.just_pressed(KeyCode::B) { + if keycode.just_pressed(KeyCode::KeyB) { for (link, animations) in animated_enemies.iter() { let mut animation_player = animation_players.get_mut(link.0).unwrap(); let anim_name = "Scan"; @@ -187,7 +187,7 @@ pub fn animation_control( } // foxes - if keycode.just_pressed(KeyCode::W) { + if keycode.just_pressed(KeyCode::KeyW) { for (link, animations) in animated_foxes.iter() { let mut animation_player = animation_players.get_mut(link.0).unwrap(); let anim_name = "Walk"; @@ -204,7 +204,7 @@ pub fn animation_control( } } - if keycode.just_pressed(KeyCode::X) { + if keycode.just_pressed(KeyCode::KeyX) { for (link, animations) in animated_foxes.iter() { let mut animation_player = animation_players.get_mut(link.0).unwrap(); let anim_name = "Run"; @@ -221,7 +221,7 @@ pub fn animation_control( } } - if keycode.just_pressed(KeyCode::C) { + if keycode.just_pressed(KeyCode::KeyC) { for (link, animations) in animated_foxes.iter() { let mut animation_player = animation_players.get_mut(link.0).unwrap(); let anim_name = "Survey"; diff --git a/examples/bevy_gltf_blueprints/animation/src/game/in_main_menu.rs b/examples/bevy_gltf_blueprints/animation/src/game/in_main_menu.rs index 749eb36..32142cd 100644 --- a/examples/bevy_gltf_blueprints/animation/src/game/in_main_menu.rs +++ b/examples/bevy_gltf_blueprints/animation/src/game/in_main_menu.rs @@ -89,22 +89,10 @@ pub fn teardown_main_menu(bla: Query>, mut commands: Co } pub fn main_menu( - keycode: Res>, - + keycode: Res>, mut next_app_state: ResMut>, - // mut next_game_state: ResMut>, ) { - if keycode.just_pressed(KeyCode::Return) { + if keycode.just_pressed(KeyCode::Enter) { next_app_state.set(AppState::AppLoading); - // next_game_state.set(GameState::None); - } - - if keycode.just_pressed(KeyCode::L) { - next_app_state.set(AppState::AppLoading); - // load_requested_events.send(LoadRequest { path: "toto".into() }) - } - - if keycode.just_pressed(KeyCode::S) { - // save_requested_events.send(SaveRequest { path: "toto".into() }) } } diff --git a/examples/bevy_gltf_blueprints/animation/src/main.rs b/examples/bevy_gltf_blueprints/animation/src/main.rs index 8fca426..9320156 100644 --- a/examples/bevy_gltf_blueprints/animation/src/main.rs +++ b/examples/bevy_gltf_blueprints/animation/src/main.rs @@ -1,5 +1,4 @@ use bevy::prelude::*; -use bevy_editor_pls::prelude::*; use bevy_gltf_worlflow_examples_common::CommonPlugin; mod core; @@ -15,8 +14,6 @@ fn main() { App::new() .add_plugins(( DefaultPlugins.set(AssetPlugin::default()), - // editor - EditorPlugin::default(), // our custom plugins CommonPlugin, CorePlugin, // reusable plugins diff --git a/examples/bevy_gltf_blueprints/basic/Cargo.toml b/examples/bevy_gltf_blueprints/basic/Cargo.toml index 9b83cc8..43cfefe 100644 --- a/examples/bevy_gltf_blueprints/basic/Cargo.toml +++ b/examples/bevy_gltf_blueprints/basic/Cargo.toml @@ -5,11 +5,8 @@ edition = "2021" license = "MIT OR Apache-2.0" [dependencies] -bevy="0.12" +bevy="0.13" bevy_gltf_blueprints = { path = "../../../crates/bevy_gltf_blueprints" } bevy_gltf_worlflow_examples_common = { path = "../../common" } - -bevy_rapier3d = { version = "0.23.0", features = [ "serde-serialize", "debug-render-3d", "enhanced-determinism"] } -bevy_asset_loader = { version = "0.18", features = ["standard_dynamic_assets" ]} -bevy_editor_pls = { version = "0.6" } +bevy_rapier3d = { version = "0.25.0", features = [ "serde-serialize", "debug-render-3d", "enhanced-determinism"] } rand = "0.8.5" diff --git a/examples/bevy_gltf_blueprints/basic/src/game/in_game.rs b/examples/bevy_gltf_blueprints/basic/src/game/in_game.rs index 390a5f9..73a201c 100644 --- a/examples/bevy_gltf_blueprints/basic/src/game/in_game.rs +++ b/examples/bevy_gltf_blueprints/basic/src/game/in_game.rs @@ -1,7 +1,6 @@ use bevy::prelude::*; use bevy_gltf_blueprints::{BluePrintBundle, BlueprintName, GameWorldTag}; use bevy_gltf_worlflow_examples_common::{assets::GameAssets, GameState, InAppRunning}; - use bevy_rapier3d::prelude::Velocity; use rand::Rng; @@ -40,12 +39,12 @@ pub fn setup_game( struct UnregisteredComponent; pub fn spawn_test( - keycode: Res>, + keycode: Res>, mut commands: Commands, mut game_world: Query<(Entity, &Children), With>, ) { - if keycode.just_pressed(KeyCode::T) { + if keycode.just_pressed(KeyCode::KeyT) { let world = game_world.single_mut(); let world = world.1[0]; @@ -83,12 +82,12 @@ pub fn spawn_test( } pub fn spawn_test_unregisted_components( - keycode: Res>, + keycode: Res>, mut commands: Commands, mut game_world: Query<(Entity, &Children), With>, ) { - if keycode.just_pressed(KeyCode::U) { + if keycode.just_pressed(KeyCode::KeyU) { let world = game_world.single_mut(); let world = world.1[0]; diff --git a/examples/bevy_gltf_blueprints/basic/src/game/in_main_menu.rs b/examples/bevy_gltf_blueprints/basic/src/game/in_main_menu.rs index c1a4b8b..5a32955 100644 --- a/examples/bevy_gltf_blueprints/basic/src/game/in_main_menu.rs +++ b/examples/bevy_gltf_blueprints/basic/src/game/in_main_menu.rs @@ -89,24 +89,24 @@ pub fn teardown_main_menu(bla: Query>, mut commands: Co } pub fn main_menu( - keycode: Res>, + keycode: Res>, mut next_app_state: ResMut>, // mut next_game_state: ResMut>, // mut save_requested_events: EventWriter, // mut load_requested_events: EventWriter, ) { - if keycode.just_pressed(KeyCode::Return) { + if keycode.just_pressed(KeyCode::Enter) { next_app_state.set(AppState::AppLoading); // next_game_state.set(GameState::None); } - if keycode.just_pressed(KeyCode::L) { + if keycode.just_pressed(KeyCode::KeyL) { next_app_state.set(AppState::AppLoading); // load_requested_events.send(LoadRequest { path: "toto".into() }) } - if keycode.just_pressed(KeyCode::S) { + if keycode.just_pressed(KeyCode::KeyS) { // save_requested_events.send(SaveRequest { path: "toto".into() }) } } diff --git a/examples/bevy_gltf_blueprints/basic/src/main.rs b/examples/bevy_gltf_blueprints/basic/src/main.rs index 8fca426..9320156 100644 --- a/examples/bevy_gltf_blueprints/basic/src/main.rs +++ b/examples/bevy_gltf_blueprints/basic/src/main.rs @@ -1,5 +1,4 @@ use bevy::prelude::*; -use bevy_editor_pls::prelude::*; use bevy_gltf_worlflow_examples_common::CommonPlugin; mod core; @@ -15,8 +14,6 @@ fn main() { App::new() .add_plugins(( DefaultPlugins.set(AssetPlugin::default()), - // editor - EditorPlugin::default(), // our custom plugins CommonPlugin, CorePlugin, // reusable plugins diff --git a/examples/bevy_gltf_blueprints/basic_xpbd_physics/Cargo.toml b/examples/bevy_gltf_blueprints/basic_xpbd_physics/Cargo.toml index 144cf0d..1806caf 100644 --- a/examples/bevy_gltf_blueprints/basic_xpbd_physics/Cargo.toml +++ b/examples/bevy_gltf_blueprints/basic_xpbd_physics/Cargo.toml @@ -5,11 +5,6 @@ edition = "2021" license = "MIT OR Apache-2.0" [dependencies] -bevy="0.12" +bevy="0.13" bevy_gltf_blueprints = { path = "../../../crates/bevy_gltf_blueprints" } -bevy_gltf_worlflow_examples_common = { path = "../../common" } - -bevy_xpbd_3d = "0.3" -bevy_asset_loader = { version = "0.18", features = ["standard_dynamic_assets" ]} -bevy_editor_pls = { version = "0.6" } -rand = "0.8.5" +bevy_gltf_worlflow_examples_common = { path = "../../common" } \ No newline at end of file diff --git a/examples/bevy_gltf_blueprints/materials/Cargo.toml b/examples/bevy_gltf_blueprints/materials/Cargo.toml index 7a4098d..b758d07 100644 --- a/examples/bevy_gltf_blueprints/materials/Cargo.toml +++ b/examples/bevy_gltf_blueprints/materials/Cargo.toml @@ -5,11 +5,8 @@ edition = "2021" license = "MIT OR Apache-2.0" [dependencies] -bevy="0.12" +bevy="0.13" bevy_gltf_blueprints = { path = "../../../crates/bevy_gltf_blueprints" } bevy_gltf_worlflow_examples_common = { path = "../../common" } - -bevy_rapier3d = { version = "0.23.0", features = [ "serde-serialize", "debug-render-3d", "enhanced-determinism"] } -bevy_asset_loader = { version = "0.18", features = ["standard_dynamic_assets" ]} -bevy_editor_pls = { version = "0.6" } -rand = "0.8.5" +bevy_rapier3d = { version = "0.25.0", features = [ "serde-serialize", "debug-render-3d", "enhanced-determinism"] } +rand = "0.8.5" \ No newline at end of file diff --git a/examples/bevy_gltf_blueprints/materials/src/game/in_game.rs b/examples/bevy_gltf_blueprints/materials/src/game/in_game.rs index 2338956..3ed4c63 100644 --- a/examples/bevy_gltf_blueprints/materials/src/game/in_game.rs +++ b/examples/bevy_gltf_blueprints/materials/src/game/in_game.rs @@ -41,12 +41,12 @@ pub fn setup_game( struct UnregisteredComponent; pub fn spawn_test( - keycode: Res>, + keycode: Res>, mut commands: Commands, mut game_world: Query<(Entity, &Children), With>, ) { - if keycode.just_pressed(KeyCode::T) { + if keycode.just_pressed(KeyCode::KeyT) { let world = game_world.single_mut(); let world = world.1[0]; @@ -66,7 +66,7 @@ pub fn spawn_test( let new_entity = commands .spawn(( BluePrintBundle { - blueprint: BlueprintName("Health_Pickup".to_string()), + blueprint: BlueprintName("Watermelon2".to_string()), ..Default::default() }, bevy::prelude::Name::from(format!("test{}", name_index)), @@ -81,48 +81,4 @@ pub fn spawn_test( .id(); commands.entity(world).add_child(new_entity); } -} - -pub fn spawn_test_unregisted_components( - keycode: Res>, - mut commands: Commands, - - mut game_world: Query<(Entity, &Children), With>, -) { - if keycode.just_pressed(KeyCode::U) { - let world = game_world.single_mut(); - let world = world.1[0]; - - let mut rng = rand::thread_rng(); - let range = 5.5; - let x: f32 = rng.gen_range(-range..range); - let y: f32 = rng.gen_range(-range..range); - - let mut rng = rand::thread_rng(); - let range = 0.8; - let vel_x: f32 = rng.gen_range(-range..range); - let vel_y: f32 = rng.gen_range(2.0..2.5); - let vel_z: f32 = rng.gen_range(-range..range); - - let name_index: u64 = rng.gen(); - - let new_entity = commands - .spawn(( - BluePrintBundle { - blueprint: BlueprintName("Health_Pickup".to_string()), - ..Default::default() - }, - bevy::prelude::Name::from(format!("test{}", name_index)), - // BlueprintName("Health_Pickup".to_string()), - // SpawnHere, - TransformBundle::from_transform(Transform::from_xyz(x, 2.0, y)), - Velocity { - linvel: Vec3::new(vel_x, vel_y, vel_z), - angvel: Vec3::new(0.0, 0.0, 0.0), - }, - UnregisteredComponent, - )) - .id(); - commands.entity(world).add_child(new_entity); - } -} +} \ No newline at end of file diff --git a/examples/bevy_gltf_blueprints/materials/src/game/in_main_menu.rs b/examples/bevy_gltf_blueprints/materials/src/game/in_main_menu.rs index c1a4b8b..513a36e 100644 --- a/examples/bevy_gltf_blueprints/materials/src/game/in_main_menu.rs +++ b/examples/bevy_gltf_blueprints/materials/src/game/in_main_menu.rs @@ -89,24 +89,11 @@ pub fn teardown_main_menu(bla: Query>, mut commands: Co } pub fn main_menu( - keycode: Res>, - + keycode: Res>, mut next_app_state: ResMut>, - // mut next_game_state: ResMut>, - // mut save_requested_events: EventWriter, - // mut load_requested_events: EventWriter, + ) { - if keycode.just_pressed(KeyCode::Return) { + if keycode.just_pressed(KeyCode::Enter) { next_app_state.set(AppState::AppLoading); - // next_game_state.set(GameState::None); - } - - if keycode.just_pressed(KeyCode::L) { - next_app_state.set(AppState::AppLoading); - // load_requested_events.send(LoadRequest { path: "toto".into() }) - } - - if keycode.just_pressed(KeyCode::S) { - // save_requested_events.send(SaveRequest { path: "toto".into() }) } } diff --git a/examples/bevy_gltf_blueprints/materials/src/game/mod.rs b/examples/bevy_gltf_blueprints/materials/src/game/mod.rs index b236141..4ab4c26 100644 --- a/examples/bevy_gltf_blueprints/materials/src/game/mod.rs +++ b/examples/bevy_gltf_blueprints/materials/src/game/mod.rs @@ -12,7 +12,7 @@ impl Plugin for GamePlugin { fn build(&self, app: &mut App) { app.add_systems( Update, - (spawn_test, spawn_test_unregisted_components).run_if(in_state(GameState::InGame)), + (spawn_test).run_if(in_state(GameState::InGame)), ) .add_systems(OnEnter(AppState::MenuRunning), setup_main_menu) .add_systems(OnExit(AppState::MenuRunning), teardown_main_menu) diff --git a/examples/bevy_gltf_blueprints/materials/src/main.rs b/examples/bevy_gltf_blueprints/materials/src/main.rs index 8fca426..9320156 100644 --- a/examples/bevy_gltf_blueprints/materials/src/main.rs +++ b/examples/bevy_gltf_blueprints/materials/src/main.rs @@ -1,5 +1,4 @@ use bevy::prelude::*; -use bevy_editor_pls::prelude::*; use bevy_gltf_worlflow_examples_common::CommonPlugin; mod core; @@ -15,8 +14,6 @@ fn main() { App::new() .add_plugins(( DefaultPlugins.set(AssetPlugin::default()), - // editor - EditorPlugin::default(), // our custom plugins CommonPlugin, CorePlugin, // reusable plugins diff --git a/examples/bevy_gltf_blueprints/multiple_levels_multiple_blendfiles/Cargo.toml b/examples/bevy_gltf_blueprints/multiple_levels_multiple_blendfiles/Cargo.toml index 563fbe2..d6618ce 100644 --- a/examples/bevy_gltf_blueprints/multiple_levels_multiple_blendfiles/Cargo.toml +++ b/examples/bevy_gltf_blueprints/multiple_levels_multiple_blendfiles/Cargo.toml @@ -5,11 +5,8 @@ edition = "2021" license = "MIT OR Apache-2.0" [dependencies] -bevy="0.12" +bevy="0.13" bevy_gltf_blueprints = { path = "../../../crates/bevy_gltf_blueprints" } bevy_gltf_worlflow_examples_common = { path = "../../common" } - -bevy_rapier3d = { version = "0.23.0", features = [ "serde-serialize", "debug-render-3d", "enhanced-determinism"] } -bevy_asset_loader = { version = "0.18", features = ["standard_dynamic_assets" ]} -bevy_editor_pls = { version = "0.6" } -rand = "0.8.5" +bevy_rapier3d = { version = "0.25.0", features = [ "serde-serialize", "debug-render-3d", "enhanced-determinism"] } +rand = "0.8.5" \ No newline at end of file diff --git a/examples/bevy_gltf_blueprints/multiple_levels_multiple_blendfiles/art/common.blend b/examples/bevy_gltf_blueprints/multiple_levels_multiple_blendfiles/art/common.blend index bf43cf0..0be781b 100644 Binary files a/examples/bevy_gltf_blueprints/multiple_levels_multiple_blendfiles/art/common.blend and b/examples/bevy_gltf_blueprints/multiple_levels_multiple_blendfiles/art/common.blend differ diff --git a/examples/bevy_gltf_blueprints/multiple_levels_multiple_blendfiles/art/level1.blend b/examples/bevy_gltf_blueprints/multiple_levels_multiple_blendfiles/art/level1.blend index 5ff26b8..351859a 100644 Binary files a/examples/bevy_gltf_blueprints/multiple_levels_multiple_blendfiles/art/level1.blend and b/examples/bevy_gltf_blueprints/multiple_levels_multiple_blendfiles/art/level1.blend differ diff --git a/examples/bevy_gltf_blueprints/multiple_levels_multiple_blendfiles/art/level2.blend b/examples/bevy_gltf_blueprints/multiple_levels_multiple_blendfiles/art/level2.blend index d2412f8..f96dccc 100644 Binary files a/examples/bevy_gltf_blueprints/multiple_levels_multiple_blendfiles/art/level2.blend and b/examples/bevy_gltf_blueprints/multiple_levels_multiple_blendfiles/art/level2.blend differ diff --git a/examples/bevy_gltf_blueprints/multiple_levels_multiple_blendfiles/art/start_level.blend b/examples/bevy_gltf_blueprints/multiple_levels_multiple_blendfiles/art/start_level.blend index 4c36a78..03670c6 100644 Binary files a/examples/bevy_gltf_blueprints/multiple_levels_multiple_blendfiles/art/start_level.blend and b/examples/bevy_gltf_blueprints/multiple_levels_multiple_blendfiles/art/start_level.blend differ diff --git a/examples/bevy_gltf_blueprints/multiple_levels_multiple_blendfiles/assets/materials/common_materials_library.glb b/examples/bevy_gltf_blueprints/multiple_levels_multiple_blendfiles/assets/materials/common_materials_library.glb index 4227c4e..e176e37 100644 Binary files a/examples/bevy_gltf_blueprints/multiple_levels_multiple_blendfiles/assets/materials/common_materials_library.glb and b/examples/bevy_gltf_blueprints/multiple_levels_multiple_blendfiles/assets/materials/common_materials_library.glb differ diff --git a/examples/bevy_gltf_blueprints/multiple_levels_multiple_blendfiles/assets/models/Level1.glb b/examples/bevy_gltf_blueprints/multiple_levels_multiple_blendfiles/assets/models/Level1.glb index 25a1707..545a066 100644 Binary files a/examples/bevy_gltf_blueprints/multiple_levels_multiple_blendfiles/assets/models/Level1.glb and b/examples/bevy_gltf_blueprints/multiple_levels_multiple_blendfiles/assets/models/Level1.glb differ diff --git a/examples/bevy_gltf_blueprints/multiple_levels_multiple_blendfiles/assets/models/Level2.glb b/examples/bevy_gltf_blueprints/multiple_levels_multiple_blendfiles/assets/models/Level2.glb index 5309d8a..3dfb689 100644 Binary files a/examples/bevy_gltf_blueprints/multiple_levels_multiple_blendfiles/assets/models/Level2.glb and b/examples/bevy_gltf_blueprints/multiple_levels_multiple_blendfiles/assets/models/Level2.glb differ diff --git a/examples/bevy_gltf_blueprints/multiple_levels_multiple_blendfiles/assets/models/StartLevel.glb b/examples/bevy_gltf_blueprints/multiple_levels_multiple_blendfiles/assets/models/StartLevel.glb index 30b813a..922eb90 100644 Binary files a/examples/bevy_gltf_blueprints/multiple_levels_multiple_blendfiles/assets/models/StartLevel.glb and b/examples/bevy_gltf_blueprints/multiple_levels_multiple_blendfiles/assets/models/StartLevel.glb differ diff --git a/examples/bevy_gltf_blueprints/multiple_levels_multiple_blendfiles/assets/models/library/LevelTransition.glb b/examples/bevy_gltf_blueprints/multiple_levels_multiple_blendfiles/assets/models/library/LevelTransition.glb index 5065163..0791de8 100644 Binary files a/examples/bevy_gltf_blueprints/multiple_levels_multiple_blendfiles/assets/models/library/LevelTransition.glb and b/examples/bevy_gltf_blueprints/multiple_levels_multiple_blendfiles/assets/models/library/LevelTransition.glb differ diff --git a/examples/bevy_gltf_blueprints/multiple_levels_multiple_blendfiles/src/game/in_game.rs b/examples/bevy_gltf_blueprints/multiple_levels_multiple_blendfiles/src/game/in_game.rs index 2338956..9e84877 100644 --- a/examples/bevy_gltf_blueprints/multiple_levels_multiple_blendfiles/src/game/in_game.rs +++ b/examples/bevy_gltf_blueprints/multiple_levels_multiple_blendfiles/src/game/in_game.rs @@ -41,12 +41,12 @@ pub fn setup_game( struct UnregisteredComponent; pub fn spawn_test( - keycode: Res>, + keycode: Res>, mut commands: Commands, mut game_world: Query<(Entity, &Children), With>, ) { - if keycode.just_pressed(KeyCode::T) { + if keycode.just_pressed(KeyCode::KeyT) { let world = game_world.single_mut(); let world = world.1[0]; @@ -82,47 +82,3 @@ pub fn spawn_test( commands.entity(world).add_child(new_entity); } } - -pub fn spawn_test_unregisted_components( - keycode: Res>, - mut commands: Commands, - - mut game_world: Query<(Entity, &Children), With>, -) { - if keycode.just_pressed(KeyCode::U) { - let world = game_world.single_mut(); - let world = world.1[0]; - - let mut rng = rand::thread_rng(); - let range = 5.5; - let x: f32 = rng.gen_range(-range..range); - let y: f32 = rng.gen_range(-range..range); - - let mut rng = rand::thread_rng(); - let range = 0.8; - let vel_x: f32 = rng.gen_range(-range..range); - let vel_y: f32 = rng.gen_range(2.0..2.5); - let vel_z: f32 = rng.gen_range(-range..range); - - let name_index: u64 = rng.gen(); - - let new_entity = commands - .spawn(( - BluePrintBundle { - blueprint: BlueprintName("Health_Pickup".to_string()), - ..Default::default() - }, - bevy::prelude::Name::from(format!("test{}", name_index)), - // BlueprintName("Health_Pickup".to_string()), - // SpawnHere, - TransformBundle::from_transform(Transform::from_xyz(x, 2.0, y)), - Velocity { - linvel: Vec3::new(vel_x, vel_y, vel_z), - angvel: Vec3::new(0.0, 0.0, 0.0), - }, - UnregisteredComponent, - )) - .id(); - commands.entity(world).add_child(new_entity); - } -} diff --git a/examples/bevy_gltf_blueprints/multiple_levels_multiple_blendfiles/src/game/in_main_menu.rs b/examples/bevy_gltf_blueprints/multiple_levels_multiple_blendfiles/src/game/in_main_menu.rs index c1a4b8b..32142cd 100644 --- a/examples/bevy_gltf_blueprints/multiple_levels_multiple_blendfiles/src/game/in_main_menu.rs +++ b/examples/bevy_gltf_blueprints/multiple_levels_multiple_blendfiles/src/game/in_main_menu.rs @@ -89,24 +89,10 @@ pub fn teardown_main_menu(bla: Query>, mut commands: Co } pub fn main_menu( - keycode: Res>, - + keycode: Res>, mut next_app_state: ResMut>, - // mut next_game_state: ResMut>, - // mut save_requested_events: EventWriter, - // mut load_requested_events: EventWriter, ) { - if keycode.just_pressed(KeyCode::Return) { + if keycode.just_pressed(KeyCode::Enter) { next_app_state.set(AppState::AppLoading); - // next_game_state.set(GameState::None); - } - - if keycode.just_pressed(KeyCode::L) { - next_app_state.set(AppState::AppLoading); - // load_requested_events.send(LoadRequest { path: "toto".into() }) - } - - if keycode.just_pressed(KeyCode::S) { - // save_requested_events.send(SaveRequest { path: "toto".into() }) } } diff --git a/examples/bevy_gltf_blueprints/multiple_levels_multiple_blendfiles/src/game/level_transitions.rs b/examples/bevy_gltf_blueprints/multiple_levels_multiple_blendfiles/src/game/level_transitions.rs index 7fa6f1a..c7f62a3 100644 --- a/examples/bevy_gltf_blueprints/multiple_levels_multiple_blendfiles/src/game/level_transitions.rs +++ b/examples/bevy_gltf_blueprints/multiple_levels_multiple_blendfiles/src/game/level_transitions.rs @@ -103,7 +103,9 @@ pub fn trigger_level_transition( pub struct LevelsPlugin; impl Plugin for LevelsPlugin { fn build(&self, app: &mut App) { - app.register_type::().add_systems( + app + .register_type::() + .add_systems( Update, (trigger_level_transition,).run_if(in_state(GameState::InGame)), ); diff --git a/examples/bevy_gltf_blueprints/multiple_levels_multiple_blendfiles/src/game/mod.rs b/examples/bevy_gltf_blueprints/multiple_levels_multiple_blendfiles/src/game/mod.rs index 3ecdb4f..c1a04f6 100644 --- a/examples/bevy_gltf_blueprints/multiple_levels_multiple_blendfiles/src/game/mod.rs +++ b/examples/bevy_gltf_blueprints/multiple_levels_multiple_blendfiles/src/game/mod.rs @@ -16,7 +16,7 @@ impl Plugin for GamePlugin { app.add_plugins(LevelsPlugin) .add_systems( Update, - (spawn_test, spawn_test_unregisted_components).run_if(in_state(GameState::InGame)), + (spawn_test).run_if(in_state(GameState::InGame)), ) .add_systems(OnEnter(AppState::MenuRunning), setup_main_menu) .add_systems(OnExit(AppState::MenuRunning), teardown_main_menu) diff --git a/examples/bevy_gltf_blueprints/multiple_levels_multiple_blendfiles/src/main.rs b/examples/bevy_gltf_blueprints/multiple_levels_multiple_blendfiles/src/main.rs index 8fca426..9320156 100644 --- a/examples/bevy_gltf_blueprints/multiple_levels_multiple_blendfiles/src/main.rs +++ b/examples/bevy_gltf_blueprints/multiple_levels_multiple_blendfiles/src/main.rs @@ -1,5 +1,4 @@ use bevy::prelude::*; -use bevy_editor_pls::prelude::*; use bevy_gltf_worlflow_examples_common::CommonPlugin; mod core; @@ -15,8 +14,6 @@ fn main() { App::new() .add_plugins(( DefaultPlugins.set(AssetPlugin::default()), - // editor - EditorPlugin::default(), // our custom plugins CommonPlugin, CorePlugin, // reusable plugins diff --git a/examples/bevy_gltf_components/basic/Cargo.toml b/examples/bevy_gltf_components/basic/Cargo.toml index b0ef625..03830cc 100644 --- a/examples/bevy_gltf_components/basic/Cargo.toml +++ b/examples/bevy_gltf_components/basic/Cargo.toml @@ -5,9 +5,6 @@ edition = "2021" license = "MIT OR Apache-2.0" [dependencies] -bevy="0.12" +bevy="0.13" bevy_gltf_components = { path = "../../../crates/bevy_gltf_components" } bevy_gltf_worlflow_examples_common = { path = "../../common" } - -bevy_rapier3d = { version = "0.23.0", features = [ "serde-serialize", "debug-render-3d", "enhanced-determinism"] } -bevy_editor_pls = { version = "0.6" } diff --git a/examples/bevy_gltf_components/basic/src/main.rs b/examples/bevy_gltf_components/basic/src/main.rs index 39035d3..3754eae 100644 --- a/examples/bevy_gltf_components/basic/src/main.rs +++ b/examples/bevy_gltf_components/basic/src/main.rs @@ -1,5 +1,4 @@ use bevy::{gltf::Gltf, prelude::*}; -use bevy_editor_pls::prelude::*; use bevy_gltf_components::ComponentsFromGltfPlugin; use bevy_gltf_worlflow_examples_common::CorePlugin; @@ -61,14 +60,14 @@ fn main() { .add_plugins(( DefaultPlugins.set(AssetPlugin::default()), // editor - EditorPlugin::default(), + // EditorPlugin::default(), // physics // our custom plugins ComponentsFromGltfPlugin::default(), CorePlugin, // reusable plugins ComponentsTestPlugin, // Showcases different type of components /structs )) - .add_state::() + .init_state::() .add_systems(Startup, setup) .add_systems(Update, (spawn_level.run_if(in_state(AppState::Loading)),)) .run(); diff --git a/examples/bevy_gltf_save_load/basic/Cargo.toml b/examples/bevy_gltf_save_load/basic/Cargo.toml index 8685e79..a06a35f 100644 --- a/examples/bevy_gltf_save_load/basic/Cargo.toml +++ b/examples/bevy_gltf_save_load/basic/Cargo.toml @@ -5,14 +5,13 @@ edition = "2021" license = "MIT OR Apache-2.0" [dependencies] -bevy="0.12" -bevy_gltf_blueprints = "0.7" +bevy="0.13" +#bevy_gltf_blueprints = "0.7" +bevy_gltf_blueprints = { path = "../../../crates/bevy_gltf_blueprints" } bevy_gltf_save_load = { path = "../../../crates/bevy_gltf_save_load" } bevy_gltf_worlflow_examples_common = { path = "../../common" } -bevy_rapier3d = { version = "0.23.0", features = [ "serde-serialize", "debug-render-3d", "enhanced-determinism"] } -bevy_asset_loader = { version = "0.18", features = ["standard_dynamic_assets" ]} -bevy_editor_pls = { version = "0.6" } -rand = "0.8.5" serde_json="1.0.108" -serde="1.0.193" \ No newline at end of file +serde="1.0.193" +bevy_rapier3d = { version = "0.25.0", features = [ "serde-serialize", "debug-render-3d", "enhanced-determinism"] } +rand = "0.8.5" \ No newline at end of file diff --git a/examples/bevy_gltf_save_load/basic/src/game/in_game.rs b/examples/bevy_gltf_save_load/basic/src/game/in_game.rs index 6bcedba..954dd94 100644 --- a/examples/bevy_gltf_save_load/basic/src/game/in_game.rs +++ b/examples/bevy_gltf_save_load/basic/src/game/in_game.rs @@ -60,16 +60,16 @@ pub fn unload_world(mut commands: Commands, gameworlds: Query>) -> bool { - keycode.just_pressed(KeyCode::N) +pub fn should_reset(keycode: Res>) -> bool { + keycode.just_pressed(KeyCode::KeyN) } pub fn spawn_test( - keycode: Res>, + keycode: Res>, mut dynamic_entities_world: Query>, mut commands: Commands, ) { - if keycode.just_pressed(KeyCode::T) { + if keycode.just_pressed(KeyCode::KeyT) { let world = dynamic_entities_world.single_mut(); let mut rng = rand::thread_rng(); @@ -109,12 +109,12 @@ pub fn spawn_test( struct UnregisteredComponent; pub fn spawn_test_unregisted_components( - keycode: Res>, + keycode: Res>, mut commands: Commands, mut dynamic_entities_world: Query>, ) { - if keycode.just_pressed(KeyCode::U) { + if keycode.just_pressed(KeyCode::KeyU) { let world = dynamic_entities_world.single_mut(); let mut rng = rand::thread_rng(); @@ -152,13 +152,13 @@ pub fn spawn_test_unregisted_components( } pub fn spawn_test_parenting( - keycode: Res>, + keycode: Res>, players: Query>, mut commands: Commands, names: Query<(Entity, &Name)>, ) { - if keycode.just_pressed(KeyCode::P) { + if keycode.just_pressed(KeyCode::KeyP) { let mut rng = rand::thread_rng(); let range = 5.5; let x: f32 = rng.gen_range(-range..range); diff --git a/examples/bevy_gltf_save_load/basic/src/game/in_game_loading.rs b/examples/bevy_gltf_save_load/basic/src/game/in_game_loading.rs index 7f938c0..3f1c904 100644 --- a/examples/bevy_gltf_save_load/basic/src/game/in_game_loading.rs +++ b/examples/bevy_gltf_save_load/basic/src/game/in_game_loading.rs @@ -1,13 +1,11 @@ -use bevy::{core_pipeline::clear_color::ClearColorConfig, prelude::*}; +use bevy::{prelude::*}; use bevy_gltf_worlflow_examples_common::InGameLoading; pub fn setup_loading_screen(mut commands: Commands) { commands.spawn(( Camera2dBundle { - camera_2d: Camera2d { - clear_color: ClearColorConfig::Custom(Color::BLACK), - }, camera: Camera { + clear_color: ClearColorConfig::Custom(Color::BLACK), // renders after / on top of the main camera order: 2, ..default() diff --git a/examples/bevy_gltf_save_load/basic/src/game/in_main_menu.rs b/examples/bevy_gltf_save_load/basic/src/game/in_main_menu.rs index f449eec..b71192f 100644 --- a/examples/bevy_gltf_save_load/basic/src/game/in_main_menu.rs +++ b/examples/bevy_gltf_save_load/basic/src/game/in_main_menu.rs @@ -92,24 +92,15 @@ pub fn teardown_main_menu(in_main_menu: Query>, mut com } pub fn main_menu( - keycode: Res>, - + keycode: Res>, mut next_app_state: ResMut>, - // mut next_game_state: ResMut>, - // mut save_requested_events: EventWriter, - // mut load_requested_events: EventWriter, ) { - if keycode.just_pressed(KeyCode::Return) { + if keycode.just_pressed(KeyCode::Enter) { next_app_state.set(AppState::AppLoading); - // next_game_state.set(GameState::None); } - if keycode.just_pressed(KeyCode::L) { + if keycode.just_pressed(KeyCode::KeyL) { next_app_state.set(AppState::AppLoading); - // load_requested_events.send(LoadRequest { path: "toto".into() }) } - if keycode.just_pressed(KeyCode::S) { - // save_requested_events.send(SaveRequest { path: "toto".into() }) - } } diff --git a/examples/bevy_gltf_save_load/basic/src/game/mod.rs b/examples/bevy_gltf_save_load/basic/src/game/mod.rs index f30e6fe..7bf9ef3 100644 --- a/examples/bevy_gltf_save_load/basic/src/game/mod.rs +++ b/examples/bevy_gltf_save_load/basic/src/game/mod.rs @@ -16,19 +16,19 @@ use bevy_gltf_save_load::{LoadRequest, LoadingFinished, SaveRequest, SavingFinis pub fn request_save( mut save_requests: EventWriter, - keycode: Res>, + keycode: Res>, current_state: Res>, mut next_game_state: ResMut>, ) { - if keycode.just_pressed(KeyCode::S) + if keycode.just_pressed(KeyCode::KeyS) && (current_state.get() != &GameState::InLoading) && (current_state.get() != &GameState::InSaving) { next_game_state.set(GameState::InSaving); save_requests.send(SaveRequest { path: "save.scn.ron".into(), - }) + }); } } @@ -43,18 +43,18 @@ pub fn on_saving_finished( pub fn request_load( mut load_requests: EventWriter, - keycode: Res>, + keycode: Res>, current_state: Res>, mut next_game_state: ResMut>, ) { - if keycode.just_pressed(KeyCode::L) + if keycode.just_pressed(KeyCode::KeyL) && (current_state.get() != &GameState::InLoading) && (current_state.get() != &GameState::InSaving) { next_game_state.set(GameState::InLoading); load_requests.send(LoadRequest { path: "save.scn.ron".into(), - }) + }); } } diff --git a/examples/bevy_gltf_save_load/basic/src/main.rs b/examples/bevy_gltf_save_load/basic/src/main.rs index 8fca426..9320156 100644 --- a/examples/bevy_gltf_save_load/basic/src/main.rs +++ b/examples/bevy_gltf_save_load/basic/src/main.rs @@ -1,5 +1,4 @@ use bevy::prelude::*; -use bevy_editor_pls::prelude::*; use bevy_gltf_worlflow_examples_common::CommonPlugin; mod core; @@ -15,8 +14,6 @@ fn main() { App::new() .add_plugins(( DefaultPlugins.set(AssetPlugin::default()), - // editor - EditorPlugin::default(), // our custom plugins CommonPlugin, CorePlugin, // reusable plugins diff --git a/examples/bevy_registry_export/basic/Cargo.toml b/examples/bevy_registry_export/basic/Cargo.toml index 800d0d3..e84906c 100644 --- a/examples/bevy_registry_export/basic/Cargo.toml +++ b/examples/bevy_registry_export/basic/Cargo.toml @@ -5,12 +5,9 @@ edition = "2021" license = "MIT OR Apache-2.0" [dependencies] -bevy="0.12" +bevy="0.13" bevy_gltf_blueprints = { path = "../../../crates/bevy_gltf_blueprints" } bevy_registry_export = { path = "../../../crates/bevy_registry_export" } bevy_gltf_worlflow_examples_common = { path = "../../common" } - -bevy_rapier3d = { version = "0.23.0", features = [ "serde-serialize", "debug-render-3d", "enhanced-determinism"] } -bevy_asset_loader = { version = "0.18", features = ["standard_dynamic_assets" ]} -bevy_editor_pls = { version = "0.6" } -rand = "0.8.5" +bevy_rapier3d = { version = "0.25.0", features = [ "serde-serialize", "debug-render-3d", "enhanced-determinism"] } +rand = "0.8.5" \ No newline at end of file diff --git a/examples/bevy_registry_export/basic/assets/registry.json b/examples/bevy_registry_export/basic/assets/registry.json index 88e3b13..9b3e867 100644 --- a/examples/bevy_registry_export/basic/assets/registry.json +++ b/examples/bevy_registry_export/basic/assets/registry.json @@ -71,6 +71,19 @@ "type": "array", "typeInfo": "List" }, + "alloc::vec::Vec": { + "isComponent": false, + "isResource": false, + "items": { + "type": { + "$ref": "#/$defs/bevy_animation::VariableCurve" + } + }, + "short_name": "Vec", + "title": "alloc::vec::Vec", + "type": "array", + "typeInfo": "List" + }, "alloc::vec::Vec": { "isComponent": false, "isResource": false, @@ -84,16 +97,16 @@ "type": "array", "typeInfo": "List" }, - "alloc::vec::Vec": { + "alloc::vec::Vec": { "isComponent": false, "isResource": false, "items": { "type": { - "$ref": "#/$defs/bevy_ecs::Entity" + "$ref": "#/$defs/bevy_ecs::entity::Entity" } }, "short_name": "Vec", - "title": "alloc::vec::Vec", + "title": "alloc::vec::Vec", "type": "array", "typeInfo": "List" }, @@ -123,6 +136,45 @@ "type": "array", "typeInfo": "List" }, + "alloc::vec::Vec": { + "isComponent": false, + "isResource": false, + "items": { + "type": { + "$ref": "#/$defs/f32" + } + }, + "short_name": "Vec", + "title": "alloc::vec::Vec", + "type": "array", + "typeInfo": "List" + }, + "alloc::vec::Vec": { + "isComponent": false, + "isResource": false, + "items": { + "type": { + "$ref": "#/$defs/glam::Quat" + } + }, + "short_name": "Vec", + "title": "alloc::vec::Vec", + "type": "array", + "typeInfo": "List" + }, + "alloc::vec::Vec": { + "isComponent": false, + "isResource": false, + "items": { + "type": { + "$ref": "#/$defs/glam::Vec3" + } + }, + "short_name": "Vec", + "title": "alloc::vec::Vec", + "type": "array", + "typeInfo": "List" + }, "bevy_animation::AnimationClip": { "additionalProperties": false, "isComponent": false, @@ -179,6 +231,116 @@ "type": "object", "typeInfo": "Struct" }, + "bevy_animation::Interpolation": { + "isComponent": false, + "isResource": false, + "oneOf": [ + "Linear", + "Step", + "CubicSpline" + ], + "short_name": "Interpolation", + "title": "bevy_animation::Interpolation", + "type": "string", + "typeInfo": "Enum" + }, + "bevy_animation::Keyframes": { + "isComponent": false, + "isResource": false, + "oneOf": [ + { + "items": false, + "prefixItems": [ + { + "type": { + "$ref": "#/$defs/alloc::vec::Vec" + } + } + ], + "short_name": "Rotation", + "title": "Rotation", + "type": "array", + "typeInfo": "Tuple" + }, + { + "items": false, + "prefixItems": [ + { + "type": { + "$ref": "#/$defs/alloc::vec::Vec" + } + } + ], + "short_name": "Translation", + "title": "Translation", + "type": "array", + "typeInfo": "Tuple" + }, + { + "items": false, + "prefixItems": [ + { + "type": { + "$ref": "#/$defs/alloc::vec::Vec" + } + } + ], + "short_name": "Scale", + "title": "Scale", + "type": "array", + "typeInfo": "Tuple" + }, + { + "items": false, + "prefixItems": [ + { + "type": { + "$ref": "#/$defs/alloc::vec::Vec" + } + } + ], + "short_name": "Weights", + "title": "Weights", + "type": "array", + "typeInfo": "Tuple" + } + ], + "short_name": "Keyframes", + "title": "bevy_animation::Keyframes", + "type": "object", + "typeInfo": "Enum" + }, + "bevy_animation::VariableCurve": { + "additionalProperties": false, + "isComponent": false, + "isResource": false, + "properties": { + "interpolation": { + "type": { + "$ref": "#/$defs/bevy_animation::Interpolation" + } + }, + "keyframe_timestamps": { + "type": { + "$ref": "#/$defs/alloc::vec::Vec" + } + }, + "keyframes": { + "type": { + "$ref": "#/$defs/bevy_animation::Keyframes" + } + } + }, + "required": [ + "keyframe_timestamps", + "keyframes", + "interpolation" + ], + "short_name": "VariableCurve", + "title": "bevy_animation::VariableCurve", + "type": "object", + "typeInfo": "Struct" + }, "bevy_asset::handle::Handle<()>": { "isComponent": true, "isResource": false, @@ -673,44 +835,6 @@ "type": "object", "typeInfo": "Enum" }, - "bevy_asset::handle::Handle": { - "isComponent": true, - "isResource": false, - "oneOf": [ - { - "items": false, - "prefixItems": [ - { - "type": { - "$ref": "#/$defs/std::sync::Arc" - } - } - ], - "short_name": "Strong", - "title": "Strong", - "type": "array", - "typeInfo": "Tuple" - }, - { - "items": false, - "prefixItems": [ - { - "type": { - "$ref": "#/$defs/bevy_asset::id::AssetId" - } - } - ], - "short_name": "Weak", - "title": "Weak", - "type": "array", - "typeInfo": "Tuple" - } - ], - "short_name": "Handle", - "title": "bevy_asset::handle::Handle", - "type": "object", - "typeInfo": "Enum" - }, "bevy_asset::handle::Handle": { "isComponent": true, "isResource": false, @@ -977,7 +1101,7 @@ "type": "object", "typeInfo": "Enum" }, - "bevy_asset::handle::Handle": { + "bevy_asset::handle::Handle": { "isComponent": true, "isResource": false, "oneOf": [ @@ -1000,7 +1124,7 @@ "prefixItems": [ { "type": { - "$ref": "#/$defs/bevy_asset::id::AssetId" + "$ref": "#/$defs/bevy_asset::id::AssetId" } } ], @@ -1010,8 +1134,8 @@ "typeInfo": "Tuple" } ], - "short_name": "Handle", - "title": "bevy_asset::handle::Handle", + "short_name": "Handle", + "title": "bevy_asset::handle::Handle", "type": "object", "typeInfo": "Enum" }, @@ -1651,52 +1775,6 @@ "type": "object", "typeInfo": "Enum" }, - "bevy_asset::id::AssetId": { - "isComponent": false, - "isResource": false, - "oneOf": [ - { - "additionalProperties": false, - "properties": { - "index": { - "title": "index", - "type": { - "$ref": "#/$defs/bevy_asset::assets::AssetIndex" - } - } - }, - "required": [ - "index" - ], - "short_name": "Index", - "title": "Index", - "type": "object", - "typeInfo": "Struct" - }, - { - "additionalProperties": false, - "properties": { - "uuid": { - "title": "uuid", - "type": { - "$ref": "#/$defs/bevy_utils::Uuid" - } - } - }, - "required": [ - "uuid" - ], - "short_name": "Uuid", - "title": "Uuid", - "type": "object", - "typeInfo": "Struct" - } - ], - "short_name": "AssetId", - "title": "bevy_asset::id::AssetId", - "type": "object", - "typeInfo": "Enum" - }, "bevy_asset::id::AssetId": { "isComponent": false, "isResource": false, @@ -2019,7 +2097,7 @@ "type": "object", "typeInfo": "Enum" }, - "bevy_asset::id::AssetId": { + "bevy_asset::id::AssetId": { "isComponent": false, "isResource": false, "oneOf": [ @@ -2060,8 +2138,8 @@ "typeInfo": "Struct" } ], - "short_name": "AssetId", - "title": "bevy_asset::id::AssetId", + "short_name": "AssetId", + "title": "bevy_asset::id::AssetId", "type": "object", "typeInfo": "Enum" }, @@ -2111,6 +2189,152 @@ "type": "object", "typeInfo": "Enum" }, + "bevy_asset::path::AssetPath<'static>": { + "isComponent": false, + "isResource": false, + "short_name": "AssetPath<'static>", + "title": "bevy_asset::path::AssetPath<'static>", + "type": "object", + "typeInfo": "Value" + }, + "bevy_audio::audio::DefaultSpatialScale": { + "isComponent": false, + "isResource": true, + "items": false, + "prefixItems": [ + { + "type": { + "$ref": "#/$defs/bevy_audio::audio::SpatialScale" + } + } + ], + "short_name": "DefaultSpatialScale", + "title": "bevy_audio::audio::DefaultSpatialScale", + "type": "array", + "typeInfo": "TupleStruct" + }, + "bevy_audio::audio::GlobalVolume": { + "additionalProperties": false, + "isComponent": false, + "isResource": true, + "properties": { + "volume": { + "type": { + "$ref": "#/$defs/bevy_audio::audio::Volume" + } + } + }, + "required": [ + "volume" + ], + "short_name": "GlobalVolume", + "title": "bevy_audio::audio::GlobalVolume", + "type": "object", + "typeInfo": "Struct" + }, + "bevy_audio::audio::PlaybackMode": { + "isComponent": false, + "isResource": false, + "oneOf": [ + "Once", + "Loop", + "Despawn", + "Remove" + ], + "short_name": "PlaybackMode", + "title": "bevy_audio::audio::PlaybackMode", + "type": "string", + "typeInfo": "Enum" + }, + "bevy_audio::audio::PlaybackSettings": { + "additionalProperties": false, + "isComponent": true, + "isResource": false, + "properties": { + "mode": { + "type": { + "$ref": "#/$defs/bevy_audio::audio::PlaybackMode" + } + }, + "paused": { + "type": { + "$ref": "#/$defs/bool" + } + }, + "spatial": { + "type": { + "$ref": "#/$defs/bool" + } + }, + "spatial_scale": { + "type": { + "$ref": "#/$defs/core::option::Option" + } + }, + "speed": { + "type": { + "$ref": "#/$defs/f32" + } + }, + "volume": { + "type": { + "$ref": "#/$defs/bevy_audio::audio::Volume" + } + } + }, + "required": [ + "mode", + "volume", + "speed", + "paused", + "spatial" + ], + "short_name": "PlaybackSettings", + "title": "bevy_audio::audio::PlaybackSettings", + "type": "object", + "typeInfo": "Struct" + }, + "bevy_audio::audio::SpatialListener": { + "additionalProperties": false, + "isComponent": true, + "isResource": false, + "properties": { + "left_ear_offset": { + "type": { + "$ref": "#/$defs/glam::Vec3" + } + }, + "right_ear_offset": { + "type": { + "$ref": "#/$defs/glam::Vec3" + } + } + }, + "required": [ + "left_ear_offset", + "right_ear_offset" + ], + "short_name": "SpatialListener", + "title": "bevy_audio::audio::SpatialListener", + "type": "object", + "typeInfo": "Struct" + }, + "bevy_audio::audio::Volume": { + "isComponent": false, + "isResource": false, + "items": false, + "prefixItems": [ + { + "type": { + "$ref": "#/$defs/f32" + } + } + ], + "short_name": "Volume", + "title": "bevy_audio::audio::Volume", + "type": "array", + "typeInfo": "TupleStruct" + }, "bevy_bevy_registry_export_basic_example::test_components::BasicTest": { "additionalProperties": false, "isComponent": true, @@ -2646,52 +2870,6 @@ "type": "object", "typeInfo": "Struct" }, - "bevy_core_pipeline::clear_color::ClearColor": { - "isComponent": false, - "isResource": true, - "items": false, - "prefixItems": [ - { - "type": { - "$ref": "#/$defs/bevy_render::color::Color" - } - } - ], - "short_name": "ClearColor", - "title": "bevy_core_pipeline::clear_color::ClearColor", - "type": "array", - "typeInfo": "TupleStruct" - }, - "bevy_core_pipeline::clear_color::ClearColorConfig": { - "isComponent": false, - "isResource": false, - "oneOf": [ - { - "title": "Default" - }, - { - "items": false, - "prefixItems": [ - { - "type": { - "$ref": "#/$defs/bevy_render::color::Color" - } - } - ], - "short_name": "Custom", - "title": "Custom", - "type": "array", - "typeInfo": "Tuple" - }, - { - "title": "None" - } - ], - "short_name": "ClearColorConfig", - "title": "bevy_core_pipeline::clear_color::ClearColorConfig", - "type": "object", - "typeInfo": "Enum" - }, "bevy_core_pipeline::contrast_adaptive_sharpening::ContrastAdaptiveSharpeningSettings": { "additionalProperties": false, "isComponent": true, @@ -2727,16 +2905,8 @@ "additionalProperties": false, "isComponent": true, "isResource": false, - "properties": { - "clear_color": { - "type": { - "$ref": "#/$defs/bevy_core_pipeline::clear_color::ClearColorConfig" - } - } - }, - "required": [ - "clear_color" - ], + "properties": {}, + "required": [], "short_name": "Camera2d", "title": "bevy_core_pipeline::core_2d::camera_2d::Camera2d", "type": "object", @@ -2747,11 +2917,6 @@ "isComponent": true, "isResource": false, "properties": { - "clear_color": { - "type": { - "$ref": "#/$defs/bevy_core_pipeline::clear_color::ClearColorConfig" - } - }, "depth_load_op": { "type": { "$ref": "#/$defs/bevy_core_pipeline::core_3d::camera_3d::Camera3dDepthLoadOp" @@ -2774,7 +2939,6 @@ } }, "required": [ - "clear_color", "depth_load_op", "depth_texture_usages", "screen_space_specular_transmission_steps", @@ -2812,6 +2976,36 @@ "type": "object", "typeInfo": "Enum" }, + "bevy_core_pipeline::core_3d::camera_3d::Camera3dDepthTextureUsage": { + "isComponent": false, + "isResource": false, + "items": false, + "prefixItems": [ + { + "type": { + "$ref": "#/$defs/u32" + } + } + ], + "short_name": "Camera3dDepthTextureUsage", + "title": "bevy_core_pipeline::core_3d::camera_3d::Camera3dDepthTextureUsage", + "type": "array", + "typeInfo": "TupleStruct" + }, + "bevy_core_pipeline::core_3d::camera_3d::ScreenSpaceTransmissionQuality": { + "isComponent": false, + "isResource": true, + "oneOf": [ + "Low", + "Medium", + "High", + "Ultra" + ], + "short_name": "ScreenSpaceTransmissionQuality", + "title": "bevy_core_pipeline::core_3d::camera_3d::ScreenSpaceTransmissionQuality", + "type": "string", + "typeInfo": "Enum" + }, "bevy_core_pipeline::fxaa::Fxaa": { "additionalProperties": false, "isComponent": true, @@ -2843,6 +3037,17 @@ "type": "object", "typeInfo": "Struct" }, + "bevy_core_pipeline::prepass::DeferredPrepass": { + "additionalProperties": false, + "isComponent": false, + "isResource": false, + "properties": {}, + "required": [], + "short_name": "DeferredPrepass", + "title": "bevy_core_pipeline::prepass::DeferredPrepass", + "type": "object", + "typeInfo": "Struct" + }, "bevy_core_pipeline::prepass::DepthPrepass": { "additionalProperties": false, "isComponent": false, @@ -2854,6 +3059,17 @@ "type": "object", "typeInfo": "Struct" }, + "bevy_core_pipeline::prepass::MotionVectorPrepass": { + "additionalProperties": false, + "isComponent": false, + "isResource": false, + "properties": {}, + "required": [], + "short_name": "MotionVectorPrepass", + "title": "bevy_core_pipeline::prepass::MotionVectorPrepass", + "type": "object", + "typeInfo": "Struct" + }, "bevy_core_pipeline::prepass::NormalPrepass": { "additionalProperties": false, "isComponent": false, @@ -2895,35 +3111,138 @@ "type": "string", "typeInfo": "Enum" }, - "bevy_ecs::Entity": { + "bevy_ecs::component::ComponentId": { "isComponent": false, "isResource": false, - "short_name": "Entity", - "title": "bevy_ecs::Entity", - "type": "object", - "typeInfo": "Value" + "items": false, + "prefixItems": [ + { + "type": { + "$ref": "#/$defs/usize" + } + } + ], + "short_name": "ComponentId", + "title": "bevy_ecs::component::ComponentId", + "type": "array", + "typeInfo": "TupleStruct" }, - "bevy_egui::EguiSettings": { + "bevy_ecs::component::ComponentTicks": { "additionalProperties": false, "isComponent": false, "isResource": false, "properties": { - "default_open_url_target": { + "added": { "type": { - "$ref": "#/$defs/core::option::Option" + "$ref": "#/$defs/bevy_ecs::component::Tick" } }, - "scale_factor": { + "changed": { "type": { - "$ref": "#/$defs/f64" + "$ref": "#/$defs/bevy_ecs::component::Tick" } } }, "required": [ - "scale_factor" + "added", + "changed" ], - "short_name": "EguiSettings", - "title": "bevy_egui::EguiSettings", + "short_name": "ComponentTicks", + "title": "bevy_ecs::component::ComponentTicks", + "type": "object", + "typeInfo": "Struct" + }, + "bevy_ecs::component::Tick": { + "additionalProperties": false, + "isComponent": false, + "isResource": false, + "properties": { + "tick": { + "type": { + "$ref": "#/$defs/u32" + } + } + }, + "required": [ + "tick" + ], + "short_name": "Tick", + "title": "bevy_ecs::component::Tick", + "type": "object", + "typeInfo": "Struct" + }, + "bevy_ecs::entity::Entity": { + "isComponent": false, + "isResource": false, + "short_name": "Entity", + "title": "bevy_ecs::entity::Entity", + "type": "object", + "typeInfo": "Value" + }, + "bevy_gizmos::aabb::AabbGizmoConfigGroup": { + "additionalProperties": false, + "isComponent": false, + "isResource": false, + "properties": { + "default_color": { + "type": { + "$ref": "#/$defs/core::option::Option" + } + }, + "draw_all": { + "type": { + "$ref": "#/$defs/bool" + } + } + }, + "required": [ + "draw_all" + ], + "short_name": "AabbGizmoConfigGroup", + "title": "bevy_gizmos::aabb::AabbGizmoConfigGroup", + "type": "object", + "typeInfo": "Struct" + }, + "bevy_gizmos::config::GizmoConfig": { + "additionalProperties": false, + "isComponent": false, + "isResource": false, + "properties": { + "depth_bias": { + "type": { + "$ref": "#/$defs/f32" + } + }, + "enabled": { + "type": { + "$ref": "#/$defs/bool" + } + }, + "line_perspective": { + "type": { + "$ref": "#/$defs/bool" + } + }, + "line_width": { + "type": { + "$ref": "#/$defs/f32" + } + }, + "render_layers": { + "type": { + "$ref": "#/$defs/bevy_render::view::visibility::render_layers::RenderLayers" + } + } + }, + "required": [ + "enabled", + "line_width", + "line_perspective", + "depth_bias", + "render_layers" + ], + "short_name": "GizmoConfig", + "title": "bevy_gizmos::config::GizmoConfig", "type": "object", "typeInfo": "Struct" }, @@ -3225,7 +3544,7 @@ "prefixItems": [ { "type": { - "$ref": "#/$defs/smallvec::SmallVec<[bevy_ecs::Entity; 8]>" + "$ref": "#/$defs/bevy_utils::smallvec::SmallVec<[bevy_ecs::entity::Entity; 8]>" } } ], @@ -3241,7 +3560,7 @@ "prefixItems": [ { "type": { - "$ref": "#/$defs/bevy_ecs::Entity" + "$ref": "#/$defs/bevy_ecs::entity::Entity" } } ], @@ -3654,177 +3973,1580 @@ "type": "object", "typeInfo": "Struct" }, + "bevy_input::keyboard::Key": { + "isComponent": false, + "isResource": false, + "oneOf": [ + { + "items": false, + "prefixItems": [ + { + "type": { + "$ref": "#/$defs/smol_str::SmolStr" + } + } + ], + "short_name": "Character", + "title": "Character", + "type": "array", + "typeInfo": "Tuple" + }, + { + "items": false, + "prefixItems": [ + { + "type": { + "$ref": "#/$defs/bevy_input::keyboard::NativeKey" + } + } + ], + "short_name": "Unidentified", + "title": "Unidentified", + "type": "array", + "typeInfo": "Tuple" + }, + { + "items": false, + "prefixItems": [ + { + "type": { + "$ref": "#/$defs/core::option::Option" + } + } + ], + "short_name": "Dead", + "title": "Dead", + "type": "array", + "typeInfo": "Tuple" + }, + { + "title": "Alt" + }, + { + "title": "AltGraph" + }, + { + "title": "CapsLock" + }, + { + "title": "Control" + }, + { + "title": "Fn" + }, + { + "title": "FnLock" + }, + { + "title": "NumLock" + }, + { + "title": "ScrollLock" + }, + { + "title": "Shift" + }, + { + "title": "Symbol" + }, + { + "title": "SymbolLock" + }, + { + "title": "Meta" + }, + { + "title": "Hyper" + }, + { + "title": "Super" + }, + { + "title": "Enter" + }, + { + "title": "Tab" + }, + { + "title": "Space" + }, + { + "title": "ArrowDown" + }, + { + "title": "ArrowLeft" + }, + { + "title": "ArrowRight" + }, + { + "title": "ArrowUp" + }, + { + "title": "End" + }, + { + "title": "Home" + }, + { + "title": "PageDown" + }, + { + "title": "PageUp" + }, + { + "title": "Backspace" + }, + { + "title": "Clear" + }, + { + "title": "Copy" + }, + { + "title": "CrSel" + }, + { + "title": "Cut" + }, + { + "title": "Delete" + }, + { + "title": "EraseEof" + }, + { + "title": "ExSel" + }, + { + "title": "Insert" + }, + { + "title": "Paste" + }, + { + "title": "Redo" + }, + { + "title": "Undo" + }, + { + "title": "Accept" + }, + { + "title": "Again" + }, + { + "title": "Attn" + }, + { + "title": "Cancel" + }, + { + "title": "ContextMenu" + }, + { + "title": "Escape" + }, + { + "title": "Execute" + }, + { + "title": "Find" + }, + { + "title": "Help" + }, + { + "title": "Pause" + }, + { + "title": "Play" + }, + { + "title": "Props" + }, + { + "title": "Select" + }, + { + "title": "ZoomIn" + }, + { + "title": "ZoomOut" + }, + { + "title": "BrightnessDown" + }, + { + "title": "BrightnessUp" + }, + { + "title": "Eject" + }, + { + "title": "LogOff" + }, + { + "title": "Power" + }, + { + "title": "PowerOff" + }, + { + "title": "PrintScreen" + }, + { + "title": "Hibernate" + }, + { + "title": "Standby" + }, + { + "title": "WakeUp" + }, + { + "title": "AllCandidates" + }, + { + "title": "Alphanumeric" + }, + { + "title": "CodeInput" + }, + { + "title": "Compose" + }, + { + "title": "Convert" + }, + { + "title": "FinalMode" + }, + { + "title": "GroupFirst" + }, + { + "title": "GroupLast" + }, + { + "title": "GroupNext" + }, + { + "title": "GroupPrevious" + }, + { + "title": "ModeChange" + }, + { + "title": "NextCandidate" + }, + { + "title": "NonConvert" + }, + { + "title": "PreviousCandidate" + }, + { + "title": "Process" + }, + { + "title": "SingleCandidate" + }, + { + "title": "HangulMode" + }, + { + "title": "HanjaMode" + }, + { + "title": "JunjaMode" + }, + { + "title": "Eisu" + }, + { + "title": "Hankaku" + }, + { + "title": "Hiragana" + }, + { + "title": "HiraganaKatakana" + }, + { + "title": "KanaMode" + }, + { + "title": "KanjiMode" + }, + { + "title": "Katakana" + }, + { + "title": "Romaji" + }, + { + "title": "Zenkaku" + }, + { + "title": "ZenkakuHankaku" + }, + { + "title": "Soft1" + }, + { + "title": "Soft2" + }, + { + "title": "Soft3" + }, + { + "title": "Soft4" + }, + { + "title": "ChannelDown" + }, + { + "title": "ChannelUp" + }, + { + "title": "Close" + }, + { + "title": "MailForward" + }, + { + "title": "MailReply" + }, + { + "title": "MailSend" + }, + { + "title": "MediaClose" + }, + { + "title": "MediaFastForward" + }, + { + "title": "MediaPause" + }, + { + "title": "MediaPlay" + }, + { + "title": "MediaPlayPause" + }, + { + "title": "MediaRecord" + }, + { + "title": "MediaRewind" + }, + { + "title": "MediaStop" + }, + { + "title": "MediaTrackNext" + }, + { + "title": "MediaTrackPrevious" + }, + { + "title": "New" + }, + { + "title": "Open" + }, + { + "title": "Print" + }, + { + "title": "Save" + }, + { + "title": "SpellCheck" + }, + { + "title": "Key11" + }, + { + "title": "Key12" + }, + { + "title": "AudioBalanceLeft" + }, + { + "title": "AudioBalanceRight" + }, + { + "title": "AudioBassBoostDown" + }, + { + "title": "AudioBassBoostToggle" + }, + { + "title": "AudioBassBoostUp" + }, + { + "title": "AudioFaderFront" + }, + { + "title": "AudioFaderRear" + }, + { + "title": "AudioSurroundModeNext" + }, + { + "title": "AudioTrebleDown" + }, + { + "title": "AudioTrebleUp" + }, + { + "title": "AudioVolumeDown" + }, + { + "title": "AudioVolumeUp" + }, + { + "title": "AudioVolumeMute" + }, + { + "title": "MicrophoneToggle" + }, + { + "title": "MicrophoneVolumeDown" + }, + { + "title": "MicrophoneVolumeUp" + }, + { + "title": "MicrophoneVolumeMute" + }, + { + "title": "SpeechCorrectionList" + }, + { + "title": "SpeechInputToggle" + }, + { + "title": "LaunchApplication1" + }, + { + "title": "LaunchApplication2" + }, + { + "title": "LaunchCalendar" + }, + { + "title": "LaunchContacts" + }, + { + "title": "LaunchMail" + }, + { + "title": "LaunchMediaPlayer" + }, + { + "title": "LaunchMusicPlayer" + }, + { + "title": "LaunchPhone" + }, + { + "title": "LaunchScreenSaver" + }, + { + "title": "LaunchSpreadsheet" + }, + { + "title": "LaunchWebBrowser" + }, + { + "title": "LaunchWebCam" + }, + { + "title": "LaunchWordProcessor" + }, + { + "title": "BrowserBack" + }, + { + "title": "BrowserFavorites" + }, + { + "title": "BrowserForward" + }, + { + "title": "BrowserHome" + }, + { + "title": "BrowserRefresh" + }, + { + "title": "BrowserSearch" + }, + { + "title": "BrowserStop" + }, + { + "title": "AppSwitch" + }, + { + "title": "Call" + }, + { + "title": "Camera" + }, + { + "title": "CameraFocus" + }, + { + "title": "EndCall" + }, + { + "title": "GoBack" + }, + { + "title": "GoHome" + }, + { + "title": "HeadsetHook" + }, + { + "title": "LastNumberRedial" + }, + { + "title": "Notification" + }, + { + "title": "MannerMode" + }, + { + "title": "VoiceDial" + }, + { + "title": "TV" + }, + { + "title": "TV3DMode" + }, + { + "title": "TVAntennaCable" + }, + { + "title": "TVAudioDescription" + }, + { + "title": "TVAudioDescriptionMixDown" + }, + { + "title": "TVAudioDescriptionMixUp" + }, + { + "title": "TVContentsMenu" + }, + { + "title": "TVDataService" + }, + { + "title": "TVInput" + }, + { + "title": "TVInputComponent1" + }, + { + "title": "TVInputComponent2" + }, + { + "title": "TVInputComposite1" + }, + { + "title": "TVInputComposite2" + }, + { + "title": "TVInputHDMI1" + }, + { + "title": "TVInputHDMI2" + }, + { + "title": "TVInputHDMI3" + }, + { + "title": "TVInputHDMI4" + }, + { + "title": "TVInputVGA1" + }, + { + "title": "TVMediaContext" + }, + { + "title": "TVNetwork" + }, + { + "title": "TVNumberEntry" + }, + { + "title": "TVPower" + }, + { + "title": "TVRadioService" + }, + { + "title": "TVSatellite" + }, + { + "title": "TVSatelliteBS" + }, + { + "title": "TVSatelliteCS" + }, + { + "title": "TVSatelliteToggle" + }, + { + "title": "TVTerrestrialAnalog" + }, + { + "title": "TVTerrestrialDigital" + }, + { + "title": "TVTimer" + }, + { + "title": "AVRInput" + }, + { + "title": "AVRPower" + }, + { + "title": "ColorF0Red" + }, + { + "title": "ColorF1Green" + }, + { + "title": "ColorF2Yellow" + }, + { + "title": "ColorF3Blue" + }, + { + "title": "ColorF4Grey" + }, + { + "title": "ColorF5Brown" + }, + { + "title": "ClosedCaptionToggle" + }, + { + "title": "Dimmer" + }, + { + "title": "DisplaySwap" + }, + { + "title": "DVR" + }, + { + "title": "Exit" + }, + { + "title": "FavoriteClear0" + }, + { + "title": "FavoriteClear1" + }, + { + "title": "FavoriteClear2" + }, + { + "title": "FavoriteClear3" + }, + { + "title": "FavoriteRecall0" + }, + { + "title": "FavoriteRecall1" + }, + { + "title": "FavoriteRecall2" + }, + { + "title": "FavoriteRecall3" + }, + { + "title": "FavoriteStore0" + }, + { + "title": "FavoriteStore1" + }, + { + "title": "FavoriteStore2" + }, + { + "title": "FavoriteStore3" + }, + { + "title": "Guide" + }, + { + "title": "GuideNextDay" + }, + { + "title": "GuidePreviousDay" + }, + { + "title": "Info" + }, + { + "title": "InstantReplay" + }, + { + "title": "Link" + }, + { + "title": "ListProgram" + }, + { + "title": "LiveContent" + }, + { + "title": "Lock" + }, + { + "title": "MediaApps" + }, + { + "title": "MediaAudioTrack" + }, + { + "title": "MediaLast" + }, + { + "title": "MediaSkipBackward" + }, + { + "title": "MediaSkipForward" + }, + { + "title": "MediaStepBackward" + }, + { + "title": "MediaStepForward" + }, + { + "title": "MediaTopMenu" + }, + { + "title": "NavigateIn" + }, + { + "title": "NavigateNext" + }, + { + "title": "NavigateOut" + }, + { + "title": "NavigatePrevious" + }, + { + "title": "NextFavoriteChannel" + }, + { + "title": "NextUserProfile" + }, + { + "title": "OnDemand" + }, + { + "title": "Pairing" + }, + { + "title": "PinPDown" + }, + { + "title": "PinPMove" + }, + { + "title": "PinPToggle" + }, + { + "title": "PinPUp" + }, + { + "title": "PlaySpeedDown" + }, + { + "title": "PlaySpeedReset" + }, + { + "title": "PlaySpeedUp" + }, + { + "title": "RandomToggle" + }, + { + "title": "RcLowBattery" + }, + { + "title": "RecordSpeedNext" + }, + { + "title": "RfBypass" + }, + { + "title": "ScanChannelsToggle" + }, + { + "title": "ScreenModeNext" + }, + { + "title": "Settings" + }, + { + "title": "SplitScreenToggle" + }, + { + "title": "STBInput" + }, + { + "title": "STBPower" + }, + { + "title": "Subtitle" + }, + { + "title": "Teletext" + }, + { + "title": "VideoModeNext" + }, + { + "title": "Wink" + }, + { + "title": "ZoomToggle" + }, + { + "title": "F1" + }, + { + "title": "F2" + }, + { + "title": "F3" + }, + { + "title": "F4" + }, + { + "title": "F5" + }, + { + "title": "F6" + }, + { + "title": "F7" + }, + { + "title": "F8" + }, + { + "title": "F9" + }, + { + "title": "F10" + }, + { + "title": "F11" + }, + { + "title": "F12" + }, + { + "title": "F13" + }, + { + "title": "F14" + }, + { + "title": "F15" + }, + { + "title": "F16" + }, + { + "title": "F17" + }, + { + "title": "F18" + }, + { + "title": "F19" + }, + { + "title": "F20" + }, + { + "title": "F21" + }, + { + "title": "F22" + }, + { + "title": "F23" + }, + { + "title": "F24" + }, + { + "title": "F25" + }, + { + "title": "F26" + }, + { + "title": "F27" + }, + { + "title": "F28" + }, + { + "title": "F29" + }, + { + "title": "F30" + }, + { + "title": "F31" + }, + { + "title": "F32" + }, + { + "title": "F33" + }, + { + "title": "F34" + }, + { + "title": "F35" + } + ], + "short_name": "Key", + "title": "bevy_input::keyboard::Key", + "type": "object", + "typeInfo": "Enum" + }, "bevy_input::keyboard::KeyCode": { "isComponent": false, "isResource": false, "oneOf": [ - "Key1", - "Key2", - "Key3", - "Key4", - "Key5", - "Key6", - "Key7", - "Key8", - "Key9", - "Key0", - "A", - "B", - "C", - "D", - "E", - "F", - "G", - "H", - "I", - "J", - "K", - "L", - "M", - "N", - "O", - "P", - "Q", - "R", - "S", - "T", - "U", - "V", - "W", - "X", - "Y", - "Z", - "Escape", - "F1", - "F2", - "F3", - "F4", - "F5", - "F6", - "F7", - "F8", - "F9", - "F10", - "F11", - "F12", - "F13", - "F14", - "F15", - "F16", - "F17", - "F18", - "F19", - "F20", - "F21", - "F22", - "F23", - "F24", - "Snapshot", - "Scroll", - "Pause", - "Insert", - "Home", - "Delete", - "End", - "PageDown", - "PageUp", - "Left", - "Up", - "Right", - "Down", - "Back", - "Return", - "Space", - "Compose", - "Caret", - "Numlock", - "Numpad0", - "Numpad1", - "Numpad2", - "Numpad3", - "Numpad4", - "Numpad5", - "Numpad6", - "Numpad7", - "Numpad8", - "Numpad9", - "AbntC1", - "AbntC2", - "NumpadAdd", - "Apostrophe", - "Apps", - "Asterisk", - "Plus", - "At", - "Ax", - "Backslash", - "Calculator", - "Capital", - "Colon", - "Comma", - "Convert", - "NumpadDecimal", - "NumpadDivide", - "Equals", - "Grave", - "Kana", - "Kanji", - "AltLeft", - "BracketLeft", - "ControlLeft", - "ShiftLeft", - "SuperLeft", - "Mail", - "MediaSelect", - "MediaStop", - "Minus", - "NumpadMultiply", - "Mute", - "MyComputer", - "NavigateForward", - "NavigateBackward", - "NextTrack", - "NoConvert", - "NumpadComma", - "NumpadEnter", - "NumpadEquals", - "Oem102", - "Period", - "PlayPause", - "Power", - "PrevTrack", - "AltRight", - "BracketRight", - "ControlRight", - "ShiftRight", - "SuperRight", - "Semicolon", - "Slash", - "Sleep", - "Stop", - "NumpadSubtract", - "Sysrq", - "Tab", - "Underline", - "Unlabeled", - "VolumeDown", - "VolumeUp", - "Wake", - "WebBack", - "WebFavorites", - "WebForward", - "WebHome", - "WebRefresh", - "WebSearch", - "WebStop", - "Yen", - "Copy", - "Paste", - "Cut" + { + "items": false, + "prefixItems": [ + { + "type": { + "$ref": "#/$defs/bevy_input::keyboard::NativeKeyCode" + } + } + ], + "short_name": "Unidentified", + "title": "Unidentified", + "type": "array", + "typeInfo": "Tuple" + }, + { + "title": "Backquote" + }, + { + "title": "Backslash" + }, + { + "title": "BracketLeft" + }, + { + "title": "BracketRight" + }, + { + "title": "Comma" + }, + { + "title": "Digit0" + }, + { + "title": "Digit1" + }, + { + "title": "Digit2" + }, + { + "title": "Digit3" + }, + { + "title": "Digit4" + }, + { + "title": "Digit5" + }, + { + "title": "Digit6" + }, + { + "title": "Digit7" + }, + { + "title": "Digit8" + }, + { + "title": "Digit9" + }, + { + "title": "Equal" + }, + { + "title": "IntlBackslash" + }, + { + "title": "IntlRo" + }, + { + "title": "IntlYen" + }, + { + "title": "KeyA" + }, + { + "title": "KeyB" + }, + { + "title": "KeyC" + }, + { + "title": "KeyD" + }, + { + "title": "KeyE" + }, + { + "title": "KeyF" + }, + { + "title": "KeyG" + }, + { + "title": "KeyH" + }, + { + "title": "KeyI" + }, + { + "title": "KeyJ" + }, + { + "title": "KeyK" + }, + { + "title": "KeyL" + }, + { + "title": "KeyM" + }, + { + "title": "KeyN" + }, + { + "title": "KeyO" + }, + { + "title": "KeyP" + }, + { + "title": "KeyQ" + }, + { + "title": "KeyR" + }, + { + "title": "KeyS" + }, + { + "title": "KeyT" + }, + { + "title": "KeyU" + }, + { + "title": "KeyV" + }, + { + "title": "KeyW" + }, + { + "title": "KeyX" + }, + { + "title": "KeyY" + }, + { + "title": "KeyZ" + }, + { + "title": "Minus" + }, + { + "title": "Period" + }, + { + "title": "Quote" + }, + { + "title": "Semicolon" + }, + { + "title": "Slash" + }, + { + "title": "AltLeft" + }, + { + "title": "AltRight" + }, + { + "title": "Backspace" + }, + { + "title": "CapsLock" + }, + { + "title": "ContextMenu" + }, + { + "title": "ControlLeft" + }, + { + "title": "ControlRight" + }, + { + "title": "Enter" + }, + { + "title": "SuperLeft" + }, + { + "title": "SuperRight" + }, + { + "title": "ShiftLeft" + }, + { + "title": "ShiftRight" + }, + { + "title": "Space" + }, + { + "title": "Tab" + }, + { + "title": "Convert" + }, + { + "title": "KanaMode" + }, + { + "title": "Lang1" + }, + { + "title": "Lang2" + }, + { + "title": "Lang3" + }, + { + "title": "Lang4" + }, + { + "title": "Lang5" + }, + { + "title": "NonConvert" + }, + { + "title": "Delete" + }, + { + "title": "End" + }, + { + "title": "Help" + }, + { + "title": "Home" + }, + { + "title": "Insert" + }, + { + "title": "PageDown" + }, + { + "title": "PageUp" + }, + { + "title": "ArrowDown" + }, + { + "title": "ArrowLeft" + }, + { + "title": "ArrowRight" + }, + { + "title": "ArrowUp" + }, + { + "title": "NumLock" + }, + { + "title": "Numpad0" + }, + { + "title": "Numpad1" + }, + { + "title": "Numpad2" + }, + { + "title": "Numpad3" + }, + { + "title": "Numpad4" + }, + { + "title": "Numpad5" + }, + { + "title": "Numpad6" + }, + { + "title": "Numpad7" + }, + { + "title": "Numpad8" + }, + { + "title": "Numpad9" + }, + { + "title": "NumpadAdd" + }, + { + "title": "NumpadBackspace" + }, + { + "title": "NumpadClear" + }, + { + "title": "NumpadClearEntry" + }, + { + "title": "NumpadComma" + }, + { + "title": "NumpadDecimal" + }, + { + "title": "NumpadDivide" + }, + { + "title": "NumpadEnter" + }, + { + "title": "NumpadEqual" + }, + { + "title": "NumpadHash" + }, + { + "title": "NumpadMemoryAdd" + }, + { + "title": "NumpadMemoryClear" + }, + { + "title": "NumpadMemoryRecall" + }, + { + "title": "NumpadMemoryStore" + }, + { + "title": "NumpadMemorySubtract" + }, + { + "title": "NumpadMultiply" + }, + { + "title": "NumpadParenLeft" + }, + { + "title": "NumpadParenRight" + }, + { + "title": "NumpadStar" + }, + { + "title": "NumpadSubtract" + }, + { + "title": "Escape" + }, + { + "title": "Fn" + }, + { + "title": "FnLock" + }, + { + "title": "PrintScreen" + }, + { + "title": "ScrollLock" + }, + { + "title": "Pause" + }, + { + "title": "BrowserBack" + }, + { + "title": "BrowserFavorites" + }, + { + "title": "BrowserForward" + }, + { + "title": "BrowserHome" + }, + { + "title": "BrowserRefresh" + }, + { + "title": "BrowserSearch" + }, + { + "title": "BrowserStop" + }, + { + "title": "Eject" + }, + { + "title": "LaunchApp1" + }, + { + "title": "LaunchApp2" + }, + { + "title": "LaunchMail" + }, + { + "title": "MediaPlayPause" + }, + { + "title": "MediaSelect" + }, + { + "title": "MediaStop" + }, + { + "title": "MediaTrackNext" + }, + { + "title": "MediaTrackPrevious" + }, + { + "title": "Power" + }, + { + "title": "Sleep" + }, + { + "title": "AudioVolumeDown" + }, + { + "title": "AudioVolumeMute" + }, + { + "title": "AudioVolumeUp" + }, + { + "title": "WakeUp" + }, + { + "title": "Meta" + }, + { + "title": "Hyper" + }, + { + "title": "Turbo" + }, + { + "title": "Abort" + }, + { + "title": "Resume" + }, + { + "title": "Suspend" + }, + { + "title": "Again" + }, + { + "title": "Copy" + }, + { + "title": "Cut" + }, + { + "title": "Find" + }, + { + "title": "Open" + }, + { + "title": "Paste" + }, + { + "title": "Props" + }, + { + "title": "Select" + }, + { + "title": "Undo" + }, + { + "title": "Hiragana" + }, + { + "title": "Katakana" + }, + { + "title": "F1" + }, + { + "title": "F2" + }, + { + "title": "F3" + }, + { + "title": "F4" + }, + { + "title": "F5" + }, + { + "title": "F6" + }, + { + "title": "F7" + }, + { + "title": "F8" + }, + { + "title": "F9" + }, + { + "title": "F10" + }, + { + "title": "F11" + }, + { + "title": "F12" + }, + { + "title": "F13" + }, + { + "title": "F14" + }, + { + "title": "F15" + }, + { + "title": "F16" + }, + { + "title": "F17" + }, + { + "title": "F18" + }, + { + "title": "F19" + }, + { + "title": "F20" + }, + { + "title": "F21" + }, + { + "title": "F22" + }, + { + "title": "F23" + }, + { + "title": "F24" + }, + { + "title": "F25" + }, + { + "title": "F26" + }, + { + "title": "F27" + }, + { + "title": "F28" + }, + { + "title": "F29" + }, + { + "title": "F30" + }, + { + "title": "F31" + }, + { + "title": "F32" + }, + { + "title": "F33" + }, + { + "title": "F34" + }, + { + "title": "F35" + } ], "short_name": "KeyCode", "title": "bevy_input::keyboard::KeyCode", - "type": "string", + "type": "object", "typeInfo": "Enum" }, "bevy_input::keyboard::KeyboardInput": { @@ -3834,12 +5556,12 @@ "properties": { "key_code": { "type": { - "$ref": "#/$defs/core::option::Option" + "$ref": "#/$defs/bevy_input::keyboard::KeyCode" } }, - "scan_code": { + "logical_key": { "type": { - "$ref": "#/$defs/u32" + "$ref": "#/$defs/bevy_input::keyboard::Key" } }, "state": { @@ -3849,12 +5571,13 @@ }, "window": { "type": { - "$ref": "#/$defs/bevy_ecs::Entity" + "$ref": "#/$defs/bevy_ecs::entity::Entity" } } }, "required": [ - "scan_code", + "key_code", + "logical_key", "state", "window" ], @@ -3863,21 +5586,157 @@ "type": "object", "typeInfo": "Struct" }, - "bevy_input::keyboard::ScanCode": { + "bevy_input::keyboard::NativeKey": { "isComponent": false, "isResource": false, - "items": false, - "prefixItems": [ + "oneOf": [ { - "type": { - "$ref": "#/$defs/u32" - } + "title": "Unidentified" + }, + { + "items": false, + "prefixItems": [ + { + "type": { + "$ref": "#/$defs/u32" + } + } + ], + "short_name": "Android", + "title": "Android", + "type": "array", + "typeInfo": "Tuple" + }, + { + "items": false, + "prefixItems": [ + { + "type": { + "$ref": "#/$defs/u16" + } + } + ], + "short_name": "MacOS", + "title": "MacOS", + "type": "array", + "typeInfo": "Tuple" + }, + { + "items": false, + "prefixItems": [ + { + "type": { + "$ref": "#/$defs/u16" + } + } + ], + "short_name": "Windows", + "title": "Windows", + "type": "array", + "typeInfo": "Tuple" + }, + { + "items": false, + "prefixItems": [ + { + "type": { + "$ref": "#/$defs/u32" + } + } + ], + "short_name": "Xkb", + "title": "Xkb", + "type": "array", + "typeInfo": "Tuple" + }, + { + "items": false, + "prefixItems": [ + { + "type": { + "$ref": "#/$defs/smol_str::SmolStr" + } + } + ], + "short_name": "Web", + "title": "Web", + "type": "array", + "typeInfo": "Tuple" } ], - "short_name": "ScanCode", - "title": "bevy_input::keyboard::ScanCode", - "type": "array", - "typeInfo": "TupleStruct" + "short_name": "NativeKey", + "title": "bevy_input::keyboard::NativeKey", + "type": "object", + "typeInfo": "Enum" + }, + "bevy_input::keyboard::NativeKeyCode": { + "isComponent": false, + "isResource": false, + "oneOf": [ + { + "title": "Unidentified" + }, + { + "items": false, + "prefixItems": [ + { + "type": { + "$ref": "#/$defs/u32" + } + } + ], + "short_name": "Android", + "title": "Android", + "type": "array", + "typeInfo": "Tuple" + }, + { + "items": false, + "prefixItems": [ + { + "type": { + "$ref": "#/$defs/u16" + } + } + ], + "short_name": "MacOS", + "title": "MacOS", + "type": "array", + "typeInfo": "Tuple" + }, + { + "items": false, + "prefixItems": [ + { + "type": { + "$ref": "#/$defs/u16" + } + } + ], + "short_name": "Windows", + "title": "Windows", + "type": "array", + "typeInfo": "Tuple" + }, + { + "items": false, + "prefixItems": [ + { + "type": { + "$ref": "#/$defs/u32" + } + } + ], + "short_name": "Xkb", + "title": "Xkb", + "type": "array", + "typeInfo": "Tuple" + } + ], + "short_name": "NativeKeyCode", + "title": "bevy_input::keyboard::NativeKeyCode", + "type": "object", + "typeInfo": "Enum" }, "bevy_input::mouse::MouseButton": { "isComponent": false, @@ -3892,6 +5751,12 @@ { "title": "Middle" }, + { + "title": "Back" + }, + { + "title": "Forward" + }, { "items": false, "prefixItems": [ @@ -3929,7 +5794,7 @@ }, "window": { "type": { - "$ref": "#/$defs/bevy_ecs::Entity" + "$ref": "#/$defs/bevy_ecs::entity::Entity" } } }, @@ -3986,7 +5851,7 @@ }, "window": { "type": { - "$ref": "#/$defs/bevy_ecs::Entity" + "$ref": "#/$defs/bevy_ecs::entity::Entity" } }, "x": { @@ -4090,11 +5955,17 @@ "type": { "$ref": "#/$defs/glam::Vec2" } + }, + "window": { + "type": { + "$ref": "#/$defs/bevy_ecs::entity::Entity" + } } }, "required": [ "phase", "position", + "window", "id" ], "short_name": "TouchInput", @@ -4234,30 +6105,101 @@ "type": "object", "typeInfo": "Struct" }, - "bevy_pbr::environment_map::EnvironmentMapLight": { - "additionalProperties": false, + "bevy_pbr::fog::FogFalloff": { "isComponent": false, "isResource": false, - "properties": { - "diffuse_map": { - "type": { - "$ref": "#/$defs/bevy_asset::handle::Handle" - } + "oneOf": [ + { + "additionalProperties": false, + "properties": { + "end": { + "title": "end", + "type": { + "$ref": "#/$defs/f32" + } + }, + "start": { + "title": "start", + "type": { + "$ref": "#/$defs/f32" + } + } + }, + "required": [ + "start", + "end" + ], + "short_name": "Linear", + "title": "Linear", + "type": "object", + "typeInfo": "Struct" }, - "specular_map": { - "type": { - "$ref": "#/$defs/bevy_asset::handle::Handle" - } + { + "additionalProperties": false, + "properties": { + "density": { + "title": "density", + "type": { + "$ref": "#/$defs/f32" + } + } + }, + "required": [ + "density" + ], + "short_name": "Exponential", + "title": "Exponential", + "type": "object", + "typeInfo": "Struct" + }, + { + "additionalProperties": false, + "properties": { + "density": { + "title": "density", + "type": { + "$ref": "#/$defs/f32" + } + } + }, + "required": [ + "density" + ], + "short_name": "ExponentialSquared", + "title": "ExponentialSquared", + "type": "object", + "typeInfo": "Struct" + }, + { + "additionalProperties": false, + "properties": { + "extinction": { + "title": "extinction", + "type": { + "$ref": "#/$defs/glam::Vec3" + } + }, + "inscattering": { + "title": "inscattering", + "type": { + "$ref": "#/$defs/glam::Vec3" + } + } + }, + "required": [ + "extinction", + "inscattering" + ], + "short_name": "Atmospheric", + "title": "Atmospheric", + "type": "object", + "typeInfo": "Struct" } - }, - "required": [ - "diffuse_map", - "specular_map" ], - "short_name": "EnvironmentMapLight", - "title": "bevy_pbr::environment_map::EnvironmentMapLight", + "short_name": "FogFalloff", + "title": "bevy_pbr::fog::FogFalloff", "type": "object", - "typeInfo": "Struct" + "typeInfo": "Enum" }, "bevy_pbr::fog::FogSettings": { "additionalProperties": false, @@ -4396,7 +6338,7 @@ "properties": { "cascades": { "type": { - "$ref": "#/$defs/bevy_utils::hashbrown::HashMap, bevy_utils::hashbrown::hash_map::DefaultHashBuilder>" + "$ref": "#/$defs/bevy_utils::hashbrown::HashMap, bevy_ecs::entity::hash::EntityHash>" } } }, @@ -4785,6 +6727,73 @@ "type": "object", "typeInfo": "Struct" }, + "bevy_pbr::light_probe::LightProbe": { + "additionalProperties": false, + "isComponent": true, + "isResource": false, + "properties": {}, + "required": [], + "short_name": "LightProbe", + "title": "bevy_pbr::light_probe::LightProbe", + "type": "object", + "typeInfo": "Struct" + }, + "bevy_pbr::light_probe::environment_map::EnvironmentMapLight": { + "additionalProperties": false, + "isComponent": false, + "isResource": false, + "properties": { + "diffuse_map": { + "type": { + "$ref": "#/$defs/bevy_asset::handle::Handle" + } + }, + "intensity": { + "type": { + "$ref": "#/$defs/f32" + } + }, + "specular_map": { + "type": { + "$ref": "#/$defs/bevy_asset::handle::Handle" + } + } + }, + "required": [ + "diffuse_map", + "specular_map", + "intensity" + ], + "short_name": "EnvironmentMapLight", + "title": "bevy_pbr::light_probe::environment_map::EnvironmentMapLight", + "type": "object", + "typeInfo": "Struct" + }, + "bevy_pbr::light_probe::irradiance_volume::IrradianceVolume": { + "additionalProperties": false, + "isComponent": false, + "isResource": false, + "properties": { + "intensity": { + "type": { + "$ref": "#/$defs/f32" + } + }, + "voxels": { + "type": { + "$ref": "#/$defs/bevy_asset::handle::Handle" + } + } + }, + "required": [ + "voxels", + "intensity" + ], + "short_name": "IrradianceVolume", + "title": "bevy_pbr::light_probe::irradiance_volume::IrradianceVolume", + "type": "object", + "typeInfo": "Struct" + }, "bevy_pbr::material::DefaultOpaqueRendererMethod": { "isComponent": false, "isResource": false, @@ -4801,6 +6810,50 @@ "type": "array", "typeInfo": "TupleStruct" }, + "bevy_pbr::material::OpaqueRendererMethod": { + "isComponent": false, + "isResource": false, + "oneOf": [ + "Forward", + "Deferred", + "Auto" + ], + "short_name": "OpaqueRendererMethod", + "title": "bevy_pbr::material::OpaqueRendererMethod", + "type": "string", + "typeInfo": "Enum" + }, + "bevy_pbr::parallax::ParallaxMappingMethod": { + "isComponent": false, + "isResource": false, + "oneOf": [ + { + "title": "Occlusion" + }, + { + "additionalProperties": false, + "properties": { + "max_steps": { + "title": "max_steps", + "type": { + "$ref": "#/$defs/u32" + } + } + }, + "required": [ + "max_steps" + ], + "short_name": "Relief", + "title": "Relief", + "type": "object", + "typeInfo": "Struct" + } + ], + "short_name": "ParallaxMappingMethod", + "title": "bevy_pbr::parallax::ParallaxMappingMethod", + "type": "object", + "typeInfo": "Enum" + }, "bevy_pbr::pbr_material::StandardMaterial": { "additionalProperties": false, "isComponent": false, @@ -4881,6 +6934,11 @@ "$ref": "#/$defs/f32" } }, + "lightmap_exposure": { + "type": { + "$ref": "#/$defs/f32" + } + }, "max_parallax_layer_count": { "type": { "$ref": "#/$defs/f32" @@ -4968,6 +7026,7 @@ "parallax_depth_scale", "parallax_mapping_method", "max_parallax_layer_count", + "lightmap_exposure", "opaque_render_method", "deferred_lighting_pass_id" ], @@ -4995,53 +7054,6 @@ "type": "object", "typeInfo": "Struct" }, - "bevy_pbr::wireframe::NoWireframe": { - "additionalProperties": false, - "isComponent": true, - "isResource": false, - "properties": {}, - "required": [], - "short_name": "NoWireframe", - "title": "bevy_pbr::wireframe::NoWireframe", - "type": "object", - "typeInfo": "Struct" - }, - "bevy_pbr::wireframe::Wireframe": { - "additionalProperties": false, - "isComponent": true, - "isResource": false, - "properties": {}, - "required": [], - "short_name": "Wireframe", - "title": "bevy_pbr::wireframe::Wireframe", - "type": "object", - "typeInfo": "Struct" - }, - "bevy_pbr::wireframe::WireframeConfig": { - "additionalProperties": false, - "isComponent": false, - "isResource": true, - "properties": { - "default_color": { - "type": { - "$ref": "#/$defs/bevy_render::color::Color" - } - }, - "global": { - "type": { - "$ref": "#/$defs/bool" - } - } - }, - "required": [ - "global", - "default_color" - ], - "short_name": "WireframeConfig", - "title": "bevy_pbr::wireframe::WireframeConfig", - "type": "object", - "typeInfo": "Struct" - }, "bevy_rapier3d::dynamics::rigid_body::AdditionalMassProperties": { "isComponent": true, "isResource": false, @@ -5339,7 +7351,7 @@ "prefixItems": [ { "type": { - "$ref": "#/$defs/bevy_utils::HashSet" + "$ref": "#/$defs/bevy_utils::HashSet" } } ], @@ -5515,6 +7527,11 @@ "isComponent": true, "isResource": false, "properties": { + "clear_color": { + "type": { + "$ref": "#/$defs/bevy_render::camera::clear_color::ClearColorConfig" + } + }, "hdr": { "type": { "$ref": "#/$defs/bool" @@ -5545,28 +7562,37 @@ "order", "is_active", "hdr", - "msaa_writeback" + "msaa_writeback", + "clear_color" ], "short_name": "Camera", "title": "bevy_render::camera::camera::Camera", "type": "object", "typeInfo": "Struct" }, + "bevy_render::camera::camera::CameraMainTextureUsages": { + "isComponent": true, + "isResource": false, + "short_name": "CameraMainTextureUsages", + "title": "bevy_render::camera::camera::CameraMainTextureUsages", + "type": "object", + "typeInfo": "Value" + }, "bevy_render::camera::camera::CameraRenderGraph": { "isComponent": true, "isResource": false, - "items": false, - "prefixItems": [ - { - "type": { - "$ref": "#/$defs/alloc::borrow::Cow" - } - } - ], "short_name": "CameraRenderGraph", "title": "bevy_render::camera::camera::CameraRenderGraph", - "type": "array", - "typeInfo": "TupleStruct" + "type": "object", + "typeInfo": "Value" + }, + "bevy_render::camera::camera::Exposure": { + "isComponent": true, + "isResource": false, + "short_name": "Exposure", + "title": "bevy_render::camera::camera::Exposure", + "type": "object", + "typeInfo": "Value" }, "bevy_render::camera::camera::RenderTarget": { "isComponent": false, @@ -5651,6 +7677,52 @@ "type": "object", "typeInfo": "Struct" }, + "bevy_render::camera::clear_color::ClearColor": { + "isComponent": false, + "isResource": true, + "items": false, + "prefixItems": [ + { + "type": { + "$ref": "#/$defs/bevy_render::color::Color" + } + } + ], + "short_name": "ClearColor", + "title": "bevy_render::camera::clear_color::ClearColor", + "type": "array", + "typeInfo": "TupleStruct" + }, + "bevy_render::camera::clear_color::ClearColorConfig": { + "isComponent": false, + "isResource": false, + "oneOf": [ + { + "title": "Default" + }, + { + "items": false, + "prefixItems": [ + { + "type": { + "$ref": "#/$defs/bevy_render::color::Color" + } + } + ], + "short_name": "Custom", + "title": "Custom", + "type": "array", + "typeInfo": "Tuple" + }, + { + "title": "None" + } + ], + "short_name": "ClearColorConfig", + "title": "bevy_render::camera::clear_color::ClearColorConfig", + "type": "object", + "typeInfo": "Enum" + }, "bevy_render::camera::projection::OrthographicProjection": { "additionalProperties": false, "isComponent": true, @@ -6142,6 +8214,11 @@ "isComponent": false, "isResource": false, "properties": { + "asset_usage": { + "type": { + "$ref": "#/$defs/bevy_render::render_asset::RenderAssetUsages" + } + }, "indices": { "type": { "$ref": "#/$defs/core::option::Option" @@ -6158,7 +8235,9 @@ } } }, - "required": [], + "required": [ + "asset_usage" + ], "short_name": "Mesh", "title": "bevy_render::mesh::mesh::Mesh", "type": "object", @@ -6176,7 +8255,7 @@ }, "joints": { "type": { - "$ref": "#/$defs/alloc::vec::Vec" + "$ref": "#/$defs/alloc::vec::Vec" } } }, @@ -6523,6 +8602,62 @@ "type": "object", "typeInfo": "Enum" }, + "bevy_sprite::sprite::ImageScaleMode": { + "isComponent": true, + "isResource": false, + "oneOf": [ + { + "items": false, + "prefixItems": [ + { + "type": { + "$ref": "#/$defs/bevy_sprite::texture_slice::slicer::TextureSlicer" + } + } + ], + "short_name": "Sliced", + "title": "Sliced", + "type": "array", + "typeInfo": "Tuple" + }, + { + "additionalProperties": false, + "properties": { + "stretch_value": { + "title": "stretch_value", + "type": { + "$ref": "#/$defs/f32" + } + }, + "tile_x": { + "title": "tile_x", + "type": { + "$ref": "#/$defs/bool" + } + }, + "tile_y": { + "title": "tile_y", + "type": { + "$ref": "#/$defs/bool" + } + } + }, + "required": [ + "tile_x", + "tile_y", + "stretch_value" + ], + "short_name": "Tiled", + "title": "Tiled", + "type": "object", + "typeInfo": "Struct" + } + ], + "short_name": "ImageScaleMode", + "title": "bevy_sprite::sprite::ImageScaleMode", + "type": "object", + "typeInfo": "Enum" + }, "bevy_sprite::sprite::Sprite": { "additionalProperties": false, "isComponent": true, @@ -6571,6 +8706,31 @@ "typeInfo": "Struct" }, "bevy_sprite::texture_atlas::TextureAtlas": { + "additionalProperties": false, + "isComponent": false, + "isResource": false, + "properties": { + "index": { + "type": { + "$ref": "#/$defs/usize" + } + }, + "layout": { + "type": { + "$ref": "#/$defs/bevy_asset::handle::Handle" + } + } + }, + "required": [ + "layout", + "index" + ], + "short_name": "TextureAtlas", + "title": "bevy_sprite::texture_atlas::TextureAtlas", + "type": "object", + "typeInfo": "Struct" + }, + "bevy_sprite::texture_atlas::TextureAtlasLayout": { "additionalProperties": false, "isComponent": false, "isResource": false, @@ -6580,11 +8740,6 @@ "$ref": "#/$defs/glam::Vec2" } }, - "texture": { - "type": { - "$ref": "#/$defs/bevy_asset::handle::Handle" - } - }, "texture_handles": { "type": { "$ref": "#/$defs/core::option::Option, usize, bevy_utils::hashbrown::hash_map::DefaultHashBuilder>>" @@ -6597,60 +8752,48 @@ } }, "required": [ - "texture", "size", "textures" ], - "short_name": "TextureAtlas", - "title": "bevy_sprite::texture_atlas::TextureAtlas", + "short_name": "TextureAtlasLayout", + "title": "bevy_sprite::texture_atlas::TextureAtlasLayout", "type": "object", "typeInfo": "Struct" }, - "bevy_sprite::texture_atlas::TextureAtlasSprite": { + "bevy_sprite::texture_slice::slicer::TextureSlicer": { "additionalProperties": false, - "isComponent": true, + "isComponent": false, "isResource": false, "properties": { - "anchor": { + "border": { "type": { - "$ref": "#/$defs/bevy_sprite::sprite::Anchor" + "$ref": "#/$defs/bevy_sprite::texture_slice::border_rect::BorderRect" } }, - "color": { + "center_scale_mode": { "type": { - "$ref": "#/$defs/bevy_render::color::Color" + "$ref": "#/$defs/bevy_sprite::texture_slice::slicer::SliceScaleMode" } }, - "custom_size": { + "max_corner_scale": { "type": { - "$ref": "#/$defs/core::option::Option" + "$ref": "#/$defs/f32" } }, - "flip_x": { + "sides_scale_mode": { "type": { - "$ref": "#/$defs/bool" - } - }, - "flip_y": { - "type": { - "$ref": "#/$defs/bool" - } - }, - "index": { - "type": { - "$ref": "#/$defs/usize" + "$ref": "#/$defs/bevy_sprite::texture_slice::slicer::SliceScaleMode" } } }, "required": [ - "color", - "index", - "flip_x", - "flip_y", - "anchor" + "border", + "center_scale_mode", + "sides_scale_mode", + "max_corner_scale" ], - "short_name": "TextureAtlasSprite", - "title": "bevy_sprite::texture_atlas::TextureAtlasSprite", + "short_name": "TextureSlicer", + "title": "bevy_sprite::texture_slice::slicer::TextureSlicer", "type": "object", "typeInfo": "Struct" }, @@ -6711,14 +8854,27 @@ "type": "string", "typeInfo": "Enum" }, + "bevy_text::text::JustifyText": { + "isComponent": false, + "isResource": false, + "oneOf": [ + "Left", + "Center", + "Right" + ], + "short_name": "JustifyText", + "title": "bevy_text::text::JustifyText", + "type": "string", + "typeInfo": "Enum" + }, "bevy_text::text::Text": { "additionalProperties": false, "isComponent": true, "isResource": false, "properties": { - "alignment": { + "justify": { "type": { - "$ref": "#/$defs/bevy_text::text::TextAlignment" + "$ref": "#/$defs/bevy_text::text::JustifyText" } }, "linebreak_behavior": { @@ -6734,7 +8890,7 @@ }, "required": [ "sections", - "alignment", + "justify", "linebreak_behavior" ], "short_name": "Text", @@ -6742,19 +8898,6 @@ "type": "object", "typeInfo": "Struct" }, - "bevy_text::text::TextAlignment": { - "isComponent": false, - "isResource": false, - "oneOf": [ - "Left", - "Center", - "Right" - ], - "short_name": "TextAlignment", - "title": "bevy_text::text::TextAlignment", - "type": "string", - "typeInfo": "Enum" - }, "bevy_text::text::TextSection": { "additionalProperties": false, "isComponent": false, @@ -7249,7 +9392,7 @@ "prefixItems": [ { "type": { - "$ref": "#/$defs/f64" + "$ref": "#/$defs/f32" } } ], @@ -7258,25 +9401,6 @@ "type": "array", "typeInfo": "TupleStruct" }, - "bevy_ui::camera_config::UiCameraConfig": { - "additionalProperties": false, - "isComponent": true, - "isResource": false, - "properties": { - "show_ui": { - "type": { - "$ref": "#/$defs/bool" - } - } - }, - "required": [ - "show_ui" - ], - "short_name": "UiCameraConfig", - "title": "bevy_ui::camera_config::UiCameraConfig", - "type": "object", - "typeInfo": "Struct" - }, "bevy_ui::focus::FocusPolicy": { "isComponent": true, "isResource": false, @@ -7884,7 +10008,7 @@ }, "tracks": { "type": { - "$ref": "#/$defs/smallvec::SmallVec<[bevy_ui::ui_node::GridTrack; 1]>" + "$ref": "#/$defs/bevy_utils::smallvec::SmallVec<[bevy_ui::ui_node::GridTrack; 1]>" } } }, @@ -8137,6 +10261,22 @@ "type": "object", "typeInfo": "Struct" }, + "bevy_ui::ui_node::TargetCamera": { + "isComponent": false, + "isResource": false, + "items": false, + "prefixItems": [ + { + "type": { + "$ref": "#/$defs/bevy_ecs::entity::Entity" + } + } + ], + "short_name": "TargetCamera", + "title": "bevy_ui::ui_node::TargetCamera", + "type": "array", + "typeInfo": "TupleStruct" + }, "bevy_ui::ui_node::UiImage": { "additionalProperties": false, "isComponent": true, @@ -8168,37 +10308,6 @@ "type": "object", "typeInfo": "Struct" }, - "bevy_ui::ui_node::UiTextureAtlasImage": { - "additionalProperties": false, - "isComponent": true, - "isResource": false, - "properties": { - "flip_x": { - "type": { - "$ref": "#/$defs/bool" - } - }, - "flip_y": { - "type": { - "$ref": "#/$defs/bool" - } - }, - "index": { - "type": { - "$ref": "#/$defs/usize" - } - } - }, - "required": [ - "index", - "flip_x", - "flip_y" - ], - "short_name": "UiTextureAtlasImage", - "title": "bevy_ui::ui_node::UiTextureAtlasImage", - "type": "object", - "typeInfo": "Struct" - }, "bevy_ui::ui_node::ZIndex": { "isComponent": true, "isResource": false, @@ -8335,31 +10444,40 @@ "type": "object", "typeInfo": "Value" }, + "bevy_utils::smallvec::SmallVec<[bevy_ecs::entity::Entity; 8]>": { + "isComponent": false, + "isResource": false, + "items": { + "type": { + "$ref": "#/$defs/bevy_ecs::entity::Entity" + } + }, + "short_name": "SmallVec<[Entity; 8]>", + "title": "bevy_utils::smallvec::SmallVec<[bevy_ecs::entity::Entity; 8]>", + "type": "array", + "typeInfo": "List" + }, "bevy_window::cursor::CursorIcon": { "isComponent": false, "isResource": false, "oneOf": [ "Default", - "Crosshair", - "Hand", - "Arrow", - "Move", - "Text", - "Wait", - "Help", - "Progress", - "NotAllowed", "ContextMenu", + "Help", + "Pointer", + "Progress", + "Wait", "Cell", + "Crosshair", + "Text", "VerticalText", "Alias", "Copy", + "Move", "NoDrop", + "NotAllowed", "Grab", "Grabbing", - "AllScroll", - "ZoomIn", - "ZoomOut", "EResize", "NResize", "NeResize", @@ -8373,7 +10491,10 @@ "NeswResize", "NwseResize", "ColResize", - "RowResize" + "RowResize", + "AllScroll", + "ZoomIn", + "ZoomOut" ], "short_name": "CursorIcon", "title": "bevy_window::cursor::CursorIcon", @@ -8400,7 +10521,7 @@ "properties": { "window": { "type": { - "$ref": "#/$defs/bevy_ecs::Entity" + "$ref": "#/$defs/bevy_ecs::entity::Entity" } } }, @@ -8419,7 +10540,7 @@ "properties": { "window": { "type": { - "$ref": "#/$defs/bevy_ecs::Entity" + "$ref": "#/$defs/bevy_ecs::entity::Entity" } } }, @@ -8436,6 +10557,11 @@ "isComponent": false, "isResource": false, "properties": { + "delta": { + "type": { + "$ref": "#/$defs/core::option::Option" + } + }, "position": { "type": { "$ref": "#/$defs/glam::Vec2" @@ -8443,7 +10569,7 @@ }, "window": { "type": { - "$ref": "#/$defs/bevy_ecs::Entity" + "$ref": "#/$defs/bevy_ecs::entity::Entity" } } }, @@ -8472,7 +10598,7 @@ "window": { "title": "window", "type": { - "$ref": "#/$defs/bevy_ecs::Entity" + "$ref": "#/$defs/bevy_ecs::entity::Entity" } } }, @@ -8497,7 +10623,7 @@ "window": { "title": "window", "type": { - "$ref": "#/$defs/bevy_ecs::Entity" + "$ref": "#/$defs/bevy_ecs::entity::Entity" } } }, @@ -8516,7 +10642,7 @@ "window": { "title": "window", "type": { - "$ref": "#/$defs/bevy_ecs::Entity" + "$ref": "#/$defs/bevy_ecs::entity::Entity" } } }, @@ -8541,12 +10667,12 @@ "properties": { "char": { "type": { - "$ref": "#/$defs/char" + "$ref": "#/$defs/smol_str::SmolStr" } }, "window": { "type": { - "$ref": "#/$defs/bevy_ecs::Entity" + "$ref": "#/$defs/bevy_ecs::entity::Entity" } } }, @@ -8582,7 +10708,7 @@ }, "window": { "type": { - "$ref": "#/$defs/bevy_ecs::Entity" + "$ref": "#/$defs/bevy_ecs::entity::Entity" } } }, @@ -8602,7 +10728,7 @@ "properties": { "window": { "type": { - "$ref": "#/$defs/bevy_ecs::Entity" + "$ref": "#/$defs/bevy_ecs::entity::Entity" } } }, @@ -8621,7 +10747,7 @@ "properties": { "window": { "type": { - "$ref": "#/$defs/bevy_ecs::Entity" + "$ref": "#/$defs/bevy_ecs::entity::Entity" } } }, @@ -8640,7 +10766,7 @@ "properties": { "window": { "type": { - "$ref": "#/$defs/bevy_ecs::Entity" + "$ref": "#/$defs/bevy_ecs::entity::Entity" } } }, @@ -8664,7 +10790,7 @@ }, "window": { "type": { - "$ref": "#/$defs/bevy_ecs::Entity" + "$ref": "#/$defs/bevy_ecs::entity::Entity" } } }, @@ -8682,19 +10808,19 @@ "isComponent": false, "isResource": false, "properties": { - "entity": { - "type": { - "$ref": "#/$defs/bevy_ecs::Entity" - } - }, "position": { "type": { "$ref": "#/$defs/glam::IVec2" } + }, + "window": { + "type": { + "$ref": "#/$defs/bevy_ecs::entity::Entity" + } } }, "required": [ - "entity", + "window", "position" ], "short_name": "WindowMoved", @@ -8702,6 +10828,31 @@ "type": "object", "typeInfo": "Struct" }, + "bevy_window::event::WindowOccluded": { + "additionalProperties": false, + "isComponent": false, + "isResource": false, + "properties": { + "occluded": { + "type": { + "$ref": "#/$defs/bool" + } + }, + "window": { + "type": { + "$ref": "#/$defs/bevy_ecs::entity::Entity" + } + } + }, + "required": [ + "window", + "occluded" + ], + "short_name": "WindowOccluded", + "title": "bevy_window::event::WindowOccluded", + "type": "object", + "typeInfo": "Struct" + }, "bevy_window::event::WindowResized": { "additionalProperties": false, "isComponent": false, @@ -8719,7 +10870,7 @@ }, "window": { "type": { - "$ref": "#/$defs/bevy_ecs::Entity" + "$ref": "#/$defs/bevy_ecs::entity::Entity" } } }, @@ -8745,7 +10896,7 @@ }, "window": { "type": { - "$ref": "#/$defs/bevy_ecs::Entity" + "$ref": "#/$defs/bevy_ecs::entity::Entity" } } }, @@ -8770,7 +10921,7 @@ }, "window": { "type": { - "$ref": "#/$defs/bevy_ecs::Entity" + "$ref": "#/$defs/bevy_ecs::entity::Entity" } } }, @@ -8993,11 +11144,6 @@ "$ref": "#/$defs/bevy_window::window::EnabledButtons" } }, - "fit_canvas_to_parent": { - "type": { - "$ref": "#/$defs/bool" - } - }, "focused": { "type": { "$ref": "#/$defs/bool" @@ -9023,6 +11169,11 @@ "$ref": "#/$defs/bevy_window::window::WindowMode" } }, + "name": { + "type": { + "$ref": "#/$defs/core::option::Option" + } + }, "position": { "type": { "$ref": "#/$defs/bevy_window::window::WindowPosition" @@ -9094,7 +11245,6 @@ "transparent", "focused", "window_level", - "fit_canvas_to_parent", "prevent_default_event_handling", "internal", "ime_enabled", @@ -9228,12 +11378,12 @@ }, "scale_factor": { "type": { - "$ref": "#/$defs/f64" + "$ref": "#/$defs/f32" } }, "scale_factor_override": { "type": { - "$ref": "#/$defs/core::option::Option" + "$ref": "#/$defs/core::option::Option" } } }, @@ -10493,19 +12643,6 @@ "type": "int", "typeInfo": "Value" }, - "smallvec::SmallVec<[bevy_ecs::Entity; 8]>": { - "isComponent": false, - "isResource": false, - "items": { - "type": { - "$ref": "#/$defs/bevy_ecs::Entity" - } - }, - "short_name": "SmallVec<[Entity; 8]>", - "title": "smallvec::SmallVec<[bevy_ecs::Entity; 8]>", - "type": "array", - "typeInfo": "List" - }, "std::ffi::OsString": { "isComponent": false, "isResource": false, diff --git a/examples/bevy_registry_export/basic/src/game/in_game.rs b/examples/bevy_registry_export/basic/src/game/in_game.rs index 2338956..4c8f479 100644 --- a/examples/bevy_registry_export/basic/src/game/in_game.rs +++ b/examples/bevy_registry_export/basic/src/game/in_game.rs @@ -41,12 +41,12 @@ pub fn setup_game( struct UnregisteredComponent; pub fn spawn_test( - keycode: Res>, + keycode: Res>, mut commands: Commands, mut game_world: Query<(Entity, &Children), With>, ) { - if keycode.just_pressed(KeyCode::T) { + if keycode.just_pressed(KeyCode::KeyT) { let world = game_world.single_mut(); let world = world.1[0]; @@ -81,48 +81,4 @@ pub fn spawn_test( .id(); commands.entity(world).add_child(new_entity); } -} - -pub fn spawn_test_unregisted_components( - keycode: Res>, - mut commands: Commands, - - mut game_world: Query<(Entity, &Children), With>, -) { - if keycode.just_pressed(KeyCode::U) { - let world = game_world.single_mut(); - let world = world.1[0]; - - let mut rng = rand::thread_rng(); - let range = 5.5; - let x: f32 = rng.gen_range(-range..range); - let y: f32 = rng.gen_range(-range..range); - - let mut rng = rand::thread_rng(); - let range = 0.8; - let vel_x: f32 = rng.gen_range(-range..range); - let vel_y: f32 = rng.gen_range(2.0..2.5); - let vel_z: f32 = rng.gen_range(-range..range); - - let name_index: u64 = rng.gen(); - - let new_entity = commands - .spawn(( - BluePrintBundle { - blueprint: BlueprintName("Health_Pickup".to_string()), - ..Default::default() - }, - bevy::prelude::Name::from(format!("test{}", name_index)), - // BlueprintName("Health_Pickup".to_string()), - // SpawnHere, - TransformBundle::from_transform(Transform::from_xyz(x, 2.0, y)), - Velocity { - linvel: Vec3::new(vel_x, vel_y, vel_z), - angvel: Vec3::new(0.0, 0.0, 0.0), - }, - UnregisteredComponent, - )) - .id(); - commands.entity(world).add_child(new_entity); - } -} +} \ No newline at end of file diff --git a/examples/bevy_registry_export/basic/src/game/in_main_menu.rs b/examples/bevy_registry_export/basic/src/game/in_main_menu.rs index c1a4b8b..32142cd 100644 --- a/examples/bevy_registry_export/basic/src/game/in_main_menu.rs +++ b/examples/bevy_registry_export/basic/src/game/in_main_menu.rs @@ -89,24 +89,10 @@ pub fn teardown_main_menu(bla: Query>, mut commands: Co } pub fn main_menu( - keycode: Res>, - + keycode: Res>, mut next_app_state: ResMut>, - // mut next_game_state: ResMut>, - // mut save_requested_events: EventWriter, - // mut load_requested_events: EventWriter, ) { - if keycode.just_pressed(KeyCode::Return) { + if keycode.just_pressed(KeyCode::Enter) { next_app_state.set(AppState::AppLoading); - // next_game_state.set(GameState::None); - } - - if keycode.just_pressed(KeyCode::L) { - next_app_state.set(AppState::AppLoading); - // load_requested_events.send(LoadRequest { path: "toto".into() }) - } - - if keycode.just_pressed(KeyCode::S) { - // save_requested_events.send(SaveRequest { path: "toto".into() }) } } diff --git a/examples/bevy_registry_export/basic/src/game/mod.rs b/examples/bevy_registry_export/basic/src/game/mod.rs index b236141..4ab4c26 100644 --- a/examples/bevy_registry_export/basic/src/game/mod.rs +++ b/examples/bevy_registry_export/basic/src/game/mod.rs @@ -12,7 +12,7 @@ impl Plugin for GamePlugin { fn build(&self, app: &mut App) { app.add_systems( Update, - (spawn_test, spawn_test_unregisted_components).run_if(in_state(GameState::InGame)), + (spawn_test).run_if(in_state(GameState::InGame)), ) .add_systems(OnEnter(AppState::MenuRunning), setup_main_menu) .add_systems(OnExit(AppState::MenuRunning), teardown_main_menu) diff --git a/examples/bevy_registry_export/basic/src/main.rs b/examples/bevy_registry_export/basic/src/main.rs index 8fca426..9320156 100644 --- a/examples/bevy_registry_export/basic/src/main.rs +++ b/examples/bevy_registry_export/basic/src/main.rs @@ -1,5 +1,4 @@ use bevy::prelude::*; -use bevy_editor_pls::prelude::*; use bevy_gltf_worlflow_examples_common::CommonPlugin; mod core; @@ -15,8 +14,6 @@ fn main() { App::new() .add_plugins(( DefaultPlugins.set(AssetPlugin::default()), - // editor - EditorPlugin::default(), // our custom plugins CommonPlugin, CorePlugin, // reusable plugins diff --git a/examples/common/Cargo.toml b/examples/common/Cargo.toml index 9f19715..58bdd88 100644 --- a/examples/common/Cargo.toml +++ b/examples/common/Cargo.toml @@ -5,9 +5,9 @@ edition = "2021" license = "MIT OR Apache-2.0" [dependencies] -bevy="0.12" +bevy="0.13" bevy_gltf_blueprints = { path = "../../crates/bevy_gltf_blueprints" } -bevy_rapier3d = { version = "0.23.0", features = [ "serde-serialize", "debug-render-3d", "enhanced-determinism"] } -bevy_asset_loader = { version = "0.18", features = ["standard_dynamic_assets" ]} -bevy_editor_pls = { version = "0.6" } +bevy_rapier3d = { version = "0.25.0", features = [ "serde-serialize", "debug-render-3d", "enhanced-determinism"] } +bevy_asset_loader = { version = "0.20", features = ["standard_dynamic_assets" ]} +#bevy_editor_pls = { version = "0.6" } rand = "0.8.5" diff --git a/examples/common/src/core/camera/camera_replace_proxies.rs b/examples/common/src/core/camera/camera_replace_proxies.rs index c72e84a..2f8e044 100644 --- a/examples/common/src/core/camera/camera_replace_proxies.rs +++ b/examples/common/src/core/camera/camera_replace_proxies.rs @@ -2,6 +2,7 @@ use bevy::core_pipeline::bloom::{BloomCompositeMode, BloomSettings}; use bevy::core_pipeline::experimental::taa::TemporalAntiAliasBundle; use bevy::core_pipeline::tonemapping::{DebandDither, Tonemapping}; use bevy::pbr::ScreenSpaceAmbientOcclusionBundle; +use bevy::render::camera::Exposure; use bevy::prelude::*; use super::CameraTrackingOffset; @@ -17,6 +18,7 @@ pub fn camera_replace_proxies( ( Entity, &mut Camera, + &mut Exposure, Option<&BloomSettings>, Option<&SSAOSettings>, ), @@ -26,9 +28,10 @@ pub fn camera_replace_proxies( added_bloom_settings: Query<&BloomSettings, Added>, added_ssao_settings: Query<&SSAOSettings, Added>, // Move to camera ) { - for (entity, mut camera, bloom_settings, ssao_setting) in added_cameras.iter_mut() { + for (entity, mut camera, mut exposure, bloom_settings, ssao_setting) in added_cameras.iter_mut() { info!("detected added camera, updating proxy"); camera.hdr = true; + // exposure.ev100 *= 0.8; commands .entity(entity) .insert(DebandDither::Enabled) diff --git a/examples/common/src/core/lighting/lighting_replace_proxies.rs b/examples/common/src/core/lighting/lighting_replace_proxies.rs index aec4743..ebfdede 100644 --- a/examples/common/src/core/lighting/lighting_replace_proxies.rs +++ b/examples/common/src/core/lighting/lighting_replace_proxies.rs @@ -26,7 +26,7 @@ pub fn lighting_replace_proxies( mut commands: Commands, ) { for (entity, mut light) in added_dirights.iter_mut() { - light.illuminance *= 5.0; + // light.illuminance *= 5.0; // arbitrary/ eyeballed to match the levels of Blender light.shadows_enabled = true; let shadow_config: CascadeShadowConfig = CascadeShadowConfigBuilder { first_cascade_far_bound: 15.0, @@ -41,7 +41,7 @@ pub fn lighting_replace_proxies( } for mut light in added_pointlights.iter_mut() { - light.intensity *= 0.001; // arbitrary/ eyeballed to match the levels of Blender + // light.intensity *= 0.001; // arbitrary/ eyeballed to match the levels of Blender light.shadows_enabled = true; } @@ -50,9 +50,10 @@ pub fn lighting_replace_proxies( } for ambient in added_ambient_proxies.iter() { + println!("AMBIENT {:?} {}", ambient.color, ambient.brightness); commands.insert_resource(AmbientLight { color: ambient.color, - brightness: ambient.brightness, + brightness: ambient.brightness,// * 4000., }); // FIXME: does this belong here ? commands.insert_resource(ClearColor(ambient.color * ambient.brightness)); diff --git a/examples/common/src/core/physics/controls.rs b/examples/common/src/core/physics/controls.rs index 2562548..2672bae 100644 --- a/examples/common/src/core/physics/controls.rs +++ b/examples/common/src/core/physics/controls.rs @@ -1,6 +1,6 @@ use bevy::{ ecs::system::Res, - input::{keyboard::KeyCode, Input}, + input::{keyboard::KeyCode, ButtonInput}, log::info, prelude::ResMut, }; @@ -18,9 +18,9 @@ pub fn resume_physics(mut physics_config: ResMut) { pub fn toggle_physics_debug( mut debug_config: ResMut, - keycode: Res>, + keycode: Res>, ) { - if keycode.just_pressed(KeyCode::D) { + if keycode.just_pressed(KeyCode::KeyD) { debug_config.enabled = !debug_config.enabled; } } diff --git a/examples/common/src/game/player/mod.rs b/examples/common/src/game/player/mod.rs index f8ef408..6cced85 100644 --- a/examples/common/src/game/player/mod.rs +++ b/examples/common/src/game/player/mod.rs @@ -8,22 +8,22 @@ use crate::GameState; pub struct Player; fn player_move_demo( - keycode: Res>, + keycode: Res>, mut players: Query<&mut Transform, With>, ) { let speed = 0.2; if let Ok(mut player) = players.get_single_mut() { - if keycode.pressed(KeyCode::Left) { + if keycode.pressed(KeyCode::ArrowLeft) { player.translation.x += speed; } - if keycode.pressed(KeyCode::Right) { + if keycode.pressed(KeyCode::ArrowRight) { player.translation.x -= speed; } - if keycode.pressed(KeyCode::Up) { + if keycode.pressed(KeyCode::ArrowUp) { player.translation.z += speed; } - if keycode.pressed(KeyCode::Down) { + if keycode.pressed(KeyCode::ArrowDown) { player.translation.z -= speed; } } diff --git a/examples/common/src/lib.rs b/examples/common/src/lib.rs index c41040c..3b6a25f 100644 --- a/examples/common/src/lib.rs +++ b/examples/common/src/lib.rs @@ -11,6 +11,7 @@ pub mod game; pub use game::*; use bevy::prelude::*; +// use bevy_editor_pls::prelude::*; pub struct CommonPlugin; impl Plugin for CommonPlugin { diff --git a/examples/common/src/state.rs b/examples/common/src/state.rs index 725ac7f..25aeaca 100644 --- a/examples/common/src/state.rs +++ b/examples/common/src/state.rs @@ -52,6 +52,6 @@ pub struct InGameLoading; pub struct StatePlugin; impl Plugin for StatePlugin { fn build(&self, app: &mut App) { - app.add_state::().add_state::(); + app.init_state::().init_state::(); } }