-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
14 changed files
with
215 additions
and
28 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -259,6 +259,7 @@ fn receive_events( | |
| true, | ||
| 3.0, | ||
| &audio, | ||
| false, | ||
| ); | ||
| info!("Remote player spawned: {}", uuid); | ||
| } | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,149 @@ | ||
| use crate::{ | ||
| constant::{ENTITY_GROUP, PLAYER_INTERACTION_SENSOR_GROUP}, | ||
| controller::player::Player, | ||
| entity::{actor::Actor, spell::SpellEntity, witch::Witch}, | ||
| inventory_item::InventoryItem, | ||
| set::GameSet, | ||
| states::GameState, | ||
| }; | ||
| use bevy::prelude::*; | ||
| use bevy_rapier2d::prelude::*; | ||
| use std::collections::HashSet; | ||
|
|
||
| /// プレイヤーキャラクターがアイテムを拾ったりギミックの操作をするためのセンサーです | ||
| #[derive(Component)] | ||
| struct InteractionSensor { | ||
| entities: HashSet<Entity>, | ||
| } | ||
|
|
||
| pub fn spawn_interaction_sensor(builder: &mut ChildBuilder) { | ||
| builder.spawn(( | ||
| InteractionSensor { | ||
| entities: HashSet::new(), | ||
| }, | ||
| VisibilityBundle::default(), | ||
| Transform::IDENTITY, | ||
| GlobalTransform::default(), | ||
| RigidBody::Fixed, | ||
| Sensor, | ||
| Collider::cuboid(8.0, 8.0), | ||
| CollisionGroups::new(PLAYER_INTERACTION_SENSOR_GROUP, ENTITY_GROUP), | ||
| ActiveEvents::COLLISION_EVENTS, | ||
| ActiveCollisionTypes::STATIC_STATIC, | ||
| )); | ||
| } | ||
|
|
||
| fn update_interaction_sensor_transform( | ||
| actor_query: Query<&Actor, (With<Witch>, With<Player>)>, | ||
| mut sensror_query: Query<(&Parent, &mut Transform), With<InteractionSensor>>, | ||
| ) { | ||
| for (parent, mut sensor) in sensror_query.iter_mut() { | ||
| if let Ok(actor) = actor_query.get(**parent) { | ||
| let angle = actor.pointer.to_angle(); | ||
| sensor.translation = Vec3::new(8.0, 0.0, 0.0); | ||
| sensor.rotation = Quat::IDENTITY; | ||
| sensor.rotate_around(Vec3::ZERO, Quat::from_rotation_z(angle)); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| fn interaction( | ||
| mut sensor_query: Query<&mut InteractionSensor>, | ||
| spell_entity_query: Query<(Entity, &SpellEntity)>, | ||
| mut collision_events: EventReader<CollisionEvent>, | ||
| ) { | ||
| for collision_event in collision_events.read() { | ||
| match collision_event { | ||
| CollisionEvent::Started(a, b, _) => { | ||
| info!("CollisionEvent::Started"); | ||
|
|
||
| let _ = process_started_event(&mut sensor_query, &spell_entity_query, a, b) | ||
| || process_started_event(&mut sensor_query, &spell_entity_query, b, a); | ||
| } | ||
| CollisionEvent::Stopped(a, b, _) => { | ||
| info!("CollisionEvent::Stopped"); | ||
| let _ = process_stopped_event(&mut sensor_query, &spell_entity_query, a, b) | ||
| || process_stopped_event(&mut sensor_query, &spell_entity_query, b, a); | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| fn process_started_event( | ||
| sensor_query: &mut Query<&mut InteractionSensor>, | ||
| spell_entity_query: &Query<(Entity, &SpellEntity)>, | ||
| a: &Entity, | ||
| b: &Entity, | ||
| ) -> bool { | ||
| match (sensor_query.get_mut(*a), spell_entity_query.get(*b)) { | ||
| (Ok(mut sensor), Ok((spell_entity, _))) => { | ||
| println!("spell_entity: {:?}", spell_entity); | ||
| sensor.entities.insert(spell_entity); | ||
| true | ||
| } | ||
| _ => false, | ||
| } | ||
| } | ||
|
|
||
| fn process_stopped_event( | ||
| sensor_query: &mut Query<&mut InteractionSensor>, | ||
| spell_entity_query: &Query<(Entity, &SpellEntity)>, | ||
| a: &Entity, | ||
| b: &Entity, | ||
| ) -> bool { | ||
| match (sensor_query.get_mut(*a), spell_entity_query.get(*b)) { | ||
| (Ok(mut sensor), Ok((spell_entity, _))) => { | ||
| sensor.entities.remove(&spell_entity); | ||
| true | ||
| } | ||
| _ => false, | ||
| } | ||
| } | ||
|
|
||
| fn pick_up( | ||
| mut sensor_query: Query<&InteractionSensor>, | ||
| mut player_query: Query<&mut Player>, | ||
| spell_query: Query<&SpellEntity>, | ||
| mut commands: Commands, | ||
| keys: Res<ButtonInput<KeyCode>>, | ||
| ) { | ||
| if keys.just_pressed(KeyCode::KeyE) { | ||
| let sensor = sensor_query.single_mut(); | ||
| if let Ok(mut player) = player_query.get_single_mut() { | ||
| for entity in &sensor.entities { | ||
| if let Ok(SpellEntity(spell)) = spell_query.get(*entity) { | ||
| if let Some(index) = player.inventory.iter().position(|i| i.is_none()) { | ||
| player.inventory[index] = Some(InventoryItem::Spell(*spell)); | ||
| commands.entity(*entity).despawn_recursive(); | ||
|
|
||
| // エンティティを削除すれば Stopped イベントが発生してリストから消えるので、 | ||
| // ここで削除する必要はない | ||
| // entities.remove(entity); | ||
| } else { | ||
| warn!("Inventory is full"); | ||
| } | ||
| } else { | ||
| warn!("SpellEntity not found"); | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| pub struct EntityPickerPlugin; | ||
|
|
||
| impl Plugin for EntityPickerPlugin { | ||
| fn build(&self, app: &mut App) { | ||
| app.add_systems( | ||
| Update, | ||
| (update_interaction_sensor_transform,).run_if(in_state(GameState::InGame)), | ||
| ); | ||
| app.add_systems( | ||
| FixedUpdate, | ||
| (interaction, pick_up) | ||
| .run_if(in_state(GameState::InGame)) | ||
| .in_set(GameSet) | ||
| .before(PhysicsSet::SyncBackend), | ||
| ); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.