Update RLBotCPP submodule and clean up examplebot code.

Author: kipje13

RLBotCPP

@@ -4,6 +4,7 @@
 #include <string>
 
 #include "bot.h"
+#include "color.h"
 #include "interface.h"
 #include "rlbot_generated.h"
 #include "scopedrenderer.h"
@@ -13,12 +14,12 @@
 
 ExampleBot::ExampleBot(int _index, int _team, std::string _name)
     : Bot(_index, _team, _name) {
-  rlbotcpp::GameState gamestate = rlbotcpp::GameState();
+  rlbot::GameState gamestate = rlbot::GameState();
 
   gamestate.ballState.physicsState.location = {0, 0, 1000};
   gamestate.ballState.physicsState.velocity = {0, 0, 5000};
 
-  rlbotcpp::CarState carstate = rlbotcpp::CarState();
+  rlbot::CarState carstate = rlbot::CarState();
   carstate.physicsState.location = {0, 500, 1000};
   carstate.physicsState.velocity = {500, 1000, 1000};
   carstate.physicsState.angularVelocity = {1, 2, 3};
@@ -27,14 +28,13 @@ ExampleBot::ExampleBot(int _index, int _team, std::string _name)
 
   gamestate.carStates[_index] = carstate;
 
-  rlbotcpp::Interface::SetGameState(gamestate);
+  rlbot::Interface::SetGameState(gamestate);
 }
 
-rlbotcpp::Controller
+rlbot::Controller
 ExampleBot::GetOutput(const rlbot::flat::GameTickPacket *gameTickPacket,
                       const rlbot::flat::FieldInfo *fieldInfo,
                       const rlbot::flat::BallPrediction *ballPrediction) {
-  rlbotcpp::Controller controller{0};
 
   rlbot::flat::Vector3 ballLocation =
       *gameTickPacket->ball()->physics()->location();
@@ -45,38 +45,39 @@ ExampleBot::GetOutput(const rlbot::flat::GameTickPacket *gameTickPacket,
   rlbot::flat::Rotator carRotation =
       *gameTickPacket->players()->Get(index)->physics()->rotation();
 
+  // Calculate the velocity of the ball.
   float velocity = sqrt(ballVelocity.x() * ballVelocity.x() +
                         ballVelocity.y() * ballVelocity.y() +
                         ballVelocity.z() * ballVelocity.z());
 
-  // This renderer will build and send the packet once it goes out of scope
-  rlbotcpp::ScopedRenderer renderer("test");
-
+  // Load the ballprediction into a vector to use for rendering.
   std::vector<const rlbot::flat::Vector3 *> points;
 
   for (uint32_t i = 0; i < ballPrediction->slices()->size(); i++) {
     points.push_back(ballPrediction->slices()->Get(i)->physics()->location());
   }
 
-  renderer.DrawPolyLine3D(rlbotcpp::Color{0xFF, 0x00, 0x00, 0xFF}, points);
+  // This renderer will build and send the packet once it goes out of scope.
+  rlbot::ScopedRenderer renderer("test");
 
-  renderer.DrawString2D("Hello world!", rlbotcpp::Color{0x00, 0xFF, 0x00, 0xFF},
+  renderer.DrawPolyLine3D(rlbot::Color::red, points);
+  renderer.DrawString2D("Hello world!", rlbot::Color::green,
                         rlbot::flat::Vector3{10, 10, 0}, 4, 4);
-
-  renderer.DrawString3D(std::to_string(velocity),
-                        rlbotcpp::Color{0xFF, 0x00, 0xFF, 0xFF}, ballLocation,
-                        2, 2);
+  renderer.DrawString3D(std::to_string(velocity), rlbot::Color::magenta,
+                        ballLocation, 2, 2);
 
   // Calculate to get the angle from the front of the bot's car to the ball.
   double botToTargetAngle = atan2(ballLocation.y() - carLocation.y(),
                                   ballLocation.x() - carLocation.x());
   double botFrontToTargetAngle = botToTargetAngle - carRotation.yaw();
-  // Correct the angle
+  // Correct the angle.
   if (botFrontToTargetAngle < -PI)
     botFrontToTargetAngle += 2 * PI;
   if (botFrontToTargetAngle > PI)
     botFrontToTargetAngle -= 2 * PI;
 
+  rlbot::Controller controller{0};
+
   // Decide which way to steer in order to get to the ball.
   if (botFrontToTargetAngle > 0)
     controller.steer = 1;

examplebot.cc

@@ -2,10 +2,10 @@
 
 #include "bot.h"
 
-class ExampleBot : public rlbotcpp::Bot {
+class ExampleBot : public rlbot::Bot {
 public:
   ExampleBot(int _index, int _team, std::string _name);
-  rlbotcpp::Controller
+  rlbot::Controller
   GetOutput(const rlbot::flat::GameTickPacket *gameTickPacket,
             const rlbot::flat::FieldInfo *fieldInfo,
             const rlbot::flat::BallPrediction *ballPrediction);

examplebot.h

@@ -23,8 +23,8 @@ uint16_t getPortFromFile(std::string filename) {
 }
 
 int main(int argc, char **argv) {
-  rlbotcpp::platform::SetWorkingDirectory(
-      rlbotcpp::platform::GetExecutableDirectory());
+  rlbot::platform::SetWorkingDirectory(
+	  rlbot::platform::GetExecutableDirectory());
   uint16_t port = getPortFromFile("port.cfg");
 
   std::string interface_dll = std::string(DLLNAME);
@@ -40,14 +40,14 @@ int main(int argc, char **argv) {
     }
   }
 
-  rlbotcpp::Interface::LoadInterface(interface_dll);
+  rlbot::Interface::LoadInterface(interface_dll);
 
-  while (!rlbotcpp::Interface::IsInitialized()) {
-    rlbotcpp::platform::SleepMilliseconds(1);
+  while (!rlbot::Interface::IsInitialized()) {
+	  rlbot::platform::SleepMilliseconds(1);
   }
 
-  rlbotcpp::BotManager<ExampleBot> botmanager =
-      rlbotcpp::BotManager<ExampleBot>();
+  rlbot::BotManager<ExampleBot> botmanager =
+	  rlbot::BotManager<ExampleBot>();
   botmanager.StartBotServer(port);
 
   return 0;