server side attack. TODO: fix origin on shooter

client/src/main.rs

@@ -23,7 +23,9 @@ use renet_visualizer::{RenetClientVisualizer, RenetVisualizerStyle};
 struct MainCamera;
 
 #[derive(Component)]
-struct ControlledPlayer;
+struct ControlledPlayer {
+    aiming_at: Vec2,
+}
 
 #[derive(Default)]
 struct NetworkMapping(HashMap<Entity, Entity>);
@@ -118,12 +120,15 @@ fn update_visulizer_system(
 }
 
 fn player_input(
+    controlled_player_query: Query<(&Transform, &ControlledPlayer)>,
     keyboard_input: Res<Input<KeyCode>>,
     mut player_input: ResMut<PlayerInput>,
     mouse_button_input: Res<Input<MouseButton>>,
     mut player_commands: EventWriter<PlayerCommand>,
     most_recent_tick: Res<MostRecentTick>,
 ) {
+    let (transform, controlled_player) = controlled_player_query.single();
+
     player_input.left = keyboard_input.pressed(KeyCode::A) || keyboard_input.pressed(KeyCode::Left);
     player_input.right =
         keyboard_input.pressed(KeyCode::D) || keyboard_input.pressed(KeyCode::Right);
@@ -132,17 +137,23 @@ fn player_input(
     player_input.most_recent_tick = most_recent_tick.0;
 
     if mouse_button_input.just_pressed(MouseButton::Left) {
+        info!(
+            "player at origin {} fired at {}",
+            transform.translation, controlled_player.aiming_at
+        );
+
         player_commands.send(PlayerCommand::BasicAttack {
-            fired_at: Vec2::default(), // TODO: spawn projectiles correctly
+            origin: Vec2::new(transform.translation.x, transform.translation.y),
+            direction: controlled_player.aiming_at,
         });
     }
 }
 
 fn cursor_system(
     wnds: Res<Windows>,
-    q_camera: Query<(&Camera, &GlobalTransform), With<MainCamera>>,
+    mut q_camera: Query<(&Camera, &mut ControlledPlayer, &GlobalTransform), With<ControlledPlayer>>,
 ) {
-    let (camera, camera_transform) = q_camera.single();
+    let (camera, mut controlled_player, camera_transform) = q_camera.single_mut();
 
     let wnd = if let RenderTarget::Window(id) = camera.target {
         wnds.get(id).unwrap()
@@ -158,7 +169,7 @@ fn cursor_system(
         let world_pos = ndc_to_world.project_point3(ndc.extend(-1.0));
         let world_pos: Vec2 = world_pos.truncate();
 
-        info!("World coords: {}/{}", world_pos.x, world_pos.y);
+        controlled_player.aiming_at = world_pos;
     }
 }
 
@@ -204,7 +215,9 @@ fn client_sync_players(
                 });
 
                 if client_id == id {
-                    client_entity.insert(ControlledPlayer);
+                    client_entity.insert(ControlledPlayer {
+                        aiming_at: Vec2::new(0., 0.),
+                    });
                 }
 
                 let player_info = PlayerInfo {
@@ -230,7 +243,7 @@ fn client_sync_players(
             }
             ServerMessages::SpawnProjectile {
                 entity,
-                position,
+                origin,
                 direction,
             } => {
                 let projectile_entity = commands.spawn_bundle(SpriteBundle {
@@ -278,5 +291,7 @@ fn client_sync_players(
 fn setup_camera(mut commands: Commands) {
     commands
         .spawn_bundle(Camera2dBundle::default())
-        .insert(MainCamera);
+        .insert(ControlledPlayer {
+            aiming_at: Vec2::new(0., 0.),
+        });
 }