pop
/
monologue-trees
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gltf base box and scrollinggit add .; git commit -m 'gltf base box and scrollinggit add .; git commit -m 'gltf base box and scrollinggit commit -m 'Audio vertical slice done'''

Browse Source
main
Elijah Voigt 2 years ago
parent b119019e30
commit a2b3d73fa8
2 changed files with 192 additions and 68 deletions
Show Stats Download Patch File Download Diff File

213
bin/editor.rs
Unescape Escape View File

@ -40,7 +40,10 @@ fn main() {
)) ))
.init_resource::<AssetRegistry>() .init_resource::<AssetRegistry>()
.add_systems(Startup, initialize_ui) .add_systems(Startup, initialize_ui)
.add_systems(Update, (import_files, import_audio, play_audio)) .add_systems(
Update,
(import_files, import_audio, import_gltf, play_audio),
)
.run(); .run();
} }
@ -63,8 +66,8 @@ fn initialize_ui(mut commands: Commands) {
let base_style = Style { let base_style = Style {
border: UiRect::all(Val::Px(1.0)), border: UiRect::all(Val::Px(1.0)),
padding: UiRect::all(Val::Px(5.0)), padding: UiRect::all(Val::Px(5.0)),
flex_direction: FlexDirection::Column,
overflow: Overflow::clip(), overflow: Overflow::clip(),
flex_direction: FlexDirection::Column,
..default() ..default()
}; };
@ -73,6 +76,7 @@ fn initialize_ui(mut commands: Commands) {
style: Style { style: Style {
width: Val::Percent(50.0), width: Val::Percent(50.0),
height: Val::Percent(50.0), height: Val::Percent(50.0),
flex_direction: FlexDirection::Row,
..base_style.clone() ..base_style.clone()
}, },
background_color: Color::WHITE.into(), background_color: Color::WHITE.into(),
@ -81,62 +85,71 @@ fn initialize_ui(mut commands: Commands) {
..default() ..default()
}) })
.with_children(|parent| { .with_children(|parent| {
{ spawn_tabtree::<AudioWidget>(parent, "Audio".into(), &base_style);
parent spawn_tabtree::<GltfWidget>(parent, "Gltf".into(), &base_style);
.spawn(NodeBundle { });
commands.insert_resource(Styles {
button: Style { ..default() },
button_hovered: Style { ..default() },
container: Style { ..default() },
})
}
fn spawn_tabtree<T: Default + Component>(
parent: &mut ChildBuilder,
title: String,
base_style: &Style,
) {
parent
.spawn((
NodeBundle {
style: Style {
..base_style.clone()
},
background_color: Color::WHITE.into(),
border_color: Color::BLACK.into(),
z_index: ZIndex::Local(20),
..default()
},
Interaction::default(),
))
.with_children(|parent| {
// Spawn button container
let container = parent
.spawn((
NodeBundle {
style: Style { style: Style {
..base_style.clone() ..base_style.clone()
}, },
background_color: Color::WHITE.into(), background_color: Color::WHITE.into(),
border_color: Color::BLACK.into(), border_color: Color::BLACK.into(),
z_index: ZIndex::Local(20), z_index: ZIndex::Local(10),
..default() ..default()
}) },
.with_children(|parent| { T::default(),
// Spawn button container ui::Scroll,
let container = parent Interaction::default(),
.spawn(( ui::Sorting(2),
NodeBundle { ))
style: Style { .id();
..base_style.clone()
},
background_color: Color::WHITE.into(),
border_color: Color::BLACK.into(),
z_index: ZIndex::Local(10),
..default()
},
AudioWidget,
ui::Scroll,
ui::Sorting(2),
))
.id();
// Spawn widget // Spawn widget
parent.spawn(( parent.spawn((
ButtonBundle { ButtonBundle {
style: Style { style: Style {
..base_style.clone() ..base_style.clone()
}, },
background_color: Color::WHITE.into(), background_color: Color::WHITE.into(),
border_color: Color::BLACK.into(), border_color: Color::BLACK.into(),
z_index: ZIndex::Local(15), z_index: ZIndex::Local(15),
..default() ..default()
}, },
ui::Title { ui::Title { name: title },
name: "Audio".into(), ui::Collapse { target: container },
}, ui::Sorting(1),
ui::Collapse { target: container }, ));
ui::Sorting(1),
));
});
}
}); });
commands.insert_resource(Styles {
button: Style { ..default() },
button_hovered: Style { ..default() },
container: Style { ..default() },
})
} }
fn import_files( fn import_files(
@ -166,7 +179,7 @@ mod audio {
use super::*; use super::*;
#[derive(Debug, Component)] #[derive(Debug, Component, Default)]
pub struct AudioWidget; pub struct AudioWidget;
pub fn import_audio( pub fn import_audio(
@ -176,10 +189,9 @@ mod audio {
current: Query<(Entity, &Handle<AudioSource>)>, current: Query<(Entity, &Handle<AudioSource>)>,
server: Res<AssetServer>, server: Res<AssetServer>,
) { ) {
// TODO: Filter to just audio files
events events
.iter() .iter()
.filter(|event| match event { .filter(|&event| match event {
AssetEvent::Created { handle } AssetEvent::Created { handle }
| AssetEvent::Removed { handle } | AssetEvent::Removed { handle }
| AssetEvent::Modified { handle } => { | AssetEvent::Modified { handle } => {
@ -282,3 +294,98 @@ mod audio {
}); });
} }
} }
use gltf::*;
mod gltf {
use super::*;
#[derive(Debug, Component, Default)]
pub struct GltfWidget;
pub fn import_gltf(
mut events: EventReader<AssetEvent<Gltf>>,
mut commands: Commands,
root: Query<Entity, With<GltfWidget>>,
current: Query<(Entity, &Handle<Gltf>)>,
server: Res<AssetServer>,
) {
events
.iter()
.filter(|&event| match event {
AssetEvent::Created { handle }
| AssetEvent::Removed { handle }
| AssetEvent::Modified { handle } => {
if let Some(asset_path) = server.get_handle_path(handle.clone()) {
if let Some(extension) = asset_path.path().extension() {
extension == "gltf" || extension == "glb"
} else {
false
}
} else {
false
}
}
})
.for_each(|event| {
let create = |commands: &mut Commands, handle: Handle<Gltf>| {
commands.entity(root.single()).with_children(|parent| {
let name = {
if let Some(asset_path) = server.get_handle_path(handle.clone()) {
if let Some(stem) = asset_path.path().file_stem() {
if let Some(val) = stem.to_str() {
String::from(val)
} else {
String::from("???")
}
} else {
String::from("???")
}
} else {
String::from("???")
}
};
parent.spawn((
handle,
ButtonBundle {
style: Style {
border: UiRect::all(Val::Px(1.0)),
margin: UiRect::all(Val::Px(5.0)),
padding: UiRect::all(Val::Px(5.0)),
..default()
},
border_color: Color::BLACK.into(),
..default()
},
ui::Title { name },
));
});
};
let destroy = |commands: &mut Commands, handle: Handle<Gltf>| {
if let Some(entity) = current.iter().find_map(|(entity, current)| {
if *current == handle {
Some(entity)
} else {
None
}
}) {
commands.entity(entity).despawn_recursive();
}
};
match event {
AssetEvent::Created { handle } => {
info!("Asset created! {:?}", event);
create(&mut commands, handle.clone());
}
AssetEvent::Removed { handle } => {
info!("Asset removed! {:?}", event);
destroy(&mut commands, handle.clone());
}
AssetEvent::Modified { handle } => {
info!("Asset modified! {:?}", event);
destroy(&mut commands, handle.clone());
create(&mut commands, handle.clone());
}
}
});
}
}

47
src/ui.rs
Unescape Escape View File

@ -135,23 +135,40 @@ mod scroll {
pub fn manage_scroll( pub fn manage_scroll(
mut events: EventReader<MouseWheel>, mut events: EventReader<MouseWheel>,
mut query: Query<&mut Style, With<Scroll>>, mut query: Query<(&Interaction, &Parent, &Children, &mut Style), With<Scroll>>,
interactions: Query<&Interaction>,
) { ) {
events.iter().for_each(|MouseWheel { unit, y, .. }| { events.iter().for_each(|MouseWheel { unit, y, .. }| {
query.iter_mut().for_each(|mut style| { query
let factor = 2.0; .iter_mut()
let val = match unit { .filter(|(&interaction, parent, children, _)| {
MouseScrollUnit::Line => match style.top { let self_hover = interaction == Interaction::Hovered;
Val::Px(v) => v + (y * factor), let child_hover = children.iter().any(|&child| {
_ => (*y) * factor, if let Ok(&interaction) = interactions.get(child) {
}, interaction == Interaction::Hovered
MouseScrollUnit::Pixel => match style.top { } else {
Val::Px(v) => v + (y * factor), false
_ => (*y) * factor, }
}, });
}; let parent_hover = interactions
style.top = Val::Px(val.min(0.0)); .get(parent.get())
}); .map_or(false, |&interaction| interaction == Interaction::Hovered);
self_hover || child_hover || parent_hover
})
.for_each(|(_, _, _, mut style)| {
let factor = 2.0;
let val = match unit {
MouseScrollUnit::Line => match style.top {
Val::Px(v) => v + (y * factor),
_ => (*y) * factor,
},
MouseScrollUnit::Pixel => match style.top {
Val::Px(v) => v + (y * factor),
_ => (*y) * factor,
},
};
style.top = Val::Px(val.min(0.0));
});
}); });
} }
} }

Write Preview
Loading…
Cancel
Save