p71924506
/
carla
mirror of https://github.com/carla-simulator/carla.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'xisco' into nestor

This commit is contained in:
nsubiron 2017-05-29 15:13:15 +01:00
parent 9fdf4d98f8 1694228768
commit 41f1aaf707
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/CarlaServer/source/carla/CarlaServer.h
View File

@ -47,8 +47,8 @@ namespace carla {
float steer;
float gas;
float brake;
float hand_brake;
float gear;
bool hand_brake;
bool gear;
};
struct Reward_Values {

6
Source/CarlaServer/source/carla/server/CarlaCommunication.cpp
View File

@ -199,8 +199,8 @@ namespace server {
control_values.steer = 0.0f;
control_values.gas = 0.0f;
control_values.brake = 0.0f;
control_values.hand_brake = 0.0f;
control_values.gear = 0.0f;
control_values.hand_brake = false;
control_values.reverse = false;
auto message = _clientThread.tryPop();
if (message == nullptr) { return false; }
@ -212,7 +212,7 @@ namespace server {
control_values.gas = control.gas();
control_values.brake = control.brake();
control_values.hand_brake = control.hand_brake();
control_values.gear = control.gear();
control_values.reverse = control.reverse();
return true;
}

4
Source/CarlaServer/source/carla/server/carla_protocol.proto
View File

@ -25,8 +25,8 @@ message Control {
optional float steer = 1;
optional float gas = 2;
optional float brake = 3;
optional float hand_brake = 4;
optional float gear = 5;
optional bool hand_brake = 4;
optional bool reverse = 5;
}