Skip to content
This repository was archived by the owner on Jul 24, 2025. It is now read-only.

Commit 326638c

Browse files
kellyguo11rgasoto
kellyguo11
authored and
rgasoto
committed
Release 4.0
updates for kit 105.1 Update public dependencies Fix missing character in omni-physics.xml that prevented the code from building Fix version number to extension version Rgasoto/add ci
1 parent 59fe501 commit 326638c

Some content is hidden

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

64 files changed

+976
-506
lines changed

‎.clang-format

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
AccessModifierOffset: -4
2+
AlignAfterOpenBracket: Align
3+
AlignConsecutiveAssignments: false
4+
AlignConsecutiveDeclarations: false
5+
AlignEscapedNewlinesLeft: false
6+
AlignTrailingComments: false
7+
AllowAllParametersOfDeclarationOnNextLine: true
8+
AllowShortFunctionsOnASingleLine: false
9+
AllowShortIfStatementsOnASingleLine: false
10+
AllowShortCaseLabelsOnASingleLine : false
11+
AllowShortLoopsOnASingleLine: false
12+
AlwaysBreakAfterDefinitionReturnType: false
13+
AlwaysBreakBeforeMultilineStrings: true
14+
AlwaysBreakTemplateDeclarations: true
15+
BinPackArguments: true
16+
BinPackParameters: false
17+
BreakBeforeBinaryOperators: false
18+
BreakBeforeBraces: Allman
19+
BreakBeforeTernaryOperators: false
20+
BreakConstructorInitializersBeforeComma: false
21+
BreakStringLiterals: false
22+
ColumnLimit: 120
23+
CommentPragmas: ''
24+
ConstructorInitializerAllOnOneLineOrOnePerLine: true
25+
ConstructorInitializerIndentWidth: 4
26+
ContinuationIndentWidth: 4
27+
Cpp11BracedListStyle: false
28+
DerivePointerBinding: false
29+
FixNamespaceComments: false
30+
IndentCaseLabels: false
31+
IndentPPDirectives: AfterHash
32+
IndentFunctionDeclarationAfterType: false
33+
IndentWidth: 4
34+
SortIncludes: true
35+
IncludeCategories:
36+
- Regex: '<carb\/.+>'
37+
Priority: 2
38+
- Regex: '<[[:alnum:]_.]+>'
39+
Priority: 4
40+
- Regex: '<[[:alnum:]_.\/]+>'
41+
Priority: 3
42+
- Regex: '".*"'
43+
Priority: 1
44+
IncludeBlocks: Regroup
45+
Language: Cpp
46+
MaxEmptyLinesToKeep: 2
47+
NamespaceIndentation: None
48+
ObjCSpaceAfterProperty: true
49+
ObjCSpaceBeforeProtocolList: true
50+
PenaltyBreakBeforeFirstCallParameter: 0
51+
PenaltyBreakComment: 1
52+
PenaltyBreakFirstLessLess: 0
53+
PenaltyBreakString: 1
54+
PenaltyExcessCharacter: 10
55+
PenaltyReturnTypeOnItsOwnLine: 1000
56+
PointerAlignment: Left
57+
SpaceBeforeAssignmentOperators: true
58+
SpaceBeforeParens: ControlStatements
59+
SpaceInEmptyParentheses: false
60+
SpacesBeforeTrailingComments: 1
61+
SpacesInAngles: false
62+
SpacesInCStyleCastParentheses: false
63+
SpacesInContainerLiterals: false
64+
SpacesInParentheses: false
65+
Standard: Cpp11
66+
ReflowComments: true
67+
TabWidth: 4
68+
UseTab: Never

‎.gitignore

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,9 @@ _*/
1313

1414
# Generated license file.
1515
PACKAGE-DEPS.yaml
16+
17+
.nvidia-omniverse
18+
19+
# Internal CI/CD files.
20+
/.teamcity
21+
/tools/ci

‎.gitlab-ci.yml

Lines changed: 167 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,167 @@
1+
include:
2+
# external
3+
- project: 'omniverse/devplat/gitlab/templates/common/kit-extension'
4+
file: 'modules/complete-pipeline.yml'
5+
ref: v1_latest
6+
7+
8+
9+
# ==============================================================================================================
10+
# More variables can be found in common.yml - here we put the ones controlling the jobs workflow
11+
variables:
12+
OSEC_NSPECT_ID: "NSPECT-96O5-S11L"
13+
OSEC_CHECKMARX_ENABLED: 'false'
14+
OSEC_GITLAB_SAST_ENABLED: 'false'
15+
OSEC_PULSE_TRUFFLEHOG_ENABLED: 'false'
16+
OSEC_OMNI_PULSE_ENABLED: 'false'
17+
OSEC_README_ENABLED: 'false' # WARNING: Also have the init() function get_nspectid_from_repo_toml() in there...
18+
ALLOW_PUBLISH_DOCS:
19+
value: "true"
20+
description: "Set to true to publish docs"
21+
ALLOW_PUBLISH_TO_LAUNCHER:
22+
value: "false"
23+
description: "Set to true to for Kit apps that are published to the Launcher. That adds jobs for that."
24+
ALLOW_PUBLISH_EXTENSIONS:
25+
value: "true"
26+
description: "Set to true to publish extension updates."
27+
ALLOW_PUBLISH_CONTAINERS:
28+
value: "false"
29+
description: "Set to true to publish containers to NGC."
30+
ALLOW_SECURITY_SCAN:
31+
value: "false"
32+
description: "Set to true to trigger a security scan as a child pipeline (non blocking)"
33+
ALLOW_SCHEDULE_PIPELINE:
34+
value: "true"
35+
description: "Set to 'false' to disable schedule pipeline on a all jobs, useful to set it back on only some jobs."
36+
ALLOW_TAG_PIPELINE:
37+
value: "true"
38+
description: "Set to 'false' to disable tag pipeline on a all push jobs."
39+
RUN_EXTENSION_BENCHMARKS:
40+
value: "false"
41+
description: "Set to true to run benchmarks for kit extensions."
42+
OMNI_CI_ENABLE_CXX_COVERAGE:
43+
value: "false"
44+
description: "Set to 'true' to enable C++ code coverage testing."
45+
OMNI_CI_ENABLE_SANITIZERS:
46+
value: "false"
47+
description: "Set to 'true' to enable C++ sanitizer builds."
48+
RUN_BUMP_VERSION:
49+
value: "false"
50+
description: "Set to true to run bump version. Only happens on schedule."
51+
RUN_NIGHTLY_TESTS:
52+
value: "false"
53+
description: "Set to true to run nightly tests. Only happens on schedule."
54+
RUN_DOCS_BUILD:
55+
value: "true"
56+
description: "Set to true to build omni docs. Only happens on schedule."
57+
58+
59+
# ==============================================================================================================
60+
.check-common:
61+
stage: check
62+
timeout: 20 minutes
63+
interruptible: true
64+
rules:
65+
- if: $RUN_BUMP_VERSION == "true"
66+
when: never
67+
- !reference [.rules-workflow, rules]
68+
69+
.repo-artifacts:
70+
artifacts:
71+
when: always
72+
expire_in: 2 weeks
73+
paths:
74+
- _repo/repo.log
75+
- _repo/repolog*.txt
76+
77+
78+
# ==============================================================================================================
79+
# By default, all platforms (windows-x86_64, linux-x86_64) are published,
80+
# but this can be changed in repo.toml config if necessary:
81+
# [repo_publish_exts]
82+
# platforms = ["linux-x86_64"]
83+
verify-publish-extensions:
84+
extends:
85+
- .deploy-common
86+
- .omni_nvks_runner_with_docker
87+
script:
88+
- ./repo.sh build --fetch-only -rd
89+
- ./repo.sh publish_exts -a --from-package -c release --verify
90+
- ./repo.sh publish_exts -a --from-package -c debug --verify
91+
# - ./repo.sh ci publish_extensions
92+
needs:
93+
# We set all dependencies as optional just in case a platform is not needed,
94+
# then the yml file can override both build/test on one platform and deploy will still work.
95+
- job: build-windows-x86_64
96+
artifacts: true
97+
optional: false
98+
- job: build-linux-x86_64
99+
artifacts: true
100+
optional: false
101+
rules:
102+
- if: $ALLOW_PUBLISH_EXTENSIONS != "true"
103+
when: never
104+
- if: $RUN_BUMP_VERSION == "true"
105+
when: never
106+
- !reference [.rules-push, rules]
107+
# - !reference [.rules-version-changed, rules]
108+
109+
110+
# ==============================================================================================================
111+
# By default, all platforms (windows-x86_64, linux-x86_64) are published,
112+
# but this can be changed in repo.toml config if necessary:
113+
# [repo_publish_exts]
114+
# platforms = ["linux-x86_64"]
115+
publish-extensions:
116+
extends:
117+
- .deploy-common
118+
- .omni_nvks_runner_with_docker
119+
script:
120+
- ./repo.sh build --fetch-only -rd
121+
- ./repo.sh publish_exts -a --from-package -c release
122+
- ./repo.sh publish_exts -a --from-package -c debug
123+
# - ./repo.sh ci publish_extensions
124+
needs:
125+
# We set all dependencies as optional just in case a platform is not needed,
126+
# then the yml file can override both build/test on one platform and deploy will still work.
127+
- job: build-windows-x86_64
128+
artifacts: true
129+
optional: false
130+
- job: build-linux-x86_64
131+
artifacts: true
132+
optional: false
133+
134+
rules:
135+
- if: $ALLOW_PUBLISH_EXTENSIONS != "true"
136+
when: never
137+
- if: $RUN_BUMP_VERSION == "true"
138+
when: never
139+
- !reference [.rules-version-changed, rules]
140+
- !reference [.rules-push-manual, rules]
141+
142+
143+
# ==============================================================================================================
144+
publish-docs:
145+
rules:
146+
- when: never
147+
needs:
148+
149+
150+
# ==============================================================================================================
151+
publish-to-launcher:
152+
rules:
153+
- when: never
154+
needs:
155+
156+
# ==============================================================================================================
157+
release-new-version:
158+
rules:
159+
- when: never
160+
161+
162+
# ==============================================================================================================
163+
# update Kit SDK and extensions, merge master, typically done in daily branch
164+
# set AUTOUPDATE_KIT=true for scheduled pipeline to run
165+
autoupdate-kit:
166+
rules:
167+
- when: never

‎.lastformat

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
1714061207.6556504

‎CONTRIBUTING.md

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
# Contributing to the MJCF Importer Extension
2+
3+
## Did you find a bug?
4+
5+
* Check in the GitHub [Issues](https://github.com/NVIDIA-Omniverse/mjcf-importer-extension/issues) if a report for your bug already exists.
6+
* If the bug has not been reported yet, open a new Issue.
7+
* Use a short and descriptive title which contains relevant keywords.
8+
* Write a clear description of the bug.
9+
* Document the environment including your operating system, compiler version, and hardware specifications.
10+
* Add code samples and executable test cases with instructions for reproducing the bug.
11+
12+
## Did you find an issue in the documentation?
13+
14+
* Please create an [Issue](https://github.com/NVIDIA-Omniverse/mjcf-importer-extension/issues/) if you find a documentation issue.
15+
16+
## Did you write a bug fix?
17+
18+
* Open a new [Pull Request](https://github.com/NVIDIA-Omniverse/mjcf-importer-extension/pulls) with your bug fix.
19+
* Write a description of the bug which is fixed by your patch or link to related Issues.
20+
* If your patch fixes for example Issue #33, write `Fixes #33`.
21+
* Explain your solution with a few words.
22+
23+
## Did you write a cosmetic patch?
24+
25+
* Patches that are purely cosmetic will not be considered and associated Pull Requests will be closed.
26+
* Cosmetic are patches which do not improve stability, performance, functionality, etc.
27+
* Examples for cosmetic patches: code formatting, fixing whitespaces.
28+
29+
## Do you have a question?
30+
31+
* Search the GitHub [Discussions](https://github.com/NVIDIA-Omniverse/mjcf-importer-extension/discussions/) for your question.
32+
* If nobody asked your question before, feel free to open a new discussion.
33+
* Once somebody shares a satisfying answer to your question, click "Mark as answer".
34+
* GitHub Issues should only be used for bug reports.
35+
* If you open an Issue with a question, we may convert it into a discussion.

‎LICENSE

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Apache License
33
Version 2.0, January 2004
4-
http://www.apache.org/licenses/
4+
https://www.apache.org/licenses/
55

66
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
77

@@ -193,7 +193,7 @@
193193
you may not use this file except in compliance with the License.
194194
You may obtain a copy of the License at
195195

196-
http://www.apache.org/licenses/LICENSE-2.0
196+
https://www.apache.org/licenses/LICENSE-2.0
197197

198198
Unless required by applicable law or agreed to in writing, software
199199
distributed under the License is distributed on an "AS IS" BASIS,

‎VERSION.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
105.1
1+
1.1.0

‎deps/ext-deps.packman.xml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,21 @@
1-
<project toolsVersion="5.6">
1+
<project toolsVersion="5.0">
22
<!-- Import dependencies from Kit SDK to ensure we're using the same versions. -->
33
<import path="../_build/${platform}/${config}/kit/dev/all-deps.packman.xml">
4+
<filter include="boost_preprocessor"/>
45
<filter include="imgui"/>
56
<filter include="nv_usd_py310_release"/>
67
</import>
78

89
<!-- Override the link paths to point to the correct locations. -->
10+
<dependency name="boost_preprocessor" linkPath="../_build/target-deps/boost-preprocessor"/>
911
<dependency name="imgui" linkPath="../_build/target-deps/imgui"/>
1012
<dependency name="nv_usd_py310_release" linkPath="../_build/target-deps/nv_usd/release"/>
1113

1214
<!-- Because we always use the release kit-sdk we have to explicitly refer to the debug usd package. -->
1315
<dependency name="nv_usd_py310_debug" linkPath="../_build/target-deps/nv_usd/debug">
14-
<package name="nv-usd" version="22.11.nv.0.2.49.a42c0222-win64_py310_debug-merge_pxr_22-11-py310" platforms="windows-x86_64"/>
15-
<package name="nv-usd" version="22.11.nv.0.2.49.a42c0222-linux64_py310-centos_debug-merge_pxr_22-11-py310" platforms="linux-x86_64" />
16-
<package name="nv-usd" version="22.11.nv.0.2.49.a42c0222-linux-aarch64_py310_debug-merge_pxr_22-11-py310" platforms="linux-aarch64" />
16+
<package name="nv-usd" version="22.11.nv.0.2.1060.196d6f2d-win64_py310_debug-kit-release-integ-23-04-105-0-0" platforms="windows-x86_64" checksum="82b9d1fcd6f6d07cdff3a9b44059fb72d9ada12c5bc452c2df223f267b27035a" />
17+
<package name="nv-usd" version="22.11.nv.0.2.1060.196d6f2d-linux64_py310-centos_debug-kit-release-integ-23-04-105-0-0" platforms="linux-x86_64" checksum="4561794f8b4e453ff4303abca59db3a1877d97566d964ad91a790297409ee5d6"/>
18+
<package name="nv-usd" version="22.11.nv.0.2.1060.196d6f2d-linux-aarch64_py310_debug-kit-release-integ-23-04-105-0-0" platforms="linux-aarch64" checksum="b3c43e940fa613bd5c3fe6de7cd898e4f6304693f8d9ed76da359f04a0de8b02" />
1719
</dependency>
1820

1921
<dependency name="tinyxml2" linkPath="../_build/target-deps/tinyxml2">

‎deps/host-deps.packman.xml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
1-
<project toolsVersion="5.6">
1+
<project toolsVersion="5.0">
22
<dependency name="premake" linkPath="../_build/host-deps/premake">
3-
<package name="premake" version="5.0.0-alpha15.dev+pipeline3388156.1f299ea4-${platform}"/>
3+
<package name="premake" version="5.0.0-beta2+nv1-${platform}"/>
44
</dependency>
5-
65
<dependency name="msvc" linkPath="../_build/host-deps/msvc">
7-
<package name="msvc" version="2019-16.7.6-license" platforms="windows-x86_64"/>
6+
<package name="msvc" version="2019-16.11.17-2" platforms="windows-x86_64" />
87
</dependency>
9-
108
<dependency name="winsdk" linkPath="../_build/host-deps/winsdk">
11-
<package name="winsdk" version="10.0.18362.0-license" platforms="windows-x86_64"/>
9+
<package name="winsdk" version="10.0.19608.0" platforms="windows-x86_64"/>
1210
</dependency>
1311
</project>

‎deps/kit-sdk-deps.packman.xml

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<project toolsVersion="5.6">
1+
<project toolsVersion="5.0">
22
<!-- Import dependencies from Kit SDK to ensure we're using the same versions. -->
33
<import path="../_build/${platform}/${config}/kit/dev/all-deps.packman.xml">
44
<filter include="carb_sdk_plugins"/>
@@ -7,19 +7,23 @@
77
<filter include="python"/>
88
<filter include="client_library" />
99
<filter include="omni_usd_resolver" />
10+
<filter include="nv_usd_py310_${config}" />
1011
</import>
1112

1213
<!-- Import Physics plugins deps -->
1314
<import path="../_build/target-deps/omni_physics/deps/target-deps.packman.xml">
1415
<filter include="pxshared" />
1516
<filter include="physx" />
1617
<filter include="vhacd" />
18+
</import>
19+
20+
<import path="../_build/target-deps/omni_physics/deps/schema-deps.packman.xml">
1721
<filter include="usd_ext_physics_${config}" />
1822
</import>
1923

2024
<!-- Override the link paths to point to the correct locations. -->
2125
<dependency name="carb_sdk_plugins" linkPath="../_build/target-deps/carb_sdk_plugins"/>
22-
<dependency name="doctest" linkPath="../_build/target-deps/doctest"/>
26+
<dependency name="nv_usd_py310_${config}" linkPath="../_build/target-deps/nv_usd/${config}" />
2327
<dependency name="pybind11" linkPath="../_build/target-deps/pybind11"/>
2428
<dependency name="python" linkPath="../_build/target-deps/python"/>
2529
<dependency name="client_library" linkPath="../_build/target-deps/client_library" />
@@ -29,4 +33,8 @@
2933
<dependency name="physx" linkPath="../_build/target-deps/physx" />
3034
<dependency name="vhacd" linkPath="../_build/target-deps/vhacd" />
3135
<dependency name="usd_ext_physics_${config}" linkPath="../_build/target-deps/usd_ext_physics/${config}" />
36+
37+
<import path="../_build/${platform}/${config}/kit/dev/deps/linbuild.packman.xml">
38+
<filter include="linbuild" linkPath="../_build/host-deps/linbuild" tags="non-redist" />
39+
</import>
3240
</project>

0 commit comments

Comments
 (0)