Skip to content

Commit c9ac6b0

Browse files
erslavinMichael Marksjerrans
authored
Hydra 2 Samples (#12)
* Hydra 2 Samples - Added geospatial scene index sample - Added warp scene index sample - Adjusted geospatial schema package used to conform to 23.05 - Added metrics assembler sample - Removed schema generated files and added additional types to plugInfo.json to support hydra pipeline - Fixed issue with hybrid plugInfo.json containing both schema generated types and standard types - Fixed issue in cmake with preserving directory structure when copying python module files - Updated README and moved more descriptive content into separate READMEs under usd and hydra plugins - Enabled support for usdview plugins, fixed required paths in environment setup, fixed issue loading preferences - Added basic documentation for warp scene index sample - Fixed case sensitive header file on windows - Fixed permissive issue compiling for Linux in warp adatper - Fixed issue with configuring plugInfo.json file in debug builds - Updated versions of openssl, libcurl - Updated library directories for Linux - Updated to repo_usd 4.0.1 - Added geospatial reference scene - Updated version of python dependency - Updated version of USD 23.05 package - Updated license file to include licenses from OpenSSL and libcurl --------- Co-authored-by: Michael Marks <mmarks@nvidia.com> Co-authored-by: Jerran Schmidt <jerrans@nvidia.com>
1 parent 8b64f69 commit c9ac6b0

File tree

107 files changed

+31843
-160
lines changed

Some content is hidden

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

107 files changed

+31843
-160
lines changed

.gitignore

+17-1
Original file line numberDiff line numberDiff line change
@@ -43,4 +43,20 @@ PACKAGE-DEPS.yaml
4343
# generated files under usd-plugins/schema
4444
src/usd-plugins/schema/omniExampleSchema/generated
4545
src/usd-plugins/schema/omniExampleCodelessSchema/generated
46-
src/usd-plugins/schema/omniMetSchema/generated
46+
src/usd-plugins/schema/omniMetSchema/generated
47+
48+
# generated files for hydra-plugins/omniWarpSceneIndex
49+
src/hydra-plugins/omniWarpSceneIndex/__init__.py
50+
src/hydra-plugins/omniWarpSceneIndex/api.h
51+
src/hydra-plugins/omniWarpSceneIndex/generatedSchema.usda
52+
src/hydra-plugins/omniWarpSceneIndex/module.cpp
53+
src/hydra-plugins/omniWarpSceneIndex/moduleDeps.cpp
54+
src/hydra-plugins/omniWarpSceneIndex/tokens.cpp
55+
src/hydra-plugins/omniWarpSceneIndex/tokens.h
56+
src/hydra-plugins/omniWarpSceneIndex/warpComputationAPI.cpp
57+
src/hydra-plugins/omniWarpSceneIndex/warpComputationAPI.h
58+
src/hydra-plugins/omniWarpSceneIndex/wrapWarpComputationAPI.cpp
59+
src/hydra-plugins/omniWarpSceneIndex/wrapTokens.cpp
60+
61+
# all generated CMakeLists.txt files
62+
**/CMakeLists.txt

CHANGES.md

+7
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
# Changelog
22

3+
## 3.0.0
4+
5+
- Added several examples for Hydra 2 scene index plugins
6+
- Fixed issue in build plugInfo.json file configuration for debug builds
7+
- Updated dependencies to stock USD 23.05
8+
- Updated openssl and libcurl dependencies
9+
310
## 2.0.0
411

512
- Added support for general USD plugins beyond schemas

LICENSE

+204
Original file line numberDiff line numberDiff line change
@@ -199,3 +199,207 @@
199199
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
200200
See the License for the specific language governing permissions and
201201
limitations under the License.
202+
203+
These samples make use of other Open Source Software:
204+
205+
============================================================
206+
OpenSSL
207+
============================================================
208+
209+
https://www.openssl.org/source/apache-license-2.0.txt
210+
211+
Apache License
212+
Version 2.0, January 2004
213+
https://www.apache.org/licenses/
214+
215+
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
216+
217+
1. Definitions.
218+
219+
"License" shall mean the terms and conditions for use, reproduction,
220+
and distribution as defined by Sections 1 through 9 of this document.
221+
222+
"Licensor" shall mean the copyright owner or entity authorized by
223+
the copyright owner that is granting the License.
224+
225+
"Legal Entity" shall mean the union of the acting entity and all
226+
other entities that control, are controlled by, or are under common
227+
control with that entity. For the purposes of this definition,
228+
"control" means (i) the power, direct or indirect, to cause the
229+
direction or management of such entity, whether by contract or
230+
otherwise, or (ii) ownership of fifty percent (50%) or more of the
231+
outstanding shares, or (iii) beneficial ownership of such entity.
232+
233+
"You" (or "Your") shall mean an individual or Legal Entity
234+
exercising permissions granted by this License.
235+
236+
"Source" form shall mean the preferred form for making modifications,
237+
including but not limited to software source code, documentation
238+
source, and configuration files.
239+
240+
"Object" form shall mean any form resulting from mechanical
241+
transformation or translation of a Source form, including but
242+
not limited to compiled object code, generated documentation,
243+
and conversions to other media types.
244+
245+
"Work" shall mean the work of authorship, whether in Source or
246+
Object form, made available under the License, as indicated by a
247+
copyright notice that is included in or attached to the work
248+
(an example is provided in the Appendix below).
249+
250+
"Derivative Works" shall mean any work, whether in Source or Object
251+
form, that is based on (or derived from) the Work and for which the
252+
editorial revisions, annotations, elaborations, or other modifications
253+
represent, as a whole, an original work of authorship. For the purposes
254+
of this License, Derivative Works shall not include works that remain
255+
separable from, or merely link (or bind by name) to the interfaces of,
256+
the Work and Derivative Works thereof.
257+
258+
"Contribution" shall mean any work of authorship, including
259+
the original version of the Work and any modifications or additions
260+
to that Work or Derivative Works thereof, that is intentionally
261+
submitted to Licensor for inclusion in the Work by the copyright owner
262+
or by an individual or Legal Entity authorized to submit on behalf of
263+
the copyright owner. For the purposes of this definition, "submitted"
264+
means any form of electronic, verbal, or written communication sent
265+
to the Licensor or its representatives, including but not limited to
266+
communication on electronic mailing lists, source code control systems,
267+
and issue tracking systems that are managed by, or on behalf of, the
268+
Licensor for the purpose of discussing and improving the Work, but
269+
excluding communication that is conspicuously marked or otherwise
270+
designated in writing by the copyright owner as "Not a Contribution."
271+
272+
"Contributor" shall mean Licensor and any individual or Legal Entity
273+
on behalf of whom a Contribution has been received by Licensor and
274+
subsequently incorporated within the Work.
275+
276+
2. Grant of Copyright License. Subject to the terms and conditions of
277+
this License, each Contributor hereby grants to You a perpetual,
278+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
279+
copyright license to reproduce, prepare Derivative Works of,
280+
publicly display, publicly perform, sublicense, and distribute the
281+
Work and such Derivative Works in Source or Object form.
282+
283+
3. Grant of Patent License. Subject to the terms and conditions of
284+
this License, each Contributor hereby grants to You a perpetual,
285+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
286+
(except as stated in this section) patent license to make, have made,
287+
use, offer to sell, sell, import, and otherwise transfer the Work,
288+
where such license applies only to those patent claims licensable
289+
by such Contributor that are necessarily infringed by their
290+
Contribution(s) alone or by combination of their Contribution(s)
291+
with the Work to which such Contribution(s) was submitted. If You
292+
institute patent litigation against any entity (including a
293+
cross-claim or counterclaim in a lawsuit) alleging that the Work
294+
or a Contribution incorporated within the Work constitutes direct
295+
or contributory patent infringement, then any patent licenses
296+
granted to You under this License for that Work shall terminate
297+
as of the date such litigation is filed.
298+
299+
4. Redistribution. You may reproduce and distribute copies of the
300+
Work or Derivative Works thereof in any medium, with or without
301+
modifications, and in Source or Object form, provided that You
302+
meet the following conditions:
303+
304+
(a) You must give any other recipients of the Work or
305+
Derivative Works a copy of this License; and
306+
307+
(b) You must cause any modified files to carry prominent notices
308+
stating that You changed the files; and
309+
310+
(c) You must retain, in the Source form of any Derivative Works
311+
that You distribute, all copyright, patent, trademark, and
312+
attribution notices from the Source form of the Work,
313+
excluding those notices that do not pertain to any part of
314+
the Derivative Works; and
315+
316+
(d) If the Work includes a "NOTICE" text file as part of its
317+
distribution, then any Derivative Works that You distribute must
318+
include a readable copy of the attribution notices contained
319+
within such NOTICE file, excluding those notices that do not
320+
pertain to any part of the Derivative Works, in at least one
321+
of the following places: within a NOTICE text file distributed
322+
as part of the Derivative Works; within the Source form or
323+
documentation, if provided along with the Derivative Works; or,
324+
within a display generated by the Derivative Works, if and
325+
wherever such third-party notices normally appear. The contents
326+
of the NOTICE file are for informational purposes only and
327+
do not modify the License. You may add Your own attribution
328+
notices within Derivative Works that You distribute, alongside
329+
or as an addendum to the NOTICE text from the Work, provided
330+
that such additional attribution notices cannot be construed
331+
as modifying the License.
332+
333+
You may add Your own copyright statement to Your modifications and
334+
may provide additional or different license terms and conditions
335+
for use, reproduction, or distribution of Your modifications, or
336+
for any such Derivative Works as a whole, provided Your use,
337+
reproduction, and distribution of the Work otherwise complies with
338+
the conditions stated in this License.
339+
340+
5. Submission of Contributions. Unless You explicitly state otherwise,
341+
any Contribution intentionally submitted for inclusion in the Work
342+
by You to the Licensor shall be under the terms and conditions of
343+
this License, without any additional terms or conditions.
344+
Notwithstanding the above, nothing herein shall supersede or modify
345+
the terms of any separate license agreement you may have executed
346+
with Licensor regarding such Contributions.
347+
348+
6. Trademarks. This License does not grant permission to use the trade
349+
names, trademarks, service marks, or product names of the Licensor,
350+
except as required for reasonable and customary use in describing the
351+
origin of the Work and reproducing the content of the NOTICE file.
352+
353+
7. Disclaimer of Warranty. Unless required by applicable law or
354+
agreed to in writing, Licensor provides the Work (and each
355+
Contributor provides its Contributions) on an "AS IS" BASIS,
356+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
357+
implied, including, without limitation, any warranties or conditions
358+
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
359+
PARTICULAR PURPOSE. You are solely responsible for determining the
360+
appropriateness of using or redistributing the Work and assume any
361+
risks associated with Your exercise of permissions under this License.
362+
363+
8. Limitation of Liability. In no event and under no legal theory,
364+
whether in tort (including negligence), contract, or otherwise,
365+
unless required by applicable law (such as deliberate and grossly
366+
negligent acts) or agreed to in writing, shall any Contributor be
367+
liable to You for damages, including any direct, indirect, special,
368+
incidental, or consequential damages of any character arising as a
369+
result of this License or out of the use or inability to use the
370+
Work (including but not limited to damages for loss of goodwill,
371+
work stoppage, computer failure or malfunction, or any and all
372+
other commercial damages or losses), even if such Contributor
373+
has been advised of the possibility of such damages.
374+
375+
9. Accepting Warranty or Additional Liability. While redistributing
376+
the Work or Derivative Works thereof, You may choose to offer,
377+
and charge a fee for, acceptance of support, warranty, indemnity,
378+
or other liability obligations and/or rights consistent with this
379+
License. However, in accepting such obligations, You may act only
380+
on Your own behalf and on Your sole responsibility, not on behalf
381+
of any other Contributor, and only if You agree to indemnify,
382+
defend, and hold each Contributor harmless for any liability
383+
incurred by, or claims asserted against, such Contributor by reason
384+
of your accepting any such warranty or additional liability.
385+
386+
END OF TERMS AND CONDITIONS
387+
388+
389+
============================================================
390+
libcurl
391+
============================================================
392+
393+
https://curl.se/docs/copyright.html
394+
395+
COPYRIGHT AND PERMISSION NOTICE
396+
397+
Copyright (c) 1996 - 2023, Daniel Stenberg, daniel@haxx.se, and many contributors, see the THANKS file.
398+
399+
All rights reserved.
400+
401+
Permission to use, copy, modify, and distribute this software for any purpose with or without fee is hereby granted, provided that the above copyright notice and this permission notice appear in all copies.
402+
403+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
404+
405+
Except as contained in this notice, the name of a copyright holder shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization of the copyright holder.

0 commit comments

Comments
 (0)