c2c19e5ae4
**Ready for review. Examples migration progress: 100%.** # Objective - Implement https://github.com/bevyengine/bevy/discussions/15014 ## Solution This implements [cart's proposal](https://github.com/bevyengine/bevy/discussions/15014#discussioncomment-10574459) faithfully except for one change. I separated `TextSpan` from `TextSpan2d` because `TextSpan` needs to require the `GhostNode` component, which is a `bevy_ui` component only usable by UI. Extra changes: - Added `EntityCommands::commands_mut` that returns a mutable reference. This is a blocker for extension methods that return something other than `self`. Note that `sickle_ui`'s `UiBuilder::commands` returns a mutable reference for this reason. ## Testing - [x] Text examples all work. --- ## Showcase TODO: showcase-worthy ## Migration Guide TODO: very breaking ### Accessing text spans by index Text sections are now text sections on different entities in a hierarchy, Use the new `TextReader` and `TextWriter` system parameters to access spans by index. Before: ```rust fn refresh_text(mut query: Query<&mut Text, With<TimeText>>, time: Res<Time>) { let text = query.single_mut(); text.sections[1].value = format_time(time.elapsed()); } ``` After: ```rust fn refresh_text( query: Query<Entity, With<TimeText>>, mut writer: UiTextWriter, time: Res<Time> ) { let entity = query.single(); *writer.text(entity, 1) = format_time(time.elapsed()); } ``` ### Iterating text spans Text spans are now entities in a hierarchy, so the new `UiTextReader` and `UiTextWriter` system parameters provide ways to iterate that hierarchy. The `UiTextReader::iter` method will give you a normal iterator over spans, and `UiTextWriter::for_each` lets you visit each of the spans. --------- Co-authored-by: ickshonpe <david.curthoys@googlemail.com> Co-authored-by: Carter Anderson <mcanders1@gmail.com>
92 lines
2.4 KiB
Rust
92 lines
2.4 KiB
Rust
//! Loads and renders a glTF file as a scene, and list all the different `gltf_extras`.
|
|
|
|
use bevy::{
|
|
gltf::{GltfExtras, GltfMaterialExtras, GltfMeshExtras, GltfSceneExtras},
|
|
prelude::*,
|
|
};
|
|
|
|
fn main() {
|
|
App::new()
|
|
.add_plugins(DefaultPlugins)
|
|
.add_systems(Startup, setup)
|
|
.add_systems(Update, check_for_gltf_extras)
|
|
.run();
|
|
}
|
|
|
|
#[derive(Component)]
|
|
struct ExampleDisplay;
|
|
|
|
fn setup(mut commands: Commands, asset_server: Res<AssetServer>) {
|
|
commands.spawn((
|
|
Camera3d::default(),
|
|
Transform::from_xyz(2.0, 2.0, 2.0).looking_at(Vec3::ZERO, Vec3::Y),
|
|
));
|
|
|
|
commands.spawn(DirectionalLight {
|
|
shadows_enabled: true,
|
|
..default()
|
|
});
|
|
|
|
// a barebones scene containing one of each gltf_extra type
|
|
commands.spawn(SceneRoot(asset_server.load(
|
|
GltfAssetLabel::Scene(0).from_asset("models/extras/gltf_extras.glb"),
|
|
)));
|
|
|
|
// a place to display the extras on screen
|
|
commands.spawn((
|
|
Text::default(),
|
|
TextStyle {
|
|
font_size: 15.,
|
|
..default()
|
|
},
|
|
Style {
|
|
position_type: PositionType::Absolute,
|
|
top: Val::Px(12.0),
|
|
left: Val::Px(12.0),
|
|
..default()
|
|
},
|
|
ExampleDisplay,
|
|
));
|
|
}
|
|
|
|
fn check_for_gltf_extras(
|
|
gltf_extras_per_entity: Query<(
|
|
Entity,
|
|
Option<&Name>,
|
|
Option<&GltfSceneExtras>,
|
|
Option<&GltfExtras>,
|
|
Option<&GltfMeshExtras>,
|
|
Option<&GltfMaterialExtras>,
|
|
)>,
|
|
mut display: Query<&mut Text, With<ExampleDisplay>>,
|
|
) {
|
|
let mut gltf_extra_infos_lines: Vec<String> = vec![];
|
|
|
|
for (id, name, scene_extras, extras, mesh_extras, material_extras) in
|
|
gltf_extras_per_entity.iter()
|
|
{
|
|
if scene_extras.is_some()
|
|
|| extras.is_some()
|
|
|| mesh_extras.is_some()
|
|
|| material_extras.is_some()
|
|
{
|
|
let formatted_extras = format!(
|
|
"Extras per entity {} ('Name: {}'):
|
|
- scene extras: {:?}
|
|
- primitive extras: {:?}
|
|
- mesh extras: {:?}
|
|
- material extras: {:?}
|
|
",
|
|
id,
|
|
name.unwrap_or(&Name::default()),
|
|
scene_extras,
|
|
extras,
|
|
mesh_extras,
|
|
material_extras
|
|
);
|
|
gltf_extra_infos_lines.push(formatted_extras);
|
|
}
|
|
**display.single_mut() = gltf_extra_infos_lines.join("\n");
|
|
}
|
|
}
|