Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix C4244 warnings in build.cmd and issue with manually placing pawns #3146

Merged
merged 11 commits into from
Nov 20, 2020

Conversation

zimmy87
Copy link
Contributor

@zimmy87 zimmy87 commented Nov 17, 2020

This PR contains two bug fixes. The first is for C4244 warnings that get treated as errors, thus breaking the build.cmd script. The other is an issue where removing a PlayerStart and manually placing a build can cause a crash and also incorrectly places the camera (previously it was defaulting the camera to the position of the camera in the Editor, instead of placing the camera next to the pawn)

jonyMarino and others added 5 commits October 22, 2020 14:46
By adding a static_cast to various calculations inside calculateMaxThrust, two C4244 warnings that appear when running build.cmd can be avoided

Co-Authored-By: Jonathan <jonymarino@gmail.com>
This adds logic for finding the primary pawn and setting the camera position to the location of this pawn

Co-Authored-By: Jonathan <jonymarino@gmail.com>
@ghost
Copy link

ghost commented Nov 17, 2020

CLA assistant check
All CLA requirements met.

@zimmy87 zimmy87 changed the title Fix C4244 warnings in build.cmd and issue with manually placing pawns #3050 #3136 Fix C4244 warnings in build.cmd and issue with manually placing pawns Nov 17, 2020
@@ -68,6 +68,8 @@ class VehicleSimApiBase : public msr::airlib::UpdatableObject {
//use pointer here because of derived classes for VehicleSetting
const AirSimSettings::VehicleSetting* getVehicleSetting() const
{
if (getVehicleName().find("BP_FlyingPawn") == 0)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should change this for any vehicle name

@jonyMarino
Copy link
Collaborator

@zimmy87, please resolve the current conflict with master. Good luck!

@jonyMarino jonyMarino merged commit 659a7db into microsoft:master Nov 20, 2020
kemen209 added a commit to kemen209/AirSim that referenced this pull request Nov 21, 2020
* master:
  update mavlink 2.0 message definitions.
  fix broken unreal build due to disconnected asset
  add 2 new tested devices.
  fix auto-detect of pixhawk 4 hardware
  fixing build break with previous merge
  fixing build break with previous merge
  changes to clock_speed.py
  responding to comments on PR microsoft#3146
  set camera to position of pawn (microsoft#3050)
  Add static_cast to calculateMaxThrust (microsoft#3136)
  Fixed OriginGeopoint GPS error
  remove mislead comment on vs version
  Update px4_logging.md
  fix typo
  assigning fpv_pawn when there are pawns in environment
  fixing crash for ue added pawns and preventing default pawn to be created
  Update simple_flight.md
@rajat2004
Copy link
Contributor

This issue with warnings could have been avoided if the CI was active I think
I guess with the recent changes with Travis it hasn't been working, no idea about Azure Pipelines though, that's in a private organization or something if I'm not wrong, so @jonyMarino if possible, could you have a look at it?
I'm also thinking of setting up a GitHub Actions pipeline for AirSim, haven't actually used one before so will be fun to learn and try it out. Initially the pipeline could just be for doing Linux AirLib build, then maybe add Windows, OSX & ROS wrapper also

@jonyMarino
Copy link
Collaborator

Hi @rajat2004! Yes, you are totally right. We want to improve our CI tools. Why would you prefer GitHub Actions instead of Travis and Azure Pipelines?

@rajat2004
Copy link
Contributor

It's not that I prefer one over the other, Travis & Azure are already present so it would be pretty easy to have them up and running again. Azure specifically would be great since it does the entire build with UE included
Regarding Travis, there was a recent pricing announcement, and the maintainers would have to decide whether to use Travis or something else. GitHub Actions seems a pretty good alternative to me, ArduPilot also recently added GitHub Actions for doing CI

@rajat2004
Copy link
Contributor

I've opened #3180 which adds Ubuntu & Windows builds, and it did pick up the compilation error on Windows. The checks aren't being run on the PR, most likely needs some enabling by the maintainers, or maybe will work after getting merged. See the PR on my fork (rajat2004#26) or the branch itself which will show the checks being executed

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants