Skip to content

Commit 7d8ca90

Browse files
committed
merge dev/ros remote
2 parents f33de97 + 785c87f commit 7d8ca90

File tree

110 files changed

+8622
-202
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

110 files changed

+8622
-202
lines changed

.gitignore

Lines changed: 23 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,27 @@
1-
.sass-cache
2-
.vscode/*
3-
!.vscode/extensions.json
4-
externals/*
1+
# Python
52
dist
63
*.egg-info
74
*.so
85
__pycache__
9-
build
6+
7+
8+
# Gitignore
9+
10+
# VScode
11+
.vscode/
12+
.vscode/*
13+
**/.vscode/*
14+
!.vscode/extensions.json
15+
16+
# General
17+
build/
18+
_build/
19+
.sass-cache
20+
_posts
21+
_site
22+
externals/*
23+
24+
#Flightmare
25+
flightlib
26+
flightrl
27+
flighros

Dockerfile

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@ FROM ubuntu:18.04
22

33
ENV DEBIAN_FRONTEND=noninteractive
44

5+
# Installing some essential system packages
56
RUN apt-get update && apt-get install -y --no-install-recommends \
7+
lsb-release \
68
build-essential \
79
python3 python3-dev python3-pip \
810
cmake \
@@ -11,7 +13,23 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
1113
ca-certificates \
1214
libzmqpp-dev \
1315
libopencv-dev \
16+
gnupg2 \
1417
&& rm -rf /var/lib/apt/lists/*
1518

19+
RUN /bin/bash -c 'echo "deb http://packages.ros.org/ros/ubuntu $(lsb_release -sc) main" > /etc/apt/sources.list.d/ros-latest.list' && \
20+
apt-key adv --keyserver 'hkp://keyserver.ubuntu.com:80' --recv-key C1CF6E31E6BADE8868B172B4F42ED6FBAB17C654
1621

22+
# Installing ROS Melodic
23+
RUN apt-get update && apt-get install -y --no-install-recommends \
24+
ros-melodic-desktop-full
25+
26+
# Installing catkin tools
27+
RUN apt-get update && apt-get install -y python3-setuptools && pip3 install catkin-tools
28+
29+
RUN /bin/bash cd /home && git clone https://github.com/uzh-rpg/flightmare.git \
30+
&& echo "export FLIGHTMARE_PATH=/home/flightmare" >> ~/.bashrc
31+
&& source ~/.bashrc
1732

33+
RUN /bin/bash cd /home/flightmare/flightlib && pip3 install . \
34+
&& cd /home/flightmare/flightrl && pip3 install . \
35+
&&

LICENSE

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
MIT License
2+
3+
Copyright (c) 2020 Robotics and Perception Group,
4+
University of Zurich, Switzerland
5+
6+
Permission is hereby granted, free of charge, to any person obtaining a copy
7+
of this software and associated documentation files (the "Software"), to deal
8+
in the Software without restriction, including without limitation the rights
9+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
10+
copies of the Software, and to permit persons to whom the Software is
11+
furnished to do so, subject to the following conditions:
12+
13+
The above copyright notice and this permission notice shall be included in all
14+
copies or substantial portions of the Software.
15+
16+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
17+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
18+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
19+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
20+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
21+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
22+
SOFTWARE.

README.md

Lines changed: 31 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,38 @@
1-
# Flightmare
1+
# Flightmare - 左青龙
22

33
![Build Status](https://github.com/uzh-rpg/flightmare/workflows/CPP_CI/badge.svg) ![clang format](https://github.com/uzh-rpg/flightmare/workflows/clang_format/badge.svg)
4+
![License](https://img.shields.io/badge/License-MIT-blue.svg) ![website]( https://img.shields.io/website-up-down-green-red/https/naereen.github.io.svg)
45

5-
We present a new modular quadrotor simulator: Flightmare.
6+
**Flightmare** is a flexible modular quadrotor simulator.
67
Flightmare is composed of two main components: a configurable rendering engine built on Unity and a flexible physics engine for dynamics simulation.
78
Those two components are totally decoupled and can run independently from each other.
89
Flightmare comes with several desirable features: (i) a large multi-modal sensor suite, including an interface to extract the 3D point-cloud of the scene; (ii) an API for reinforcement learning which can simulate hundreds of quadrotors in parallel; and (iii) an integration with a virtual-reality headset for interaction with the simulated environment.
910
Flightmare can be used for various applications, including path-planning, reinforcement learning, visual-inertial odometry, deep learning, human-robot interaction, etc.
11+
12+
**[Website](https://uzh-rpg.github.io/flightmare/)** &
13+
**[Documentation](https://flightmare.readthedocs.io/)**
14+
15+
[![IMAGE ALT TEXT HERE](./docs/flightmare_main.png)](https://youtu.be/m9Mx1BCNGFU)
16+
17+
## Installation
18+
Installation instructions can be found in our [Wiki](https://github.com/uzh-rpg/flightmare/wiki).
19+
20+
## Updates
21+
* 17.11.2020 [Spotlight](https://youtu.be/8JyrjPLt8wo) Talk at CoRL 2020
22+
* 04.09.2020 Release Flightmare
23+
24+
## Publication
25+
26+
If you use this code in a publication, please cite the following paper **[PDF](http://rpg.ifi.uzh.ch/docs/CoRL20_Yunlong.pdf)**
27+
28+
```
29+
@article{song2020flightmare,
30+
title={Flightmare: A Flexible Quadrotor Simulator},
31+
author={Song, Yunlong and Naji, Selim and Kaufmann, Elia and Loquercio, Antonio and Scaramuzza, Davide},
32+
booktitle={Conference on Robot Learning},
33+
year={2020}
34+
}
35+
```
36+
37+
## License
38+
This project is released under the MIT License. Please review the [License file](LICENSE) for more details.

docs/Makefile

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
# Minimal makefile for Sphinx documentation
2+
#
3+
4+
# You can set these variables from the command line, and also
5+
# from the environment for the first two.
6+
SPHINXOPTS ?=
7+
SPHINXBUILD ?= sphinx-build
8+
SOURCEDIR = source
9+
BUILDDIR = build
10+
11+
# Put it first so that "make" without argument is like "make help".
12+
help:
13+
@$(SPHINXBUILD) -M help "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
14+
15+
.PHONY: help Makefile
16+
17+
# Catch-all target: route all unknown targets to Sphinx using the new
18+
# "make mode" option. $(O) is meant as a shortcut for $(SPHINXOPTS).
19+
%: Makefile
20+
@$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)

docs/flightmare.png

492 KB
Loading

docs/flightmare_main.png

656 KB
Loading

docs/make.bat

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
@ECHO OFF
2+
3+
pushd %~dp0
4+
5+
REM Command file for Sphinx documentation
6+
7+
if "%SPHINXBUILD%" == "" (
8+
set SPHINXBUILD=sphinx-build
9+
)
10+
set SOURCEDIR=source
11+
set BUILDDIR=build
12+
13+
if "%1" == "" goto help
14+
15+
%SPHINXBUILD% >NUL 2>NUL
16+
if errorlevel 9009 (
17+
echo.
18+
echo.The 'sphinx-build' command was not found. Make sure you have Sphinx
19+
echo.installed, then set the SPHINXBUILD environment variable to point
20+
echo.to the full path of the 'sphinx-build' executable. Alternatively you
21+
echo.may add the Sphinx directory to PATH.
22+
echo.
23+
echo.If you don't have Sphinx installed, grab it from
24+
echo.http://sphinx-doc.org/
25+
exit /b 1
26+
)
27+
28+
%SPHINXBUILD% -M %1 %SOURCEDIR% %BUILDDIR% %SPHINXOPTS% %O%
29+
goto end
30+
31+
:help
32+
%SPHINXBUILD% -M help %SOURCEDIR% %BUILDDIR% %SPHINXOPTS% %O%
33+
34+
:end
35+
popd
Loading
Loading
Loading
28.4 KB
Loading
Loading
Loading
Loading
2.41 MB
Loading
Loading
5.58 MB
Loading
Loading
Loading
Loading
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
/*
2+
override table width restrictions
3+
https://rackerlabs.github.io/docs-rackspace/tools/rtd-tables.html
4+
*/
5+
@media screen and (min-width: 767px) {
6+
7+
.wy-table-responsive table td {
8+
/* !important prevents the common CSS stylesheets from overriding
9+
this as on RTD they are loaded after this stylesheet */
10+
white-space: normal !important;
11+
}
12+
13+
.wy-table-responsive {
14+
overflow: visible !important;
15+
}
16+
}

docs/source/_templates/button.rst

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
.. raw:: html
2+
3+
<html>
4+
<head>
5+
<style>
6+
.button {
7+
background-color: #2980B9;
8+
border: none;
9+
color: white;
10+
padding: 15px 32px;
11+
text-align: center;
12+
text-decoration: none;
13+
display: inline-block;
14+
font-size: 16px;
15+
margin: 4px 2px;
16+
cursor: pointer;
17+
transition-duration: 0.4s;
18+
}
19+
.button:hover {
20+
background-color: white;
21+
color: #2980B9;
22+
border: 2px solid #2980B9;
23+
}
24+
</style>
25+
</head>
26+
<body>
27+
<center><a href="#" class="button">Download</a></center>
28+
</body>
29+
</html>
30+
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
Title
2+
-----
3+
4+
.. raw:: html
5+
6+
<details>
7+
<summary>Show command line summary for the quick start installation</summary>
8+
9+
.. code-block::
10+
11+
lots_of_code = "this text block"
12+
13+
.. raw:: html
14+
15+
</details>

docs/source/_templates/function.rst

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
Function
2+
========
3+
4+
.. function:: format_exception(etype, value, tb[, limit=None])
5+
6+
Format the exception with a traceback.
7+
8+
:param etype: exception type
9+
:param value: exception value
10+
:param tb: traceback object
11+
:param limit: maximum number of stack frames to show
12+
:type limit: integer or None
13+
:rtype: list of strings

0 commit comments

Comments
 (0)