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.

Sign up for GitHub

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

Jump to bottom

add simLoadLevel, simGet/SetObjectScale, simSpawn|DestroyObject #2651

Merged

madratman merged 7 commits into microsoft:master from ironclownfish:PR/simLoadLevel_simGetSetObjectPose

Jul 22, 2020

Contributor

madratman commented May 2, 2020 •

edited

Loading

originally by @ironclownfish, this PR port simLoadLevel, simGet|SetObjectScale features from https://github.com/microsoft/AirSim-NeurIPS2019-Drone-Racing
Additionally, adds simSpawn|DestroyObject
cc #2484

madratman commented

View reviewed changes

AirLib/include/vehicles/car/api/CarApiBase.hpp Outdated Show resolved Hide resolved

madratman force-pushed the PR/simLoadLevel_simGetSetObjectPose branch 2 times, most recently from cfec371 to 0f645ce Compare

May 2, 2020 23:12

madratman commented

View reviewed changes

Unreal/Plugins/AirSim/Source/AirSim.Build.cs Outdated Show resolved Hide resolved

madratman commented

View reviewed changes

Unreal/Plugins/AirSim/Source/AirSim.Build.cs Outdated Show resolved Hide resolved

madratman commented

View reviewed changes

Unreal/Plugins/AirSim/Source/AirSim.Build.cs Show resolved Hide resolved

madratman commented

View reviewed changes

Unreal/Plugins/AirSim/Source/SimMode/LoadingScreenWidget.cpp Outdated Show resolved Hide resolved

madratman commented

View reviewed changes

Unreal/Plugins/AirSim/Source/SimMode/LoadingScreenWidget.h Outdated Show resolved Hide resolved

madratman commented

View reviewed changes

Unreal/Plugins/AirSim/Source/SimMode/SimModeBase.cpp Show resolved Hide resolved

madratman commented

View reviewed changes

Unreal/Plugins/AirSim/Source/SimMode/SimModeBase.cpp Outdated Show resolved Hide resolved

madratman commented

View reviewed changes

Unreal/Plugins/AirSim/Source/SimMode/SimModeBase.h Outdated Show resolved Hide resolved

madratman commented

View reviewed changes

Unreal/Plugins/AirSim/Source/SimMode/SimModeBase.h Outdated Show resolved Hide resolved

madratman commented

View reviewed changes

Unreal/Plugins/AirSim/Source/Vehicles/Car/CarPawnApi.cpp Outdated Show resolved Hide resolved

madratman commented

View reviewed changes

Unreal/Plugins/AirSim/Source/Vehicles/Car/CarPawnApi.h Outdated Show resolved Hide resolved

madratman commented

View reviewed changes

Unreal/Plugins/AirSim/Source/Vehicles/Car/CarPawnSimApi.cpp Outdated Show resolved Hide resolved

madratman commented

View reviewed changes

Unreal/Plugins/AirSim/Source/WorldSimApi.cpp Outdated Show resolved Hide resolved

madratman force-pushed the PR/simLoadLevel_simGetSetObjectPose branch from 85a3ecf to 94ec7a0 Compare

May 2, 2020 23:26

madratman commented

View reviewed changes

AirLib/include/common/Waiter.hpp Outdated Show resolved Hide resolved

madratman commented

View reviewed changes

AirLib/src/api/RpcLibClientBase.cpp Outdated Show resolved Hide resolved

madratman commented

View reviewed changes

Unreal/Plugins/AirSim/AirSim.uplugin Outdated Show resolved Hide resolved

madratman commented

View reviewed changes

Unreal/Plugins/AirSim/Source/WorldSimApi.h Outdated Show resolved Hide resolved

madratman commented

View reviewed changes

Unreal/Plugins/AirSim/Source/Vehicles/Car/CarPawnSimApi.h Outdated Show resolved Hide resolved

madratman force-pushed the PR/simLoadLevel_simGetSetObjectPose branch from 94ec7a0 to 6e99f90 Compare

May 3, 2020 00:45

madratman commented

View reviewed changes

Unreal/Plugins/AirSim/Source/SimHUD/SimHUD.cpp Outdated Show resolved Hide resolved

madratman commented

View reviewed changes

Unreal/Plugins/AirSim/Source/SimMode/SimModeBase.h Show resolved Hide resolved

madratman commented

View reviewed changes

Unreal/Plugins/AirSim/Source/SimMode/SimModeBase.h Outdated Show resolved Hide resolved

madratman commented

View reviewed changes

Unreal/Plugins/AirSim/Source/SimMode/SimModeBase.h Outdated Show resolved Hide resolved

madratman force-pushed the PR/simLoadLevel_simGetSetObjectPose branch 2 times, most recently from c521405 to 7505949 Compare

May 3, 2020 01:11

madratman commented

View reviewed changes

Unreal/Plugins/AirSim/Source/AirsimLevelStreaming.cpp Outdated Show resolved Hide resolved

Contributor Author

madratman commented May 3, 2020

@rajat2004 good point, if the purpose of simDisableActor is exactly the same as simDestroyObject, yeah we can close it..

Contributor

rajat2004 commented May 3, 2020 •

edited

Loading

I'm not sure if they behave exactly the same, maybe making a short video of it working might help
One thing, is the object removed from the simListSceneObjects call after destroyObject is called? This currently doesn't happen in disableActor

Also, can the actor be brought back after destroying it? Probably spawnObject wil work?l

rajat2004 mentioned this pull request

Add simDisableActor API #2561

Closed

rajat2004 mentioned this pull request

How do I disable animals in Neighborhood environment? #2696

Closed

This was referenced May 27, 2020

City Environment: Can I control the traffic density? #2729

Closed

Workflow for adding functionality implemented in blueprint #2722

Closed

madratman changed the title ~~add simLoadLevel, simGet/SetObjectScale~~ add simLoadLevel, simGet/SetObjectScale, simSpawn|DestroyObject

madratman force-pushed the PR/simLoadLevel_simGetSetObjectPose branch from db3db18 to 316367a Compare

July 20, 2020 23:28

Contributor Author

madratman commented Jul 20, 2020

/AzurePipelines run microsoft.AirSim

azure-pipelines bot commented Jul 20, 2020

No pipelines are associated with this pull request.

microsoft deleted a comment from azure-pipelines bot

Contributor Author

madratman commented Jul 21, 2020

/azp run microsoft.AirSim

azure-pipelines bot commented Jul 21, 2020

Azure Pipelines successfully started running 1 pipeline(s).

Contributor Author

madratman commented Jul 21, 2020

/azp run microsoft.AirSim

azure-pipelines bot commented Jul 21, 2020

Azure Pipelines successfully started running 1 pipeline(s).

Nicholas Gyde and others added 5 commits

July 22, 2020 11:11


          add simLoadLevel, simGet/SetObjectScale

2cad6e7


          address review comments:

a97bf6e

- restore car*api.*cpp/h files
- fix build error, remove unnecessary include, restore airsim.uplugin
- simgetobjectscaleinternal, fix indentation in worldsimapi.h/cpp
- address review comments for simmodebase
- rm noisy simgetobjectpose
- fix up airsim.build.cs
- fix up simhud.h/cpp
- remove Waiter::isCanceled()
- fix includes in airblueprintlib, indendation for file
- cleanup LoadingScreenWidget
- restore Content/Weather/WeatherFX/Materials/MF_WorldAlignedNoise.uasset
- rm duplicate simGetObjectPose


          Added APIs to Unity AirsimWrapper

8514a08


          Resolved bad type. fixes unity build

77bcedf


          fix linux build adding missing include LevelStreamingDynamic.h

bf88699

madratman force-pushed the PR/simLoadLevel_simGetSetObjectPose branch from 9f217af to bf88699 Compare

July 22, 2020 18:13


          merge

105937b

madratman force-pushed the PR/simLoadLevel_simGetSetObjectPose branch from ae953c8 to 105937b Compare

July 22, 2020 20:00


          fix linux packaging with missing include

ee47401

madratman merged commit 5e873a3 into microsoft:master

Contributor

rajat2004 commented Jul 23, 2020

@madratman Certain things seem to be missing here in the PR, like API additions to the Pythonclient, and also some in the C++ API as well, I'll see if I can add some and make a PR

Contributor Author

madratman commented Jul 23, 2020

@rajat2004 that's intentional. The simLoadLevel feature is not usable per se yet, as it needs modifications to the environments. We're working on that behind the scenes.
Adding simLoadLevel to Python client / doc will confuse users atm.

Contributor

rajat2004 commented Jul 23, 2020

Oh ok, that makes sense

niekvleeuwen mentioned this pull request

Fixed crash when calling simLoadLevel #3341

Merged

rajat2004 mentioned this pull request

Add API to list all assets #3940

Merged

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet