From b7a998146fbc331c0155f2869b4fc0ac960e1b40 Mon Sep 17 00:00:00 2001 From: Jeffrey Jones Date: Wed, 17 Nov 2021 21:42:50 +0900 Subject: [PATCH] Format the protos format the protos using clang-format --- protos/dcs/coalition/v0/coalition.proto | 167 +++++++++++----------- protos/dcs/common/v0/common.proto | 27 ++-- protos/dcs/controller/v0/controller.proto | 3 +- protos/dcs/custom/v0/custom.proto | 6 +- protos/dcs/hook/v0/hook.proto | 6 +- protos/dcs/mission/v0/mission.proto | 18 +-- protos/dcs/timer/v0/timer.proto | 9 +- protos/dcs/trigger/v0/trigger.proto | 27 ++-- protos/dcs/unit/v0/unit.proto | 17 +-- protos/dcs/world/v0/world.proto | 3 +- 10 files changed, 128 insertions(+), 155 deletions(-) diff --git a/protos/dcs/coalition/v0/coalition.proto b/protos/dcs/coalition/v0/coalition.proto index 82b89338..099dcc44 100644 --- a/protos/dcs/coalition/v0/coalition.proto +++ b/protos/dcs/coalition/v0/coalition.proto @@ -19,105 +19,104 @@ service CoalitionService { * See https://wiki.hoggitworld.com/view/DCS_func_getMainRefPoint for more * details */ - rpc GetBullseye(GetBullseyeRequest) - returns (GetBullseyeResponse) {} + rpc GetBullseye(GetBullseyeRequest) returns (GetBullseyeResponse) {} // https://wiki.hoggitworld.com/view/DCS_func_getPlayers rpc GetPlayers(GetPlayersRequest) returns (GetPlayersResponse) {} } message AddGroupRequest { - // The coalition is determined by the provided Country - // and the coalition setup of the mission - dcs.common.v0.Country country = 2; - dcs.common.v0.GroupCategory group_category = 3; - oneof template { - GroundGroupTemplate ground_template = 4; - ShipGroupTemplate ship_template = 5; - HelicopterGroupTemplate helicopter_template = 6; - PlaneGroupTemplate plane_template = 7; - } - - message GroundGroupTemplate { - optional uint32 group_id = 1; - bool hidden = 2; - bool late_activation = 3; - string name = 4; - dcs.common.v0.Position position = 5; - repeated Point route = 6; - uint32 start_time = 7; - string task = 8; - bool task_selected = 9; - repeated Task tasks = 10; - bool uncontrollable = 11; - repeated GroundUnitTemplate units = 12; - bool visible = 13; - } - message GroundUnitTemplate { - string name = 1; - string type = 2; - dcs.common.v0.Position position = 3; - optional uint32 unit_id = 4; - optional uint32 heading = 5; - Skill skill = 6; - } - - message ShipGroupTemplate {} - message ShipUnitTemplate {} - - message HelicopterGroupTemplate {} - message HelicopterUnitTemplate {} - - message PlaneGroupTemplate {} - message PlaneUnitTemplate {} - - message Point { - enum AltitudeType { - ALTITUDE_TYPE_UNSPECIFIED = 0; - ALTITUDE_TYPE_BAROMETRIC = 1; - ALTITUDE_TYPE_RADIO = 2; - } - - enum Type { - TYPE_UNSPECIFIED = 0; - TAKEOFF = 1; - TAKEOFF_PARKING = 2; - TURNING_POINT = 3; - TAKEOFF_PARKING_HOT = 4; - LAND = 5; - } - - dcs.common.v0.Position position = 1; - AltitudeType altitude_type = 2; - Type type = 3; - string action = 4; - string form = 5; - double speed = 6; - } - - enum Skill { - SKILL_RANDOM = 0; - SKILL_AVERAGE = 1; - SKILL_GOOD = 2; - SKILL_HIGH = 3; - SKILL_EXCELLENT = 4; - SKILL_PLAYER = 5; - } - - message Task{} + // The coalition is determined by the provided Country + // and the coalition setup of the mission + dcs.common.v0.Country country = 2; + dcs.common.v0.GroupCategory group_category = 3; + oneof template { + GroundGroupTemplate ground_template = 4; + ShipGroupTemplate ship_template = 5; + HelicopterGroupTemplate helicopter_template = 6; + PlaneGroupTemplate plane_template = 7; + } + + message GroundGroupTemplate { + optional uint32 group_id = 1; + bool hidden = 2; + bool late_activation = 3; + string name = 4; + dcs.common.v0.Position position = 5; + repeated Point route = 6; + uint32 start_time = 7; + string task = 8; + bool task_selected = 9; + repeated Task tasks = 10; + bool uncontrollable = 11; + repeated GroundUnitTemplate units = 12; + bool visible = 13; + } + message GroundUnitTemplate { + string name = 1; + string type = 2; + dcs.common.v0.Position position = 3; + optional uint32 unit_id = 4; + optional uint32 heading = 5; + Skill skill = 6; + } + + message ShipGroupTemplate {} + message ShipUnitTemplate {} + + message HelicopterGroupTemplate {} + message HelicopterUnitTemplate {} + + message PlaneGroupTemplate {} + message PlaneUnitTemplate {} + + message Point { + enum AltitudeType { + ALTITUDE_TYPE_UNSPECIFIED = 0; + ALTITUDE_TYPE_BAROMETRIC = 1; + ALTITUDE_TYPE_RADIO = 2; + } + + enum Type { + TYPE_UNSPECIFIED = 0; + TAKEOFF = 1; + TAKEOFF_PARKING = 2; + TURNING_POINT = 3; + TAKEOFF_PARKING_HOT = 4; + LAND = 5; + } + + dcs.common.v0.Position position = 1; + AltitudeType altitude_type = 2; + Type type = 3; + string action = 4; + string form = 5; + double speed = 6; + } + + enum Skill { + SKILL_RANDOM = 0; + SKILL_AVERAGE = 1; + SKILL_GOOD = 2; + SKILL_HIGH = 3; + SKILL_EXCELLENT = 4; + SKILL_PLAYER = 5; + } + + message Task {} } message AddGroupResponse { - dcs.common.v0.Group group = 1; + dcs.common.v0.Group group = 1; } message GetGroupsRequest { - dcs.common.v0.Coalition coalition = 1; - optional dcs.common.v0.GroupCategory category = 2; + dcs.common.v0.Coalition coalition = 1; + optional dcs.common.v0.GroupCategory category = 2; } message GetGroupsResponse { - repeated dcs.common.v0.Group groups = 1; + repeated dcs.common.v0.Group groups = 1; } message GetBullseyeRequest { diff --git a/protos/dcs/common/v0/common.proto b/protos/dcs/common/v0/common.proto index 0b397494..9b0565c6 100644 --- a/protos/dcs/common/v0/common.proto +++ b/protos/dcs/common/v0/common.proto @@ -221,10 +221,10 @@ message Unit { * An instance of a DCS group */ message Group { - uint32 id = 1; // The DCS generated ID - string name = 2; // The name of the group as assigned in the mission editor - Coalition coalition = 3; // The coalition of the group - GroupCategory category = 4; // The group category. + uint32 id = 1; // The DCS generated ID + string name = 2; // The name of the group as assigned in the mission editor + Coalition coalition = 3; // The coalition of the group + GroupCategory category = 4; // The group category. } /** @@ -260,14 +260,12 @@ message Weapon { * These objects are often buildings but can also be vehicles that have no AI or * other game behaviour aside from being destroyable */ -message Static { -} +message Static {} /** * An instance of a DCS scenery object */ -message Scenery { -} +message Scenery {} /** * An instance of a DCS Airfield @@ -295,8 +293,7 @@ message Airbase { /** * An instance of a DCS Cargo object */ -message Cargo { -} +message Cargo {} /* * The initiator of an event @@ -352,12 +349,12 @@ message MarkPanel { } /** - * A vector in a left-handed coordinate system with +z being north, -z south, +x east, -x west, - * +y up and -y down (as opposed to DCS' unusual right-handed coordinate system where x is north/ - * south and z is west/east; the underlying conversion is basically swapping `x` and `z` as in `x=z` - * and `z=x`). + * A vector in a left-handed coordinate system with +z being north, -z south, +x + * east, -x west, +y up and -y down (as opposed to DCS' unusual right-handed + * coordinate system where x is north/ south and z is west/east; the underlying + * conversion is basically swapping `x` and `z` as in `x=z` and `z=x`). */ - message Vector { +message Vector { double x = 1; double y = 2; double z = 3; diff --git a/protos/dcs/controller/v0/controller.proto b/protos/dcs/controller/v0/controller.proto index 59b44523..835ee9ed 100644 --- a/protos/dcs/controller/v0/controller.proto +++ b/protos/dcs/controller/v0/controller.proto @@ -21,5 +21,4 @@ message SetAlarmStateRequest { AlarmState alarm_state = 3; } -message SetAlarmStateResponse { -} +message SetAlarmStateResponse {} diff --git a/protos/dcs/custom/v0/custom.proto b/protos/dcs/custom/v0/custom.proto index 19210a2e..1c50e4cd 100644 --- a/protos/dcs/custom/v0/custom.proto +++ b/protos/dcs/custom/v0/custom.proto @@ -32,16 +32,14 @@ message RequestMissionAssignmentRequest { string mission_type = 2; } -message RequestMissionAssignmentResponse { -} +message RequestMissionAssignmentResponse {} message JoinMissionRequest { string unit_name = 1; int32 mission_code = 2; } -message JoinMissionResponse { -} +message JoinMissionResponse {} message EvalRequest { string lua = 1; diff --git a/protos/dcs/hook/v0/hook.proto b/protos/dcs/hook/v0/hook.proto index dc0c9e6a..296d3752 100644 --- a/protos/dcs/hook/v0/hook.proto +++ b/protos/dcs/hook/v0/hook.proto @@ -15,15 +15,13 @@ service HookService { rpc Eval(EvalRequest) returns (EvalResponse) {} } -message GetMissionNameRequest { -} +message GetMissionNameRequest {} message GetMissionNameResponse { string name = 1; } -message StreamChatMessagesRequest { -} +message StreamChatMessagesRequest {} message StreamChatMessagesResponse { // The ID of the player sending the chat messaage. diff --git a/protos/dcs/mission/v0/mission.proto b/protos/dcs/mission/v0/mission.proto index b0fab7e6..7b07a90e 100644 --- a/protos/dcs/mission/v0/mission.proto +++ b/protos/dcs/mission/v0/mission.proto @@ -25,8 +25,7 @@ service MissionService { returns (GetScenarioCurrentTimeResponse) {} } -message StreamEventsRequest { -} +message StreamEventsRequest {} // The DCS Event information. Contains event information and a timestamp. message StreamEventsResponse { @@ -114,12 +113,10 @@ message StreamEventsResponse { } // Occurs when the mission starts. - message MissionStartEvent { - } + message MissionStartEvent {} // Occurs when the mission stops. - message MissionEndEvent { - } + message MissionEndEvent {} // Occurs when an aircraft is finished taking fuel. message RefuelingStopEvent { @@ -263,8 +260,7 @@ message StreamEventsResponse { } // A score change (doesn't contain any useful information) - message ScoreEvent { - } + message ScoreEvent {} // A unit got destroyed. message UnitLostEvent { @@ -376,15 +372,13 @@ message StreamUnitsResponse { } } -message GetScenarioStartTimeRequest { -} +message GetScenarioStartTimeRequest {} message GetScenarioStartTimeResponse { string datetime = 1; } -message GetScenarioCurrentTimeRequest { -} +message GetScenarioCurrentTimeRequest {} message GetScenarioCurrentTimeResponse { string datetime = 1; diff --git a/protos/dcs/timer/v0/timer.proto b/protos/dcs/timer/v0/timer.proto index 9c40bc80..838b0fcb 100644 --- a/protos/dcs/timer/v0/timer.proto +++ b/protos/dcs/timer/v0/timer.proto @@ -15,15 +15,13 @@ service TimerService { rpc GetTimeZero(GetTimeZeroRequest) returns (GetTimeZeroResponse) {} } -message GetTimeRequest { -} +message GetTimeRequest {} message GetTimeResponse { double time = 1; } -message GetAbsoluteTimeRequest { -} +message GetAbsoluteTimeRequest {} message GetAbsoluteTimeResponse { // The current time in seconds since 00:00 of the start date of the mission. @@ -33,8 +31,7 @@ message GetAbsoluteTimeResponse { int32 year = 4; } -message GetTimeZeroRequest { -} +message GetTimeZeroRequest {} message GetTimeZeroResponse { // The time in seconds since 00:00. diff --git a/protos/dcs/trigger/v0/trigger.proto b/protos/dcs/trigger/v0/trigger.proto index 444842fb..c8d99c90 100644 --- a/protos/dcs/trigger/v0/trigger.proto +++ b/protos/dcs/trigger/v0/trigger.proto @@ -54,8 +54,7 @@ message OutTextRequest { bool clear_view = 3; } -message OutTextResponse { -} +message OutTextResponse {} message OutTextForCoalitionRequest { string text = 1; @@ -64,8 +63,7 @@ message OutTextForCoalitionRequest { dcs.common.v0.Coalition coalition = 4; } -message OutTextForCoalitionResponse { -} +message OutTextForCoalitionResponse {} message OutTextForGroupRequest { string text = 1; @@ -74,8 +72,7 @@ message OutTextForGroupRequest { uint32 group_id = 4; } -message OutTextForGroupResponse { -} +message OutTextForGroupResponse {} message GetUserFlagRequest { string flag = 1; @@ -90,8 +87,7 @@ message SetUserFlagRequest { uint32 value = 2; } -message SetUserFlagResponse { -} +message SetUserFlagResponse {} message MarkToAllRequest { string text = 2; @@ -134,16 +130,14 @@ message RemoveMarkRequest { uint32 id = 1; } -message RemoveMarkResponse { -} +message RemoveMarkResponse {} message ExplosionRequest { dcs.common.v0.Position position = 1; uint32 power = 2; } -message ExplosionResponse { -} +message ExplosionResponse {} message SmokeRequest { enum SmokeColor { @@ -161,8 +155,7 @@ message SmokeRequest { SmokeColor color = 2; } -message SmokeResponse { -} +message SmokeResponse {} message IlluminationBombRequest { // The altitude of Illumination Bombs is meters above ground. Ground level @@ -171,8 +164,7 @@ message IlluminationBombRequest { uint32 power = 2; } -message IlluminationBombResponse { -} +message IlluminationBombResponse {} message SignalFlareRequest { enum FlareColor { @@ -190,5 +182,4 @@ message SignalFlareRequest { uint32 azimuth = 3; } -message SignalFlareResponse { -} \ No newline at end of file +message SignalFlareResponse {} \ No newline at end of file diff --git a/protos/dcs/unit/v0/unit.proto b/protos/dcs/unit/v0/unit.proto index 07dfc9b6..a7c779bd 100644 --- a/protos/dcs/unit/v0/unit.proto +++ b/protos/dcs/unit/v0/unit.proto @@ -22,7 +22,8 @@ service UnitService { rpc Get(GetRequest) returns (GetResponse) {} /** - * Get information about the unit in 3D space, including its position, orientation and velocity. + * Get information about the unit in 3D space, including its position, + * orientation and velocity. */ rpc GetTransform(GetTransformRequest) returns (GetTransformResponse) {} } @@ -72,14 +73,15 @@ message GetTransformResponse { double u = 2; // Distance between DCS' map origin to object in meters on north-south axis. double v = 3; - // The heading of the object on a flat world. To get the heading corrected by the projection error - // when going from a flat to a spherical world, use `orientation.yaw` instead. + // The heading of the object on a flat world. To get the heading corrected by + // the projection error when going from a flat to a spherical world, use + // `orientation.yaw` instead. double heading = 4; Orientation orientation = 5; - // The direction the object is traveling to, and speed (magnitude of the vector) the object is - // traveling with. + // The direction the object is traveling to, and speed (magnitude of the + // vector) the object is traveling with. dcs.common.v0.Vector velocity = 6; - double time = 7; // Time in seconds since the scenario started. + double time = 7; // Time in seconds since the scenario started. } message GetPlayerNameRequest { @@ -104,8 +106,7 @@ message SetEmissionRequest { bool emitting = 2; } -message SetEmissionResponse { -} +message SetEmissionResponse {} message GetRequest { string name = 1; diff --git a/protos/dcs/world/v0/world.proto b/protos/dcs/world/v0/world.proto index 647e1c5b..9220a982 100644 --- a/protos/dcs/world/v0/world.proto +++ b/protos/dcs/world/v0/world.proto @@ -19,8 +19,7 @@ message GetAirbasesResponse { repeated dcs.common.v0.Airbase airbases = 1; } -message GetMarkPanelsRequest { -} +message GetMarkPanelsRequest {} message GetMarkPanelsResponse { repeated dcs.common.v0.MarkPanel mark_panels = 1;