From 8a61dc213fab54279850a0cc94ab8ef9aa3257d5 Mon Sep 17 00:00:00 2001 From: Soroush Mazloum Date: Sun, 13 Oct 2024 07:03:00 +0330 Subject: [PATCH 1/5] time_stopped added --- idl/grpc/service.proto | 1 + idl/thrift/soccer_service.thrift | 3 ++- src/grpc-client/state_generator.cpp | 1 + src/thrift-client/thrift_state_generator.cpp | 1 + 4 files changed, 5 insertions(+), 1 deletion(-) diff --git a/idl/grpc/service.proto b/idl/grpc/service.proto index f54aba18..776b1408 100644 --- a/idl/grpc/service.proto +++ b/idl/grpc/service.proto @@ -298,6 +298,7 @@ message WorldModel { bool kickable_opponent_existance = 37; PenaltyKickState penalty_kick_state = 38; int32 see_time = 39; + int32 time_stopped = 40; } message State { diff --git a/idl/thrift/soccer_service.thrift b/idl/thrift/soccer_service.thrift index 541e92b7..4d0e770f 100644 --- a/idl/thrift/soccer_service.thrift +++ b/idl/thrift/soccer_service.thrift @@ -300,7 +300,8 @@ struct WorldModel { 36: bool kickable_teammate_existance, 37: bool kickable_opponent_existance, 38: PenaltyKickState penalty_kick_state, - 39: i32 see_time + 39: i32 see_time, + 40: i32 time_stopped } struct State { diff --git a/src/grpc-client/state_generator.cpp b/src/grpc-client/state_generator.cpp index 61ccb7f5..59a48d73 100644 --- a/src/grpc-client/state_generator.cpp +++ b/src/grpc-client/state_generator.cpp @@ -533,6 +533,7 @@ protos::WorldModel *StateGenerator::convertWorldModel(const rcsc::WorldModel &wm res->set_allocated_penalty_kick_state(convertPenaltyKickState(wm, wm.penaltyKickState())); } res->set_see_time(wm.seeTime().cycle()); + res->set_time_stopped(wm.time().stopped()); return res; } diff --git a/src/thrift-client/thrift_state_generator.cpp b/src/thrift-client/thrift_state_generator.cpp index 08b79214..ebaa0584 100644 --- a/src/thrift-client/thrift_state_generator.cpp +++ b/src/thrift-client/thrift_state_generator.cpp @@ -561,6 +561,7 @@ soccer::WorldModel ThriftStateGenerator::convertWorldModel(const rcsc::WorldMode res.penalty_kick_state = convertPenaltyKickState(wm, wm.penaltyKickState()); } res.see_time = wm.seeTime().cycle(); + res.time_stopped = wm.time().stopped(); return res; } From e850dcc36ee1a5c9bfb524bcda4f5e138b6e82c4 Mon Sep 17 00:00:00 2001 From: Soroush Mazloum Date: Mon, 14 Oct 2024 21:31:01 +0330 Subject: [PATCH 2/5] set_play_count added --- idl/grpc/service.proto | 1 + idl/thrift/soccer_service.thrift | 3 ++- src/grpc-client/state_generator.cpp | 1 + src/thrift-client/thrift_state_generator.cpp | 1 + 4 files changed, 5 insertions(+), 1 deletion(-) diff --git a/idl/grpc/service.proto b/idl/grpc/service.proto index 776b1408..6b5d54bf 100644 --- a/idl/grpc/service.proto +++ b/idl/grpc/service.proto @@ -299,6 +299,7 @@ message WorldModel { PenaltyKickState penalty_kick_state = 38; int32 see_time = 39; int32 time_stopped = 40; + int32 set_play_count = 41; } message State { diff --git a/idl/thrift/soccer_service.thrift b/idl/thrift/soccer_service.thrift index 4d0e770f..0dc20b17 100644 --- a/idl/thrift/soccer_service.thrift +++ b/idl/thrift/soccer_service.thrift @@ -301,7 +301,8 @@ struct WorldModel { 37: bool kickable_opponent_existance, 38: PenaltyKickState penalty_kick_state, 39: i32 see_time, - 40: i32 time_stopped + 40: i32 time_stopped, + 41: i32 set_play_count } struct State { diff --git a/src/grpc-client/state_generator.cpp b/src/grpc-client/state_generator.cpp index 59a48d73..889d9905 100644 --- a/src/grpc-client/state_generator.cpp +++ b/src/grpc-client/state_generator.cpp @@ -534,6 +534,7 @@ protos::WorldModel *StateGenerator::convertWorldModel(const rcsc::WorldModel &wm } res->set_see_time(wm.seeTime().cycle()); res->set_time_stopped(wm.time().stopped()); + res->set_set_play_count(wm.getSetPlayCount()); return res; } diff --git a/src/thrift-client/thrift_state_generator.cpp b/src/thrift-client/thrift_state_generator.cpp index ebaa0584..a79562dc 100644 --- a/src/thrift-client/thrift_state_generator.cpp +++ b/src/thrift-client/thrift_state_generator.cpp @@ -562,6 +562,7 @@ soccer::WorldModel ThriftStateGenerator::convertWorldModel(const rcsc::WorldMode } res.see_time = wm.seeTime().cycle(); res.time_stopped = wm.time().stopped(); + res.set_play_count = wm.getSetPlayCount(); return res; } From 49c3b26de3aaa78335529fb5fa21329b99eba01b Mon Sep 17 00:00:00 2001 From: Soroush Mazloum Date: Wed, 16 Oct 2024 23:34:26 +0330 Subject: [PATCH 3/5] goal_area_width/length and ChangLog.md --- ChangeLog.md | 18 ++++++++++++++++++ idl/grpc/service.proto | 4 +++- idl/thrift/soccer_service.thrift | 6 ++++-- src/grpc-client/grpc_client.cpp | 2 ++ src/thrift-client/thrift_client.cpp | 2 ++ 5 files changed, 29 insertions(+), 3 deletions(-) diff --git a/ChangeLog.md b/ChangeLog.md index 7ec536b3..bc9cc637 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -1,5 +1,23 @@ # ChangeLog +## [1.0.5] - 2024-10-16 + +### Added +- wm.see_time, serverParams.goal_area_width/length + +### Fixed +- + +### Changed +- + +### Engineers +- [NaderZare](https://github.com/naderzare) +- [SadraKhanjari](https://github.com/SK2iP) +- [SoroushMazloum](https://github.com/SoroushMazloum) + +======= + ## [1.0.4] - 2024-10-8 ### Added diff --git a/idl/grpc/service.proto b/idl/grpc/service.proto index 6b5d54bf..95f26583 100644 --- a/idl/grpc/service.proto +++ b/idl/grpc/service.proto @@ -1,4 +1,4 @@ -// version 1.4 +// version 1.5 syntax = "proto3"; @@ -1186,6 +1186,8 @@ message ServerParam { float penalty_area_half_width = 220; float penalty_area_length = 221; float goal_width = 222; + float goal_area_width = 223; + float goal_area_length = 224; } message PlayerParam { diff --git a/idl/thrift/soccer_service.thrift b/idl/thrift/soccer_service.thrift index 0dc20b17..a36bbe77 100644 --- a/idl/thrift/soccer_service.thrift +++ b/idl/thrift/soccer_service.thrift @@ -1,4 +1,4 @@ -// version 1.4 +// version 1.5 namespace cpp soccer namespace py soccer @@ -1144,7 +1144,9 @@ struct ServerParam { 219: double their_penalty_area_line_x, 220: double penalty_area_half_width, 221: double penalty_area_length, - 222: double goal_width + 222: double goal_width, + 223: double goal_area_width, + 224: double goal_area_length } struct PlayerParam { diff --git a/src/grpc-client/grpc_client.cpp b/src/grpc-client/grpc_client.cpp index 9f36ca6f..de7eb591 100644 --- a/src/grpc-client/grpc_client.cpp +++ b/src/grpc-client/grpc_client.cpp @@ -277,6 +277,8 @@ void GrpcClient::sendServerParam() const serverParam.set_their_penalty_area_line_x(SP.theirPenaltyAreaLineX()); serverParam.set_penalty_area_half_width(SP.penaltyAreaHalfWidth()); serverParam.set_penalty_area_length(SP.penaltyAreaLength()); + serverParam.set_goal_area_width(SP.goalAreaWidth()); + serverParam.set_goal_area_length(SP.goalAreaLength()); ClientContext context; protos::Empty empty; diff --git a/src/thrift-client/thrift_client.cpp b/src/thrift-client/thrift_client.cpp index 495c63ca..f0c377f1 100644 --- a/src/thrift-client/thrift_client.cpp +++ b/src/thrift-client/thrift_client.cpp @@ -258,6 +258,8 @@ void ThriftAgent::sendServerParam() const serverParam.their_penalty_area_line_x = SP.theirPenaltyAreaLineX(); serverParam.penalty_area_half_width = SP.penaltyAreaHalfWidth(); serverParam.penalty_area_length = SP.penaltyAreaLength(); + serverParam.goal_area_width = SP.goalAreaWidth(); + serverParam.goal_area_length = SP.goalAreaLength(); try{ soccer::Empty empty; From c17942bf2e0403cf332401e768be72df82ed7df4 Mon Sep 17 00:00:00 2001 From: Soroush Mazloum Date: Wed, 16 Oct 2024 23:38:37 +0330 Subject: [PATCH 4/5] fix: ChangeLog.md --- ChangeLog.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ChangeLog.md b/ChangeLog.md index bc9cc637..50f82fb5 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -3,7 +3,7 @@ ## [1.0.5] - 2024-10-16 ### Added -- wm.see_time, serverParams.goal_area_width/length +- wm.time_stopped, wm.set_play_count, serverParams.goal_area_width/length ### Fixed - From 471687674df3e8fb7bc4084f3c722c1662c61ec5 Mon Sep 17 00:00:00 2001 From: ErfanFathi Date: Sat, 19 Oct 2024 11:54:58 -0700 Subject: [PATCH 5/5] added center_circle_r, goal_post_radius, game_mode_side --- ChangeLog.md | 16 ++++++++++++++++ idl/grpc/service.proto | 5 ++++- idl/thrift/soccer_service.thrift | 9 ++++++--- src/grpc-client/grpc_client.cpp | 3 ++- src/grpc-client/state_generator.cpp | 1 + src/thrift-client/thrift_client.cpp | 3 ++- src/thrift-client/thrift_state_generator.cpp | 1 + 7 files changed, 32 insertions(+), 6 deletions(-) diff --git a/ChangeLog.md b/ChangeLog.md index 50f82fb5..f34ec20b 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -1,5 +1,21 @@ # ChangeLog +## [1.0.6] - 2024-10-19 + +### Added +- ServerParam.center_circle_r, ServerParam.goal_post_radius, WorldModel.game_mode_side + +### Fixed +- + +### Changed +- + +### Engineers +- [ErfanFathi](https://github.com/ErfanFathii) + +======= + ## [1.0.5] - 2024-10-16 ### Added diff --git a/idl/grpc/service.proto b/idl/grpc/service.proto index 95f26583..349a692e 100644 --- a/idl/grpc/service.proto +++ b/idl/grpc/service.proto @@ -1,4 +1,4 @@ -// version 1.5 +// version 1.6 syntax = "proto3"; @@ -300,6 +300,7 @@ message WorldModel { int32 see_time = 39; int32 time_stopped = 40; int32 set_play_count = 41; + Side game_mode_side = 42; } message State { @@ -1188,6 +1189,8 @@ message ServerParam { float goal_width = 222; float goal_area_width = 223; float goal_area_length = 224; + float center_circle_r = 225; + float goal_post_radius = 226; } message PlayerParam { diff --git a/idl/thrift/soccer_service.thrift b/idl/thrift/soccer_service.thrift index a36bbe77..4377a5e0 100644 --- a/idl/thrift/soccer_service.thrift +++ b/idl/thrift/soccer_service.thrift @@ -1,4 +1,4 @@ -// version 1.5 +// version 1.6 namespace cpp soccer namespace py soccer @@ -302,7 +302,8 @@ struct WorldModel { 38: PenaltyKickState penalty_kick_state, 39: i32 see_time, 40: i32 time_stopped, - 41: i32 set_play_count + 41: i32 set_play_count, + 42: Side game_mode_side } struct State { @@ -1146,7 +1147,9 @@ struct ServerParam { 221: double penalty_area_length, 222: double goal_width, 223: double goal_area_width, - 224: double goal_area_length + 224: double goal_area_length, + 225: double center_circle_r, + 226: double goal_post_radius } struct PlayerParam { diff --git a/src/grpc-client/grpc_client.cpp b/src/grpc-client/grpc_client.cpp index de7eb591..4cb07185 100644 --- a/src/grpc-client/grpc_client.cpp +++ b/src/grpc-client/grpc_client.cpp @@ -279,7 +279,8 @@ void GrpcClient::sendServerParam() const serverParam.set_penalty_area_length(SP.penaltyAreaLength()); serverParam.set_goal_area_width(SP.goalAreaWidth()); serverParam.set_goal_area_length(SP.goalAreaLength()); - + serverParam.set_center_circle_r(SP.centerCircleR()); + serverParam.set_goal_post_radius(SP.goalPostRadius()); ClientContext context; protos::Empty empty; protos::RegisterResponse* response = new protos::RegisterResponse(*M_register_response); diff --git a/src/grpc-client/state_generator.cpp b/src/grpc-client/state_generator.cpp index 889d9905..ea35bf4b 100644 --- a/src/grpc-client/state_generator.cpp +++ b/src/grpc-client/state_generator.cpp @@ -535,6 +535,7 @@ protos::WorldModel *StateGenerator::convertWorldModel(const rcsc::WorldModel &wm res->set_see_time(wm.seeTime().cycle()); res->set_time_stopped(wm.time().stopped()); res->set_set_play_count(wm.getSetPlayCount()); + res->set_game_mode_side(convertSide(wm.gameMode().side())); return res; } diff --git a/src/thrift-client/thrift_client.cpp b/src/thrift-client/thrift_client.cpp index f0c377f1..f2e7b0a4 100644 --- a/src/thrift-client/thrift_client.cpp +++ b/src/thrift-client/thrift_client.cpp @@ -260,7 +260,8 @@ void ThriftAgent::sendServerParam() const serverParam.penalty_area_length = SP.penaltyAreaLength(); serverParam.goal_area_width = SP.goalAreaWidth(); serverParam.goal_area_length = SP.goalAreaLength(); - + serverParam.center_circle_r = SP.centerCircleR(); + serverParam.goal_post_radius = SP.goalPostRadius(); try{ soccer::Empty empty; serverParam.register_response = M_register_response; diff --git a/src/thrift-client/thrift_state_generator.cpp b/src/thrift-client/thrift_state_generator.cpp index a79562dc..49e800cd 100644 --- a/src/thrift-client/thrift_state_generator.cpp +++ b/src/thrift-client/thrift_state_generator.cpp @@ -563,6 +563,7 @@ soccer::WorldModel ThriftStateGenerator::convertWorldModel(const rcsc::WorldMode res.see_time = wm.seeTime().cycle(); res.time_stopped = wm.time().stopped(); res.set_play_count = wm.getSetPlayCount(); + res.game_mode_side = convertSide(wm.gameMode().side()); return res; }