Skip to content

Camera replaced by Cinematographic camera (CinemAirSim)#3575

Closed
ppueyor wants to merge 9 commits intomicrosoft:masterfrom
ppueyor:master
Closed

Camera replaced by Cinematographic camera (CinemAirSim)#3575
ppueyor wants to merge 9 commits intomicrosoft:masterfrom
ppueyor:master

Conversation

@ppueyor
Copy link
Contributor

@ppueyor ppueyor commented Apr 8, 2021

Fixes: #
-Integrates the CineCameraComponent into AirSim

About

An AddOn for AirSim that includes all the tools to integrate a cinematographic camera and the needed tools to control/access to it.
More info available in repo: https://github.com/ppueyor/CinemAirSim
Or conference paper: https://arxiv.org/abs/2003.07664

How Has This Been Tested?

Ubuntu 20 and UE4 4.26
Different demos and API calls
Results available in repo

Screenshots (if appropriate):

https://www.youtube.com/watch?v=OJGNaitWZVA

@ppueyor ppueyor marked this pull request as ready for review April 8, 2021 14:20
@zimmy87
Copy link
Contributor

zimmy87 commented Jun 3, 2021

It seems that you have a lot of conflicts. This is most likely due to conflicts with autoformatted code in master. Please follow these steps to resolve this:

  1. check out your pull request
  2. run git checkout master .clang-format in your repo's root folder
  3. if you don't have npm installed, download it from https://www.npmjs.com/get-npm
  4. run npm install -g clang-format
  5. run clang-format -i path/to/file for each conflicting file
  6. run git add -u to track all style changes
  7. run git commit -am "apply style from clang-format"
  8. run git merge master
  9. resolve other non-style conflicts if you have any
  10. push changes

Thanks for helping us with these style changes!

@ppueyor ppueyor closed this Jun 9, 2021
@ppueyor
Copy link
Contributor Author

ppueyor commented Jun 10, 2021

I opened a new pull request #3779.

I forked the repository again and make all the changes by scratch so it is unified in only one commit.

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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants