Skip to content

Commit bdd436e

Browse files
atlv24tigregalis
authored andcommitted
Rename animation to gltf_animation (bevyengine#21388)
# Objective - Step towards bevyengine#20867 ## Solution - Do a rename ## Testing - Ran some examples
1 parent 27f3bae commit bdd436e

File tree

7 files changed

+19
-17
lines changed

7 files changed

+19
-17
lines changed

Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ default = [
130130
"async_executor",
131131
"android-game-activity",
132132
"android_shared_stdcxx",
133-
"animation",
133+
"gltf_animation",
134134
"bevy_asset",
135135
"bevy_audio",
136136
"bevy_color",
@@ -439,8 +439,8 @@ android-game-activity = ["bevy_internal/android-game-activity"]
439439
# Enable systems that allow for automated testing on CI
440440
bevy_ci_testing = ["bevy_internal/bevy_ci_testing"]
441441

442-
# Enable animation support, and glTF animation loading
443-
animation = ["bevy_internal/animation", "bevy_animation"]
442+
# Enable glTF animation loading
443+
gltf_animation = ["bevy_internal/gltf_animation"]
444444

445445
# Enables support for morph target weights in bevy_mesh
446446
morph = ["bevy_internal/morph"]

crates/bevy_internal/Cargo.toml

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -201,13 +201,8 @@ webgpu = [
201201
# Enable systems that allow for automated testing on CI
202202
bevy_ci_testing = ["bevy_dev_tools/bevy_ci_testing", "bevy_render?/ci_limits"]
203203

204-
# Enable animation support, and glTF animation loading
205-
animation = [
206-
"bevy_animation",
207-
"bevy_mesh",
208-
"bevy_color",
209-
"bevy_gltf?/bevy_animation",
210-
]
204+
# Enable glTF animation loading
205+
gltf_animation = ["bevy_animation", "bevy_gltf?/bevy_animation"]
211206

212207
# Enables support for morph target weights in bevy_mesh
213208
morph = ["bevy_mesh?/morph", "bevy_render?/morph"]
@@ -223,6 +218,7 @@ bevy_text = [
223218
]
224219
bevy_ui = ["dep:bevy_ui", "bevy_text", "bevy_sprite"]
225220
bevy_mesh = ["dep:bevy_mesh", "bevy_image"]
221+
bevy_animation = ["dep:bevy_animation", "bevy_mesh"]
226222
bevy_window = ["dep:bevy_window", "dep:bevy_a11y", "bevy_image"]
227223
bevy_winit = ["dep:bevy_winit", "bevy_window"]
228224
bevy_camera = ["dep:bevy_camera", "bevy_mesh", "bevy_window"]

docs/cargo_features.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,7 @@ The default feature set enables most of the expected features of a game engine,
1313
|-|-|
1414
|android-game-activity|Android GameActivity support. Default, choose between this and `android-native-activity`.|
1515
|android_shared_stdcxx|Enable using a shared stdlib for cxx on Android|
16-
|animation|Enable animation support, and glTF animation loading|
1716
|async_executor|Uses `async-executor` as a task execution backend.|
18-
|bevy_animation|Provides animation functionality|
1917
|bevy_anti_alias|Provides various anti aliasing solutions|
2018
|bevy_asset|Provides asset functionality|
2119
|bevy_audio|Provides audio functionality|
@@ -50,6 +48,7 @@ The default feature set enables most of the expected features of a game engine,
5048
|custom_cursor|Enable winit custom cursor support|
5149
|debug|Enable collecting debug information about systems and components to help with diagnostics|
5250
|default_font|Include a default font, containing only ASCII characters, at the cost of a 20kB binary size increase|
51+
|gltf_animation|Enable glTF animation loading|
5352
|hdr|HDR image format support|
5453
|ktx2|KTX2 compressed texture support|
5554
|morph|Enables support for morph target weights in bevy_mesh|
@@ -75,6 +74,7 @@ The default feature set enables most of the expected features of a game engine,
7574
|asset_processor|Enables the built-in asset processor for processed assets.|
7675
|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.|
7776
|basis-universal|Basis Universal compressed texture support|
77+
|bevy_animation|Provides animation functionality|
7878
|bevy_ci_testing|Enable systems that allow for automated testing on CI|
7979
|bevy_debug_stepping|Enable stepping-based debugging of Bevy systems|
8080
|bevy_dev_tools|Provides a collection of developer tools|

examples/mobile/android_basic/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ crate-type = ["staticlib", "cdylib"]
1515
bevy = { path = "../../", default-features = false, features = [
1616
"android-native-activity",
1717
"android_shared_stdcxx",
18-
"animation",
18+
"gltf_animation",
1919
"bevy_animation",
2020
"bevy_asset",
2121
"bevy_audio",

examples/tools/scene_viewer/main.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ use bevy::{
2222
#[path = "../../helpers/camera_controller.rs"]
2323
mod camera_controller;
2424

25-
#[cfg(feature = "animation")]
25+
#[cfg(feature = "gltf_animation")]
2626
mod animation_plugin;
2727
mod morph_viewer_plugin;
2828
mod scene_viewer_plugin;
@@ -111,7 +111,7 @@ fn main() {
111111
app.insert_resource(DefaultOpaqueRendererMethod::deferred());
112112
}
113113

114-
#[cfg(feature = "animation")]
114+
#[cfg(feature = "gltf_animation")]
115115
app.add_plugins(animation_plugin::AnimationManipulationPlugin);
116116

117117
app.run();

examples/tools/scene_viewer/scene_viewer_plugin.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ impl SceneHandle {
3232
}
3333
}
3434

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

45-
#[cfg(feature = "animation")]
45+
#[cfg(feature = "gltf_animation")]
4646
const INSTRUCTIONS: &str = "
4747
Scene Controls:
4848
L - animate light direction
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
title: Feature cleanup
3+
pull_requests: [21388]
4+
---
5+
6+
`animation` has been renamed to `gltf_animation`.

0 commit comments

Comments
 (0)