Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/develop' into iss_988_lens_disto…
Browse files Browse the repository at this point in the history
…rtion

# Conflicts:
#	blenderproc/api/camera/__init__.py
  • Loading branch information
cornerfarmer committed Oct 15, 2021
2 parents 8a9ceea + c8183b3 commit 2803ec0
Show file tree
Hide file tree
Showing 256 changed files with 4,051 additions and 5,168 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ blender
.vscode/
output/
debug/
resources/cctextures
resources/cctextures*
resources/scenenet/*zip
resources/scenenet/SceneNetData
resources/scenenet/texture*
Expand Down
150 changes: 150 additions & 0 deletions CITATION.cff
Original file line number Diff line number Diff line change
@@ -0,0 +1,150 @@
cff-version: 1.2.0
message: "If you use this software, please cite it as below."
title: "BlenderProc2"
version: 2.0.0
date-released: 2021-10-12
licence: GNU General Public License v3.0
authors:
- family-names: Denninger
given-names: Maximilian
affiliation: "German Aerospace Center (DLR)"
email: "[email protected]"
orcid: "https://orcid.org/0000-0002-1557-2234"
- family-names: Sundermeyer
given-names: Martin
affiliation: "German Aerospace Center (DLR)"
email: "[email protected]"
orcid: "https://orcid.org/0000-0003-0587-9643"
- family-names: Winkelbauer
given-names: Dominik
affiliation: "German Aerospace Center (DLR)"
email: "[email protected]"
orcid: "https://orcid.org/0000-0001-7443-1071"
- family-names: Olefir
given-names: Dmitry
affiliation: "German Aerospace Center (DLR)"
orcid: "https://orcid.org/0000-0001-5244-9676"
- family-names: Hodan
given-names: Tomas
affiliation: "Visual Recognition Group, Czech Technical University in Prague"
email: "[email protected]"
- family-names: Zidan
given-names: Youssef
affiliation: "German Aerospace Center (DLR)"
- family-names: Elbadrawy
given-names: Mohamad
affiliation: "German Aerospace Center (DLR)"
- family-names: Knauer
given-names: Markus
affiliation: "German Aerospace Center (DLR)"
email: "[email protected]"
orcid: "https://orcid.org/0000-0001-8229-9410"
- family-names: Katam
given-names: Harinandan
affiliation: "German Aerospace Center (DLR)"
- family-names: Lodhi
given-names: Ahsan
affiliation: "German Aerospace Center (DLR)"
- family-names: Penzkofer
given-names: Anna
affiliation: "German Aerospace Center (DLR)"
repository-code: "https://github.com/DLR-RM/BlenderProc/"
url: "https://dlr-rm.github.io/BlenderProc/"
abstract: "BlenderProc is a modular procedural pipeline, which helps in generating real looking images for the training of convolutional neural networks. These can be used in a variety of use cases including segmentation, depth, normal and pose estimation and many others. A key feature of our extension of blender is the simple to use modular pipeline, which was designed to be easily extendable. By offering standard modules, which cover a variety of scenarios, we provide a starting point on which new modules can be created."
keywords:
- "machine learning"
- "deep learning"
- "artificial intelligence"
- "computer vision"
- "simulation"
- "photo realistic rendering"
- "blender"
- "robot framework"
- "dataset generation"
references:
- type: article
title: "BlenderProc"
authors:
- family-names: Denninger
given-names: Maximilian
affiliation: "German Aerospace Center (DLR)"
email: "[email protected]"
orcid: "https://orcid.org/0000-0002-1557-2234"
- family-names: Sundermeyer
given-names: Martin
affiliation: "German Aerospace Center (DLR)"
email: "[email protected]"
orcid: "https://orcid.org/0000-0003-0587-9643"
- family-names: Winkelbauer
given-names: Dominik
affiliation: "German Aerospace Center (DLR)"
email: "[email protected]"
orcid: "https://orcid.org/0000-0001-7443-1071"
- family-names: Zidan
given-names: Youssef
affiliation: "German Aerospace Center (DLR)"
- family-names: Olefir
given-names: Dmitry
affiliation: "German Aerospace Center (DLR)"
orcid: "https://orcid.org/0000-0001-5244-9676"
- family-names: Elbadrawy
given-names: Mohamad
affiliation: "German Aerospace Center (DLR)"
- family-names: Lodhi
given-names: Ahsan
affiliation: "German Aerospace Center (DLR)"
- family-names: Katam
given-names: Harinandan
affiliation: "German Aerospace Center (DLR)"
year: 2019
url: https://arxiv.org/abs/1911.01911
- type: article
title: "BlenderProc: Reducing the Reality Gap with Photorealistic Rendering"
authors:
- family-names: Denninger
given-names: Maximilian
affiliation: "German Aerospace Center (DLR)"
email: "[email protected]"
orcid: "https://orcid.org/0000-0002-1557-2234"
- family-names: Sundermeyer
given-names: Martin
affiliation: "German Aerospace Center (DLR)"
email: "[email protected]"
orcid: "https://orcid.org/0000-0003-0587-9643"
- family-names: Winkelbauer
given-names: Dominik
affiliation: "German Aerospace Center (DLR)"
email: "[email protected]"
orcid: "https://orcid.org/0000-0001-7443-1071"
- family-names: Olefir
given-names: Dmitry
affiliation: "German Aerospace Center (DLR)"
orcid: "https://orcid.org/0000-0001-5244-9676"
- family-names: Hodan
given-names: Tomas
affiliation: "Visual Recognition Group, Czech Technical University in Prague"
email: "[email protected]"
- family-names: Zidan
given-names: Youssef
affiliation: "German Aerospace Center (DLR)"
- family-names: Elbadrawy
given-names: Mohamad
affiliation: "German Aerospace Center (DLR)"
- family-names: Knauer
given-names: Markus
affiliation: "German Aerospace Center (DLR)"
email: "[email protected]"
orcid: "https://orcid.org/0000-0001-8229-9410"
- family-names: Katam
given-names: Harinandan
affiliation: "German Aerospace Center (DLR)"
- family-names: Lodhi
given-names: Ahsan
affiliation: "German Aerospace Center (DLR)"
year: 2020
conference: "International Conference on Robotics: Sciene and Systems, RSS 2020"
url: "https://sim2real.github.io/assets/papers/2020/denninger.pdf"




99 changes: 99 additions & 0 deletions CLA_entities.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,99 @@
DLR Software Grant and Corporate Contributor License Agreement
==============================================================

In order to clarify the intellectual property license granted with Contributions from any person or entity, Deutsches
Zentrum für Luft- und Raumfahrt e. V. (German Aerospace Center, "DLR") must have a Contributor License Agreement
("CLA") on file that has been signed by each Contributor, indicating agreement to the license terms below. This
license is for your protection as a Contributor as well as the protection of DLR; it does not change your rights to use
your own Contributions for any other purpose.

This version of the Agreement allows an entity (the "Corporation") to submit Contributions to DLR, to authorize
Contributions submitted by its designated employees to DLR, and to grant copyright and patent licenses thereto.

If you have not already done so, please complete and sign, then scan and email a PDF file of this Agreement to
[email protected]. Alternatively, you may send it by fax to the DLR at +49 (0) 81 53 28-1134. If necessary, send an
original signed Agreement to DLR RMC, Münchner Str. 20, 82234 Weßling, Germany. Please read this document carefully
before signing and keep a copy for your records. ::

Cooperation name: ________________________________________________

Cooperation address: ________________________________________________

________________________________________________

________________________________________________

Point of Contact: ________________________________________________

Telephone: ________________________________________________

Fax: ________________________________________________

E-Mail: ________________________________________________

You accept and agree to the following terms and conditions for Your present and future Contributions submitted to DLR.
Except for the license granted herein to DLR and recipients of software distributed by DLR, You reserve all right,
title, and interest in and to Your Contributions.

1. **Definitions.** "You" (or "Your") shall mean the copyright owner or legal entity authorized by the copyright
owner that is making this Agreement with DLR. For legal entities, the entity making a Contribution and all other
entities that control, are controlled by, or are under common control with that entity are considered to be a single
Contributor. For the purposes of this definition, "control" means (i) the power, direct or indirect, to cause the
direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or
more of the outstanding shares, or (iii) beneficial ownership of such entity.

"Contribution" shall mean the code, documentation or any original work of authorship, including any modifications
or additions to an existing work, that is intentionally submitted by You to DLR for inclusion in, or
documentation of, any of the products owned or managed by DLR (the "Work"). For the purposes of this
definition, "submitted" means any form of electronic, verbal, or written communication sent to DLR or its
representatives, including but not limited to communication on electronic mailing lists, source code control
systems, and issue tracking systems that are managed by, or on behalf of, DLR for the purpose of discussing and
improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by
You as "Not a Contribution."

2. **Grant of Copyright License.** Subject to the terms and conditions of this Agreement, You hereby grant to DLR and
to recipients of software distributed by DLR a perpetual, worldwide, non-exclusive, no-charge, royalty-free,
irrevocable copyright license to reproduce, prepare derivative works of, publicly display, publicly perform,
sublicense, and distribute Your Contributions and such derivative works.

3. **Grant of Patent License.** Subject to the terms and conditions of this Agreement, You hereby grant to DLR and to
recipients of software distributed by DLR a perpetual, worldwide, non-exclusive, no-charge, royalty-free,
irrevocable (except as stated in this section) patent license to make, have made, use, offer to sell, sell, import,
and otherwise transfer the Work, where such license applies only to those patent claims licensable by You that are
necessarily infringed by Your Contribution(s) alone or by combination of Your Contribution(s) with the Work to which
such Contribution(s) was submitted. If any entity institutes patent litigation against You or any other entity
(including a cross-claim or counterclaim in a lawsuit) alleging that your Contribution, or the Work to which you
have contributed, constitutes direct or contributory patent infringement, then any patent licenses granted to that
entity under this Agreement for that Contribution or Work shall terminate as of the date such litigation is filed.

4. You represent that You are legally entitled to grant the above license. You represent further that each employee
of the Corporation designated by You is authorized to submit Contributions on behalf of the Corporation.

5. You represent that each of Your Contributions is Your original creation (see section 7 for submissions on behalf
of others).

6. You are not expected to provide support for Your Contributions, except to the extent You desire to provide support.
You may provide support for free, for a fee, or not at all. Unless required by applicable law or agreed to in
writing, You provide Your Contributions on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
express or implied, including, without limitation, any warranties or conditions of TITLE, NON- INFRINGEMENT,
MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE.

7. Should You wish to submit work that is not Your original creation, You may submit it to DLR separately from any
Contribution, identifying the complete details of its source and of any license or other restriction (including, but
not limited to, related patents, trademarks, and license agreements) of which you are personally aware, and
conspicuously marking the work as "Submitted on behalf of a third-party: [named here]".

8. You agree to notify DLR of any facts or circumstances of which you become aware that would make these
representations inaccurate in any respect.

9. It is your responsibility to notify DLR when any change is required to the list of designated employees authorized
to submit Contributions on behalf of the Corporation, or to the Corporation's Point of Contact with DLR.

::

Please sign: __________________________________ Date: ________________

Title: __________________________________

Corporation: __________________________________

90 changes: 90 additions & 0 deletions CLA_individuals.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,90 @@
DLR Individual Contributor License Agreement
============================================

In order to clarify the intellectual property license granted with Contributions from any person or entity, Deutsches
Zentrum für Luft- und Raumfahrt e. V. (German Aerospace Center, "DLR") must have a Contributor License Agreement
("CLA") on file that has been signed by each Contributor, indicating agreement to the license terms below. This
license is for your protection as a Contributor as well as the protection of DLR; it does not change your rights to use
your own Contributions for any other purpose.

If you have not already done so, please complete and sign, then scan and email a PDF file of this Agreement to
[email protected]. Alternatively, you may send it by fax to the DLR at +49 (0) 81 53 28-1134. If necessary, send an
original signed Agreement to DLR RMC, Münchner Str. 20, 82234 Weßling, Germany. Please read this document carefully
before signing and keep a copy for your records. ::

Full name: ______________________________________________________

Mailing address: ________________________________________________

________________________________________________

Country: ______________________________________________________

Telephone: ______________________________________________________

Fax: ______________________________________________________

E-Mail: ______________________________________________________

You accept and agree to the following terms and conditions for Your present and future Contributions submitted to DLR.
Except for the license granted herein to DLR and recipients of software distributed by DLR, You reserve all right,
title, and interest in and to Your Contributions.

1. **Definitions.** "You" (or "Your") shall mean the copyright owner or legal entity authorized by the copyright
owner that is making this Agreement with DLR. For legal entities, the entity making a Contribution and all other
entities that control, are controlled by, or are under common control with that entity are considered to be a single
Contributor. For the purposes of this definition, "control" means (i) the power, direct or indirect, to cause the
direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or
more of the outstanding shares, or (iii) beneficial ownership of such entity.

"Contribution" shall mean any original work of authorship, including any modifications or additions to an existing
work, that is intentionally submitted by You to DLR for inclusion in, or documentation of, any of the products owned
or managed by DLR (the "Work"). For the purposes of this definition, "submitted" means any form of electronic,
verbal, or written communication sent to DLR or its representatives, including but not limited to communication on
electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf
of, DLR for the purpose of discussing and improving the Work, but excluding communication that is conspicuously
marked or otherwise designated in writing by You as "Not a Contribution."

2. **Grant of Copyright License.** Subject to the terms and conditions of this Agreement, You hereby grant to DLR and
to recipients of software distributed by DLR a perpetual, worldwide, non-exclusive, no-charge, royalty-free,
irrevocable copyright license to reproduce, prepare derivative works of, publicly display, publicly perform,
sublicense, and distribute Your Contributions and such derivative works.

3. **Grant of Patent License.** Subject to the terms and conditions of this Agreement, You hereby grant to DLR and to
recipients of software distributed by DLR a perpetual, worldwide, non-exclusive, no-charge, royalty-free,
irrevocable (except as stated in this section) patent license to make, have made, use, offer to sell, sell, import,
and otherwise transfer the Work, where such license applies only to those patent claims licensable by You that are
necessarily infringed by Your Contribution(s) alone or by combination of Your Contribution(s) with the Work to which
such Contribution(s) was submitted. If any entity institutes patent litigation against You or any other entity
(including a cross-claim or counterclaim in a lawsuit) alleging that your Contribution, or the Work to which you
have contributed, constitutes direct or contributory patent infringement, then any patent licenses granted to that
entity under this Agreement for that Contribution or Work shall terminate as of the date such litigation is filed.

4. You represent that you are legally entitled to grant the above license. If your employer(s) has rights to
intellectual property that you create that includes your Contributions, you represent that you have received
permission to make Contributions on behalf of that employer, that your employer has waived such rights for your
Contributions to DLR, or that your employer has executed a separate Corporate CLA with DLR.

5. You represent that each of Your Contributions is Your original creation (see section 7 for submissions on behalf of
others). You represent that Your Contribution submissions include complete details of any third-party license or
other restriction (including, but not limited to, related patents and trademarks) of which you are personally aware
and which are associated with any part of Your Contributions.

6. You are not expected to provide support for Your Contributions, except to the extent You desire to provide support.
You may provide support for free, for a fee, or not at all. Unless required by applicable law or agreed to in
writing, You provide Your Contributions on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
express or implied, including, without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT,
MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE.

7. Should You wish to submit work that is not Your original creation, You may submit it to DLR separately from any
Contribution, identifying the complete details of its source and of any license or other restriction (including, but
not limited to, related patents, trademarks, and license agreements) of which you are personally aware, and
conspicuously marking the work as "Submitted on behalf of a third-party: [named here]".

8. You agree to notify DLR of any facts or circumstances of which you become aware that would make these
representations inaccurate in any respect.

::

Please sign: __________________________________ Date: ________________

Loading

0 comments on commit 2803ec0

Please sign in to comment.