Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ default = [
"async_executor",
"android-game-activity",
"android_shared_stdcxx",
"animation",
"gltf_animation",
"bevy_asset",
"bevy_audio",
"bevy_color",
Expand Down Expand Up @@ -438,8 +438,8 @@ android-game-activity = ["bevy_internal/android-game-activity"]
# Enable systems that allow for automated testing on CI
bevy_ci_testing = ["bevy_internal/bevy_ci_testing"]

# Enable animation support, and glTF animation loading
animation = ["bevy_internal/animation", "bevy_animation"]
# Enable glTF animation loading
gltf_animation = ["bevy_internal/gltf_animation"]

# Enable using a shared stdlib for cxx on Android
android_shared_stdcxx = ["bevy_internal/android_shared_stdcxx"]
Expand Down
10 changes: 3 additions & 7 deletions crates/bevy_internal/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -201,13 +201,8 @@ webgpu = [
# Enable systems that allow for automated testing on CI
bevy_ci_testing = ["bevy_dev_tools/bevy_ci_testing", "bevy_render?/ci_limits"]

# Enable animation support, and glTF animation loading
animation = [
"bevy_animation",
"bevy_mesh",
"bevy_color",
"bevy_gltf?/bevy_animation",
]
# Enable glTF animation loading
gltf_animation = ["bevy_animation", "bevy_gltf?/bevy_animation"]

bevy_shader = ["dep:bevy_shader"]
bevy_image = ["dep:bevy_image", "bevy_color", "bevy_asset"]
Expand All @@ -220,6 +215,7 @@ bevy_text = [
]
bevy_ui = ["dep:bevy_ui", "bevy_text", "bevy_sprite"]
bevy_mesh = ["dep:bevy_mesh", "bevy_image"]
bevy_animation = ["dep:bevy_animation", "bevy_mesh"]
bevy_window = ["dep:bevy_window", "dep:bevy_a11y", "bevy_image"]
bevy_winit = ["dep:bevy_winit", "bevy_window"]
bevy_camera = ["dep:bevy_camera", "bevy_mesh", "bevy_window"]
Expand Down
4 changes: 2 additions & 2 deletions docs/cargo_features.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,7 @@ The default feature set enables most of the expected features of a game engine,
|-|-|
|android-game-activity|Android GameActivity support. Default, choose between this and `android-native-activity`.|
|android_shared_stdcxx|Enable using a shared stdlib for cxx on Android|
|animation|Enable animation support, and glTF animation loading|
|async_executor|Uses `async-executor` as a task execution backend.|
|bevy_animation|Provides animation functionality|
|bevy_anti_alias|Provides various anti aliasing solutions|
|bevy_asset|Provides asset functionality|
|bevy_audio|Provides audio functionality|
Expand Down Expand Up @@ -50,6 +48,7 @@ The default feature set enables most of the expected features of a game engine,
|custom_cursor|Enable winit custom cursor support|
|debug|Enable collecting debug information about systems and components to help with diagnostics|
|default_font|Include a default font, containing only ASCII characters, at the cost of a 20kB binary size increase|
|gltf_animation|Enable glTF animation loading|
|hdr|HDR image format support|
|ktx2|KTX2 compressed texture support|
|multi_threaded|Enables multithreaded parallelism in the engine. Disabling it forces all engine tasks to run on a single thread.|
Expand All @@ -74,6 +73,7 @@ The default feature set enables most of the expected features of a game engine,
|asset_processor|Enables the built-in asset processor for processed assets.|
|async-io|Use async-io's implementation of block_on instead of futures-lite's implementation. This is preferred if your application uses async-io.|
|basis-universal|Basis Universal compressed texture support|
|bevy_animation|Provides animation functionality|
|bevy_ci_testing|Enable systems that allow for automated testing on CI|
|bevy_debug_stepping|Enable stepping-based debugging of Bevy systems|
|bevy_dev_tools|Provides a collection of developer tools|
Expand Down
2 changes: 1 addition & 1 deletion examples/mobile/android_basic/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ crate-type = ["staticlib", "cdylib"]
bevy = { path = "../../", default-features = false, features = [
"android-native-activity",
"android_shared_stdcxx",
"animation",
"gltf_animation",
"bevy_animation",
"bevy_asset",
"bevy_audio",
Expand Down
4 changes: 2 additions & 2 deletions examples/tools/scene_viewer/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ use bevy::{
#[path = "../../helpers/camera_controller.rs"]
mod camera_controller;

#[cfg(feature = "animation")]
#[cfg(feature = "gltf_animation")]
mod animation_plugin;
mod morph_viewer_plugin;
mod scene_viewer_plugin;
Expand Down Expand Up @@ -111,7 +111,7 @@ fn main() {
app.insert_resource(DefaultOpaqueRendererMethod::deferred());
}

#[cfg(feature = "animation")]
#[cfg(feature = "gltf_animation")]
app.add_plugins(animation_plugin::AnimationManipulationPlugin);

app.run();
Expand Down
4 changes: 2 additions & 2 deletions examples/tools/scene_viewer/scene_viewer_plugin.rs
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ impl SceneHandle {
}
}

#[cfg(not(feature = "animation"))]
#[cfg(not(feature = "gltf_animation"))]
const INSTRUCTIONS: &str = r#"
Scene Controls:
L - animate light direction
Expand All @@ -42,7 +42,7 @@ Scene Controls:
compile with "--features animation" for animation controls.
"#;

#[cfg(feature = "animation")]
#[cfg(feature = "gltf_animation")]
const INSTRUCTIONS: &str = "
Scene Controls:
L - animate light direction
Expand Down
6 changes: 6 additions & 0 deletions release-content/migration-guides/feature-cleanup.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
title: Feature cleanup
pull_requests: [21388]
---

`animation` has been renamed to `gltf_animation`.