pop
/
martian-chess
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix double dissolve for pieces by moving hierarchy

Browse Source 
Thankfully there wasn't a lot of logic tied to that hierarchy...
main
Elijah C. Voigt 1 year ago
parent e9c9afe2b6
commit 7e5564720d
2 changed files with 69 additions and 75 deletions
Show Stats Download Patch File Download Diff File

136
src/display3d.rs
Unescape Escape View File

@ -311,74 +311,73 @@ fn initialize(mut commands: Commands, board: Res<game::Board>, assets: Res<Asset
start: 0.0, start: 0.0,
duration: 12.0, duration: 12.0,
}, // Marks pieces as dissolving }, // Marks pieces as dissolving
)) ));
.with_children(|parent| {
// Hitboxes // Hitboxes
game::tiles().for_each(|(index, tile)| { game::tiles().for_each(|(index, tile)| {
let side = Board::side(index).expect("Spawn valid side"); let side = Board::side(index).expect("Spawn valid side");
parent.spawn(( parent.spawn((
DisplayState::Display3d, DisplayState::Display3d,
Display3d, Display3d,
index, index,
tile, tile,
PbrBundle { PbrBundle {
mesh: assets.hitbox_shape.clone(), mesh: assets.hitbox_shape.clone(),
material: assets.hitbox_material.clone(), material: assets.hitbox_material.clone(),
visibility: Visibility::Hidden, visibility: Visibility::Hidden,
..default() ..default()
}, },
side, side,
game::Selectable, game::Selectable,
)); ));
}); });
// Valid move indicators // Valid move indicators
game::tiles().for_each(|(index, _)| { game::tiles().for_each(|(index, _)| {
let side = Board::side(index).expect("Spawn valid side"); let side = Board::side(index).expect("Spawn valid side");
parent.spawn(( parent.spawn((
DisplayState::Display3d, DisplayState::Display3d,
Display3d, Display3d,
index, index,
SceneBundle { SceneBundle {
visibility: Visibility::Hidden, visibility: Visibility::Hidden,
transform: Transform::from_translation(board_translation(&index)), transform: Transform::from_translation(board_translation(&index)),
..default() ..default()
}, },
side, side,
game::ValidMove, game::ValidMove,
)); ));
}); });
// Pieces // Pieces
let mut angle = 0.0; let mut angle = 0.0;
board.pieces().iter().for_each(|(index, piece)| { board.pieces().iter().for_each(|(index, piece)| {
let side = Board::side(*index).expect("Spawn valid side"); let side = Board::side(*index).expect("Spawn valid side");
// Rotates each piece 90 degrees offset from the previous piece // Rotates each piece 90 degrees offset from the previous piece
let rotation = Quat::from_rotation_y(angle); let rotation = Quat::from_rotation_y(angle);
let transform = Transform::default().with_rotation(rotation); let transform = Transform::default().with_rotation(rotation);
angle += std::f32::consts::PI / 2.0; angle += std::f32::consts::PI / 2.0;
parent.spawn(( parent.spawn((
side, side,
DisplayState::Display3d, DisplayState::Display3d,
Display3d, Display3d,
*piece, *piece,
*index, *index,
SceneBundle { SceneBundle {
visibility: Visibility::Hidden, visibility: Visibility::Hidden,
transform, transform,
..default() ..default()
}, },
game::Selectable, game::Selectable,
Dissolvable { Dissolvable {
start: 1.0, start: 1.0,
duration: 3.0, duration: 3.0,
}, // Marks pieces as dissolving }, // Marks pieces as dissolving
)); ));
});
}); });
}); });
} }
@ -1268,7 +1267,6 @@ fn continue_title(mut next_state: ResMut<NextState<GameState>>) {
fn dissolve_animation( fn dissolve_animation(
mut query: Query<(Entity, &Dissolvable, &mut Dissolving, &mut Visibility)>, mut query: Query<(Entity, &Dissolvable, &mut Dissolving, &mut Visibility)>,
children: Query<&Children>, children: Query<&Children>,
// Used to create Handle<DissolveMaterial>
mut dissolve_materials: ResMut<Assets<DissolveMaterial>>, mut dissolve_materials: ResMut<Assets<DissolveMaterial>>,
object_materials: Query<(Entity, &Handle<DissolveMaterial>)>, object_materials: Query<(Entity, &Handle<DissolveMaterial>)>,
mut commands: Commands, mut commands: Commands,

8
src/ui.rs
Unescape Escape View File

@ -100,7 +100,7 @@ fn interactive_button(
while let Some((mut t, mut s)) = ts.fetch_next() { while let Some((mut t, mut s)) = ts.fetch_next() {
s.right = Val::Px(0.0); s.right = Val::Px(0.0);
s.bottom = Val::Px(0.0); s.bottom = Val::Px(0.0);
t.sections.iter_mut().for_each(|mut section| { t.sections.iter_mut().for_each(|section| {
section.style.color = Color::WHITE; section.style.color = Color::WHITE;
}); });
} }
@ -112,7 +112,7 @@ fn interactive_button(
while let Some((mut t, mut s)) = ts.fetch_next() { while let Some((mut t, mut s)) = ts.fetch_next() {
s.right = Val::Px(-2.0); s.right = Val::Px(-2.0);
s.bottom = Val::Px(-1.0); s.bottom = Val::Px(-1.0);
t.sections.iter_mut().for_each(|mut section| { t.sections.iter_mut().for_each(|section| {
section.style.color = Color::hex("E8E8E8").unwrap(); section.style.color = Color::hex("E8E8E8").unwrap();
}); });
} }
@ -120,10 +120,6 @@ fn interactive_button(
Interaction::Pressed => { Interaction::Pressed => {
ui_image.texture = depressed_handle.clone(); ui_image.texture = depressed_handle.clone();
writer.send(audio::AudioEvent::MenuSelect); writer.send(audio::AudioEvent::MenuSelect);
let mut ts = texts.iter_many_mut(children.iter_descendants(entity));
while let Some((_t, mut s)) = ts.fetch_next() {
// TODO: Change text color
}
} }
}); });
} }

Write Preview
Loading…
Cancel
Save