tuxmain/bevyjam
tuxmain/bevyjam
2
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

removed hannabi

Browse source
This commit is contained in:
Nixon 2022-08-24 13:52:14 +08:00
commit f0e5f2f360
7 changed files with 17 additions and 112 deletions
Download patch file Download diff file Expand all files Collapse all files

79
src/game.rs
View file

@ -10,7 +10,6 @@ use bevy::{
prelude::{shape::Quad, *},
sprite::Mesh2dHandle,
};
use bevy_hanabi::*;
use bevy_rapier2d::prelude::*;
use std::collections::BTreeSet;
@ -101,7 +100,6 @@ fn setup(
pub fn spawn_character(
commands: &mut Commands,
character_meshes: &Res<CharacterMeshes>,
effects: &mut ResMut<Assets<EffectAsset>>,
materials: &mut ResMut<Assets<ColorMaterial>>,
selected_character_id: &mut Mut<SelectedCharacterId>,
character_id_list: &mut Mut<CharacterIdList>,
@ -118,22 +116,6 @@ pub fn spawn_character(
);
character_id_list.0.insert(character_id);
let mut gradient = Gradient::new();
gradient.add_key(
0.0,
(Vec4::from(color) + Vec4::new(0.1, 0.1, 0.1, 0.0))
.clamp(Vec4::new(0., 0., 0., 0.), Vec4::new(1., 1., 1., 0.)),
);
gradient.add_key(
0.2,
(Vec4::from(color) + Vec4::new(0.1, 0.1, 0.1, 0.0))
.clamp(Vec4::new(0., 0., 0., 0.), Vec4::new(1., 1., 1., 1.)),
);
gradient.add_key(
1.0,
(Vec4::from(color) + Vec4::new(0.1, 0.1, 0.1, 0.0))
.clamp(Vec4::new(0., 0., 0., 0.), Vec4::new(1., 1., 1., 0.)),
);
commands
.spawn_bundle(ColorMesh2dBundle {
mesh: character_meshes.square.clone(),
@ -156,35 +138,7 @@ pub fn spawn_character(
angular_damping: 0.5,
})
.insert(ExternalImpulse::default())
.insert(ActiveEvents::COLLISION_EVENTS)
.with_children(|c| {
c.spawn_bundle(ParticleEffectBundle {
effect: ParticleEffect::new(
effects.add(
EffectAsset {
name: "Particles".into(),
capacity: 4096,
spawner: Spawner::rate(30.0.into())
.with_active(selected_character_id.0.is_none()),
..Default::default()
}
.init(PositionCircleModifier {
radius: 30.0,
speed: 20.0.into(),
dimension: ShapeDimension::Surface,
..Default::default()
})
.init(ParticleLifetimeModifier { lifetime: 0.8 })
.render(SizeOverLifetimeModifier {
gradient: Gradient::constant(Vec2::splat(4.0)),
})
.render(ColorOverLifetimeModifier { gradient }),
),
),
transform: Transform::from_xyz(0., 0., 0.1),
..Default::default()
});
});
.insert(ActiveEvents::COLLISION_EVENTS);
// If no character is selected, then select this one
if selected_character_id.0.is_none() {
@ -199,7 +153,6 @@ fn collision_event_system(
mut commands: Commands,
character_meshes: Res<CharacterMeshes>,
mut materials: ResMut<Assets<ColorMaterial>>,
mut effects: ResMut<Assets<EffectAsset>>,
mut collision_events: EventReader<CollisionEvent>,
character_query: Query<(&CharacterId, &CharacterColor, &Transform)>,
mut level_query: Query<(&mut SelectedCharacterId, &mut CharacterIdList)>,
@ -235,7 +188,6 @@ fn collision_event_system(
spawn_character(
&mut commands,
&character_meshes,
&mut effects,
&mut materials,
&mut selected_character_id,
&mut character_id_list,
@ -251,27 +203,14 @@ fn collision_event_system(
fn keyboard_input_system(
keyboard_input: Res<Input<KeyCode>>,
mut characters: Query<(&CharacterId, &mut Velocity, &CharacterColor, &Children)>,
mut characters: Query<(&CharacterId, &mut Velocity, &CharacterColor)>,
mut level_query: Query<(&mut SelectedCharacterId, &CharacterIdList)>,
mut effect: Query<&mut ParticleEffect>,
mut app_state: ResMut<State<AppState>>,
audio: Res<crossbeam_channel::Sender<AudioMsg>>,
) {
if let Ok((mut selected_character_id, character_id_list)) = level_query.get_single_mut() {
if keyboard_input.just_pressed(KeyCode::Tab) {
let selected = if let Some(selected_character_id) = &mut selected_character_id.0 {
if let Some((_character_id, _velocity, _color, children)) = characters
.iter_mut()
.find(|(character_id, _velocity, _color, _children)| {
*character_id == selected_character_id
}) {
effect
.get_mut(children[0])
.unwrap()
.maybe_spawner()
.unwrap()
.set_active(false);
}
*selected_character_id = *character_id_list
.0
@ -284,16 +223,10 @@ fn keyboard_input_system(
CharacterId(0)
};
if let Some((_character_id, _velocity, color, children)) = characters
if let Some((_character_id, _velocity, color)) = characters
.iter_mut()
.find(|(character_id, _velocity, _color, _children)| **character_id == selected)
.find(|(character_id, _velocity, _color)| **character_id == selected)
{
effect
.get_mut(children[0])
.unwrap()
.maybe_spawner()
.unwrap()
.set_active(true);
audio
.send(AudioMsg::Color([color.0.r(), color.0.g(), color.0.b()]))
.ok();
@ -306,9 +239,9 @@ fn keyboard_input_system(
keyboard_input.pressed(KeyCode::Left) || keyboard_input.pressed(KeyCode::A);
if let Some(selected_character_id) = &selected_character_id.0 {
if let Some((_character_id, mut velocity, _color, _children)) = characters
if let Some((_character_id, mut velocity, _color)) = characters
.iter_mut()
.find(|(character_id, _velocity, _color, _children)| {
.find(|(character_id, _velocity, _color)| {
*character_id == selected_character_id
}) {
velocity.linvel.x = 200. * (right_pressed as i8 - left_pressed as i8) as f32;