Skip to content

Commit

Permalink
--wip-- [skip ci]
Browse files Browse the repository at this point in the history
  • Loading branch information
MaikRe committed May 26, 2024
1 parent 15b3dd7 commit 2d660a8
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 8 deletions.
13 changes: 13 additions & 0 deletions crates/control/src/game_controller_state_filter.rs
Original file line number Diff line number Diff line change
Expand Up @@ -61,12 +61,25 @@ impl GameControllerStateFilter {
&mut self.opponent_state,
*context.is_referee_initial_pose_detected,
);
/*
let filtered_penalties = context.player_role_mapping.iter.find_in_penalties_or_something.collect();
For each role in mapping find the corresponding player and assign that role the penalty of the player based on the game controller penalties
New node which filters player mappings based on the incoming messages
When coming in from penalized and not registered in config yet, make sure to register self by sending message
Allow giving none to role number in pepsi playernumber so substitutes can be deployed at same time as everyone else (explicit None?)
*/
let filtered_game_controller_state = FilteredGameControllerState {
game_state: game_states.own,
opponent_game_state: game_states.opponent,
game_phase: context.game_controller_state.game_phase,
kicking_team: context.game_controller_state.kicking_team,
penalties: context.game_controller_state.penalties,
//todo!filter penalties from playersnumbers to rolenumbers
remaining_number_of_messages: context
.game_controller_state
.remaining_amount_of_messages,
Expand Down
10 changes: 2 additions & 8 deletions crates/spl_network_messages/src/game_controller_state_message.rs
Original file line number Diff line number Diff line change
Expand Up @@ -112,19 +112,13 @@ impl TryFrom<RoboCupGameControlData> for GameControllerStateMessage {
}
})
.collect();
if message.playersPerTeam > MAX_NUM_PLAYERS {
bail!(
"unexpected number of players per team. Expected: {MAX_NUM_PLAYERS}. Got: {}",
message.playersPerTeam
);
}
let hulks_players = (0..message.playersPerTeam)
let hulks_players = (0..MAX_NUM_PLAYERS)
.map(|player_index| {
message.teams[hulks_team_index].players[player_index as usize].try_into()
})
.collect::<Result<Vec<_>>>()?;
// todo!("Assign penalties to players not roles");
let opponent_players = (0..message.playersPerTeam)
let opponent_players = (0..MAX_NUM_PLAYERS)
.map(|player_index| {
message.teams[opponent_team_index].players[player_index as usize].try_into()
})
Expand Down

0 comments on commit 2d660a8

Please sign in to comment.