Skip to content

Commit 061463c

Browse files
authored
Merge pull request #746 from CesiumGS/kit-107
Update to kit-kernel@107
2 parents 54498c1 + 0e04be4 commit 061463c

File tree

61 files changed

+473
-247
lines changed

Some content is hidden

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

61 files changed

+473
-247
lines changed

.gitattributes

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,4 @@
88
*.cmd text eol=crlf
99
# Make sure shell scripts have LF line endings, even when checked out on a Windows client with autocrlf=true
1010
*.sh text eol=lf
11+
*.whl filter=lfs diff=lfs merge=lfs -text

.gitignore

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,13 @@ trace.csv
3838
!.vs/launch.vs.json
3939

4040
# Installed python bindings
41-
exts/cesium.omniverse/cesium/omniverse/bindings/CesiumOmniversePythonBindings.cpython-310-x86_64-linux-gnu.so
42-
exts/cesium.omniverse/cesium/omniverse/bindings/CesiumOmniversePythonBindings.cp310-win_amd64.pyd
41+
exts/cesium.omniverse/cesium/omniverse/bindings/CesiumOmniversePythonBindings.cpython-311-x86_64-linux-gnu.so
42+
exts/cesium.omniverse/cesium/omniverse/bindings/CesiumOmniversePythonBindings.cp311-win_amd64.pyd
4343
exts/cesium.usd.plugins/cesium/usd/plugins/CesiumUsdSchemas/_CesiumUsdSchemas.so
4444
exts/cesium.usd.plugins/cesium/usd/plugins/CesiumUsdSchemas/_CesiumUsdSchemas.pyd
4545
exts/cesium.usd.plugins/cesium/usd/plugins/CesiumUsdSchemas/_CesiumUsdSchemas.lib
46-
exts/cesium.omniverse.cpp.tests/cesium/omniverse/cpp/tests/bindings/CesiumOmniverseCppTestsPythonBindings.cpython-310-x86_64-linux-gnu.so
47-
exts/cesium.omniverse.cpp.tests/cesium/omniverse/cpp/tests/bindings/CesiumOmniverseCppTestsPythonBindings.cp310-win_amd64.pyd
46+
exts/cesium.omniverse.cpp.tests/cesium/omniverse/cpp/tests/bindings/CesiumOmniverseCppTestsPythonBindings.cpython-311-x86_64-linux-gnu.so
47+
exts/cesium.omniverse.cpp.tests/cesium/omniverse/cpp/tests/bindings/CesiumOmniverseCppTestsPythonBindings.cp311-win_amd64.pyd
4848

4949
# Installed libraries
5050
exts/cesium.omniverse/bin/

CHANGES.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
# Change Log
22

3-
### v0.25.0 - 2026-01-05
3+
### v0.27.0 - 2026-02-05
4+
5+
* **Breaking change:** Cesium for Omniverse now requires Kit 107.3 or above (Isaac Sim 5.1.0 or above).
6+
7+
### v0.26.0 - 2026-01-05
48

59
* Fixed loading KTX2 textures with mipmaps.
610

CMakeLists.txt

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -378,6 +378,9 @@ set(CESIUM_OMNI_CXX_DEFINES
378378
# Boost is a dependency of USD. It is dynamically linked so we need to set this flag.
379379
set(CESIUM_OMNI_CXX_DEFINES ${CESIUM_OMNI_CXX_DEFINES} BOOST_ALL_DYN_LINK)
380380

381+
# Disable auto-linking
382+
set(CESIUM_OMNI_CXX_DEFINES ${CESIUM_OMNI_CXX_DEFINES} BOOST_ALL_NO_LIB)
383+
381384
# Hide USD build warning
382385
set(CESIUM_OMNI_CXX_DEFINES ${CESIUM_OMNI_CXX_DEFINES} BOOST_BIND_GLOBAL_PLACEHOLDERS)
383386

@@ -397,13 +400,6 @@ if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
397400
set(CESIUM_OMNI_CXX_DEFINES ${CESIUM_OMNI_CXX_DEFINES} _GLIBCXX_PERMIT_BACKWARD_HASH)
398401
endif()
399402

400-
# USD is compiled with the old C++ ABI so we need to compile our own code and external libraries
401-
# with the old ABI. Only relevant for libraries that have std::string or std::list in their
402-
# public interface, which includes cesium-native and spdlog.
403-
# See https://gcc.gnu.org/onlinedocs/libstdc++/manual/using_dual_abi.html
404-
if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
405-
set(CESIUM_OMNI_CXX_DEFINES ${CESIUM_OMNI_CXX_DEFINES} _GLIBCXX_USE_CXX11_ABI=0)
406-
endif()
407403

408404
set(CESIUM_OMNI_CXX_FLAGS
409405
${CESIUM_OMNI_CXX_FLAGS}

apps/cesium.omniverse.dev.kit

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,15 @@ title = "Cesium For Omniverse Testing App"
33
version = "0.0.0"
44
app = true
55

6+
# List public registries
7+
# See https://docs.omniverse.nvidia.com/dev-guide/latest/release-notes/107_0.html#known-issues
8+
[settings.exts."omni.kit.registry.nucleus"]
9+
registries = [
10+
{ name = "kit/default", url = "https://ovextensionsprod.blob.core.windows.net/exts/kit/prod/107/shared" },
11+
{ name = "kit/sdk", url = "https://ovextensionsprod.blob.core.windows.net/exts/kit/prod/sdk/${kit_version_short}/${kit_git_hash}" },
12+
{ name = "kit/community", url = "https://dw290v42wisod.cloudfront.net/exts/kit/community" },
13+
]
14+
615
[dependencies]
716
# Include basic configuration (that brings most of basic extensions)
817
"omni.app.base" = {}

apps/omni.app.base.kit

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,6 @@ support_level = "Sample"
7171

7272
# Dev & Utils Windows
7373
"omni.kit.window.about" = {}
74-
"omni.kit.window.privacy" = {}
7574
"omni.kit.window.stats" = { order = 1000 }
7675
"omni.kit.window.script_editor" = {}
7776
"omni.kit.window.console" = {}

cmake/AddConanDependencies.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ set(REQUIRES
1111
"zlib/1.2.13@#13c96f538b52e1600c40b88994de240f"
1212
"yaml-cpp/0.7.0@#85b409c274a53d226b71f1bdb9cb4f8b"
1313
"libcurl/8.2.1@#8f62ba7135f5445e5fe6c4bd85143b53"
14-
"nasm/2.15.05@#799d63b1672a337584b09635b0f22fc1")
14+
"nasm/2.15.05@#058c93b2214a49ca1cfe9f8f26205568")
1515

1616
if(WIN32)
17-
set(REQUIRES ${REQUIRES} "strawberryperl/5.32.1.1@#8f83d05a60363a422f9033e52d106b47")
17+
set(REQUIRES ${REQUIRES} "strawberryperl/5.32.1.1@#707032463aa0620fa17ec0d887f5fe41")
1818
endif()
1919

2020
# cmake-format: off

cmake/Macros.cmake

Lines changed: 20 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -313,11 +313,6 @@ $<$<CONFIG:MinSizeRel>:${_EXPECTED_MINSIZEREL_POSTFIX}>")
313313

314314
set(EXTERN_CXX_FLAGS "")
315315

316-
if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
317-
# Build with old C++ ABI. See top-level CMakeLists.txt for explanation.
318-
set(EXTERN_CXX_FLAGS ${EXTERN_CXX_FLAGS} "-D_GLIBCXX_USE_CXX11_ABI=0")
319-
endif()
320-
321316
if(MSVC)
322317
# See https://learn.microsoft.com/en-us/cpp/error-messages/compiler-warnings/compiler-warning-level-1-c4530?view=msvc-170
323318
set(EXTERN_CXX_FLAGS ${EXTERN_CXX_FLAGS} "/EHsc")
@@ -392,7 +387,7 @@ function(add_prebuilt_project)
392387
""
393388
""
394389
"RELEASE_INCLUDE_DIR;DEBUG_INCLUDE_DIR;RELEASE_LIBRARY_DIR;RELEASE_DLL_DIR;DEBUG_LIBRARY_DIR;DEBUG_DLL_DIR"
395-
"RELEASE_LIBRARIES;RELEASE_DLL_LIBRARIES;DEBUG_LIBRARIES;DEBUG_DLL_LIBRARIES;TARGET_NAMES"
390+
"RELEASE_LIBRARIES;RELEASE_DLL_LIBRARIES;DEBUG_LIBRARIES;DEBUG_DLL_LIBRARIES;TARGET_NAMES;TARGETS_IN_DLL_DIR"
396391
${ARGN})
397392

398393
if(NOT DEFINED _RELEASE_DLL_LIBRARIES)
@@ -450,8 +445,25 @@ $<$<CONFIG:MinSizeRel>:${_RELEASE_INCLUDE_DIR}>")
450445
PATHS ${_DEBUG_LIBRARY_DIR}
451446
NO_DEFAULT_PATH NO_CACHE)
452447

453-
set(${TARGET_NAME}_LIBRARY_RELEASE "${_RELEASE_DLL_DIR}/${RELEASE_DLL_NAME}.dll")
454-
set(${TARGET_NAME}_LIBRARY_DEBUG "${_DEBUG_DLL_DIR}/${DEBUG_DLL_NAME}.dll")
448+
# Determine which directory to use for DLLs
449+
# If TARGETS_IN_DLL_DIR is empty, default to DLL_DIR for all targets
450+
# Otherwise, only targets in TARGETS_IN_DLL_DIR use DLL_DIR; others use LIBRARY_DIR
451+
if(NOT _TARGETS_IN_DLL_DIR)
452+
# Empty list - default all to DLL_DIR
453+
set(RELEASE_DLL_LOCATION "${_RELEASE_DLL_DIR}")
454+
set(DEBUG_DLL_LOCATION "${_DEBUG_DLL_DIR}")
455+
elseif(TARGET_NAME IN_LIST _TARGETS_IN_DLL_DIR)
456+
# Target is in the DLL_DIR list
457+
set(RELEASE_DLL_LOCATION "${_RELEASE_DLL_DIR}")
458+
set(DEBUG_DLL_LOCATION "${_DEBUG_DLL_DIR}")
459+
else()
460+
# Target is not in the DLL_DIR list - use LIBRARY_DIR
461+
set(RELEASE_DLL_LOCATION "${_RELEASE_LIBRARY_DIR}")
462+
set(DEBUG_DLL_LOCATION "${_DEBUG_LIBRARY_DIR}")
463+
endif()
464+
465+
set(${TARGET_NAME}_LIBRARY_RELEASE "${RELEASE_DLL_LOCATION}/${RELEASE_DLL_NAME}.dll")
466+
set(${TARGET_NAME}_LIBRARY_DEBUG "${DEBUG_DLL_LOCATION}/${DEBUG_DLL_NAME}.dll")
455467
else()
456468
find_library(
457469
${TARGET_NAME}_LIBRARY_RELEASE

extern/CMakeLists.txt

Lines changed: 48 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -169,8 +169,10 @@ endif()
169169

170170
if(WIN32)
171171
set(NVIDIA_PLATFORM_NAME "windows-x86_64")
172+
set(CARB_PLATFORM_NAME "windows-x86_64")
172173
elseif(UNIX AND NOT APPLE)
173-
set(NVIDIA_PLATFORM_NAME "linux-x86_64")
174+
set(NVIDIA_PLATFORM_NAME "manylinux_2_35_x86_64")
175+
set(CARB_PLATFORM_NAME "linux-x86_64")
174176
else()
175177
message(FATAL_ERROR "Only Windows and Linux are supported")
176178
endif()
@@ -207,27 +209,27 @@ set(KIT_IMGUI_ROOT "${NVIDIA_BUILD_DIR}/target-deps/omni-kit-renderer-imgui")
207209
set(PYBIND11_ROOT "${NVIDIA_BUILD_DIR}/target-deps/pybind11")
208210

209211
set(NVIDIA_USD_LIBRARIES
210-
ar
211-
arch
212-
gf
213-
js
214-
kind
215-
ndr
216-
pcp
217-
plug
218-
sdf
219-
sdr
220-
tf
221-
trace
222-
usd
223-
usdGeom
224-
usdLux
225-
usdShade
226-
usdUI
227-
usdUtils
228-
usdVol
229-
vt
230-
work)
212+
usd_ar
213+
usd_arch
214+
usd_gf
215+
usd_js
216+
usd_kind
217+
usd_ndr
218+
usd_pcp
219+
usd_plug
220+
usd_sdf
221+
usd_sdr
222+
usd_tf
223+
usd_trace
224+
usd_usd
225+
usd_usdGeom
226+
usd_usdLux
227+
usd_usdShade
228+
usd_usdUI
229+
usd_usdUtils
230+
usd_usdVol
231+
usd_vt
232+
usd_work)
231233

232234
# Add base USD libraries
233235
set(NVIDIA_USD_TARGET_NAMES ${NVIDIA_USD_LIBRARIES})
@@ -245,14 +247,14 @@ else()
245247
endif()
246248

247249
# Add boost python
248-
set(NVIDIA_USD_TARGET_NAMES ${NVIDIA_USD_TARGET_NAMES} boost_python310)
250+
set(NVIDIA_USD_TARGET_NAMES ${NVIDIA_USD_TARGET_NAMES} boost_python311)
249251

250252
if(WIN32)
251-
set(NVIDIA_USD_RELEASE_LIBRARIES ${NVIDIA_USD_RELEASE_LIBRARIES} boost_python310-vc142-mt-x64-1_76)
252-
set(NVIDIA_USD_DEBUG_LIBRARIES ${NVIDIA_USD_DEBUG_LIBRARIES} boost_python310-vc142-mt-gd-x64-1_76)
253+
set(NVIDIA_USD_RELEASE_LIBRARIES ${NVIDIA_USD_RELEASE_LIBRARIES} boost_python311-vc142-mt-x64-1_82)
254+
set(NVIDIA_USD_DEBUG_LIBRARIES ${NVIDIA_USD_DEBUG_LIBRARIES} boost_python311-vc142-mt-x64-1_82)
253255
else()
254-
set(NVIDIA_USD_RELEASE_LIBRARIES ${NVIDIA_USD_RELEASE_LIBRARIES} boost_python310)
255-
set(NVIDIA_USD_DEBUG_LIBRARIES ${NVIDIA_USD_DEBUG_LIBRARIES} boost_python310)
256+
set(NVIDIA_USD_RELEASE_LIBRARIES ${NVIDIA_USD_RELEASE_LIBRARIES} boost_python311)
257+
set(NVIDIA_USD_DEBUG_LIBRARIES ${NVIDIA_USD_DEBUG_LIBRARIES} boost_python311)
256258
endif()
257259

258260
if(${USE_NVIDIA_RELEASE_LIBRARIES})
@@ -267,14 +269,20 @@ add_prebuilt_project(
267269
"${NVIDIA_USD_ROOT}/${NVIDIA_DEBUG_FOLDER_NAME}/include"
268270
RELEASE_LIBRARY_DIR
269271
"${NVIDIA_USD_ROOT}/${NVIDIA_RELEASE_FOLDER_NAME}/lib"
272+
RELEASE_DLL_DIR
273+
"${NVIDIA_USD_ROOT}/${NVIDIA_RELEASE_FOLDER_NAME}/bin"
270274
DEBUG_LIBRARY_DIR
271275
"${NVIDIA_USD_ROOT}/${NVIDIA_DEBUG_FOLDER_NAME}/lib"
276+
DEBUG_DLL_DIR
277+
"${NVIDIA_USD_ROOT}/${NVIDIA_DEBUG_FOLDER_NAME}/bin"
272278
RELEASE_LIBRARIES
273279
${NVIDIA_USD_RELEASE_LIBRARIES}
274280
DEBUG_LIBRARIES
275281
${NVIDIA_USD_DEBUG_LIBRARIES}
276282
TARGET_NAMES
277283
${NVIDIA_USD_TARGET_NAMES}
284+
TARGETS_IN_DLL_DIR
285+
tbb
278286
)
279287
# cmake-format: on
280288

@@ -294,30 +302,30 @@ if(WIN32)
294302
DEBUG_DLL_DIR
295303
"${PYTHON_ROOT}"
296304
RELEASE_LIBRARIES
297-
python310
305+
python311
298306
DEBUG_LIBRARIES
299-
python310
307+
python311
300308
TARGET_NAMES
301-
python310
309+
python311
302310
)
303311
# cmake-format: on
304312
else()
305313
# cmake-format: off
306314
add_prebuilt_project(
307315
RELEASE_INCLUDE_DIR
308-
"${PYTHON_ROOT}/include/python3.10"
316+
"${PYTHON_ROOT}/include/python3.11"
309317
DEBUG_INCLUDE_DIR
310-
"${PYTHON_ROOT}/include/python3.10"
318+
"${PYTHON_ROOT}/include/python3.11"
311319
RELEASE_LIBRARY_DIR
312320
"${PYTHON_ROOT}/lib"
313321
DEBUG_LIBRARY_DIR
314322
"${PYTHON_ROOT}/lib"
315323
RELEASE_LIBRARIES
316-
python3.10
324+
python3.11
317325
DEBUG_LIBRARIES
318-
python3.10
326+
python3.11
319327
TARGET_NAMES
320-
python310
328+
python311
321329
)
322330
# cmake-format: on
323331
endif()
@@ -338,9 +346,9 @@ add_prebuilt_project(
338346
DEBUG_INCLUDE_DIR
339347
"${CARB_ROOT}/include"
340348
RELEASE_LIBRARY_DIR
341-
"${CARB_ROOT}/_build/${NVIDIA_PLATFORM_NAME}/${NVIDIA_RELEASE_FOLDER_NAME}"
349+
"${CARB_ROOT}/_build/${CARB_PLATFORM_NAME}/${NVIDIA_RELEASE_FOLDER_NAME}"
342350
DEBUG_LIBRARY_DIR
343-
"${CARB_ROOT}/_build/${NVIDIA_PLATFORM_NAME}/${NVIDIA_DEBUG_FOLDER_NAME}"
351+
"${CARB_ROOT}/_build/${CARB_PLATFORM_NAME}/${NVIDIA_DEBUG_FOLDER_NAME}"
344352
RELEASE_LIBRARIES
345353
carb
346354
DEBUG_LIBRARIES
@@ -389,16 +397,13 @@ add_prebuilt_project(
389397
# cmake-format: on
390398

391399
if(WIN32)
392-
set(NVIDIA_ADDITIONAL_LIBRARIES
393-
"${KIT_IMGUI_ROOT}/bin/imgui.dll"
394-
"${KIT_IMGUI_ROOT}/bin/deps/freetype.dll"
395-
)
400+
set(NVIDIA_ADDITIONAL_LIBRARIES "${KIT_IMGUI_ROOT}/bin/imgui.dll")
396401

397402
set_property(GLOBAL PROPERTY NVIDIA_ADDITIONAL_LIBRARIES_PROPERTY "${NVIDIA_ADDITIONAL_LIBRARIES}")
398403
else()
399404
set(NVIDIA_ADDITIONAL_SEARCH_PATHS
400-
"$<TARGET_FILE_DIR:python310>"
401-
"$<TARGET_FILE_DIR:usd>"
405+
"$<TARGET_FILE_DIR:python311>"
406+
"$<TARGET_FILE_DIR:usd_usd>"
402407
"$<TARGET_FILE_DIR:carb>"
403408
# This is where freetype is located on Linux
404409
"${KIT_IMGUI_ROOT}/bin/deps")

extern/nvidia/debug-deps/kit-sdk.packman.user.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<project toolsVersion="5.6">
22
<dependency name="kit-kernel-debug" linkPath="../_build/target-deps/kit-sdk-debug/">
3-
<package name="kit-kernel" version="106.5.0+release.162521.d02c707b.gl.${platform}.debug"/>
3+
<package name="kit-kernel" version="107.3.0+feature.199947.b0a86421.gl.${platform}.release"/>
44
</dependency>
55
<!-- build-time dependencies -->
66
<!-- the versions MUST correspond to the versions pulled in by kit-kernel during extension precaching-->
@@ -14,11 +14,11 @@
1414
[omni.kit.registry.nucleus] [tid: 140737352547200] downloading: 'http://d4i3qtqj3r0z5.cloudfront.net/omni.kit.renderer.imgui-61a6e663a4d57772.zip' -> '/tmp/tmpi1uqvpk1/omni.kit.renderer.imgui-1.0.2+d02c707b.lx64.r.cp310.zip'...
1515
-->
1616
<dependency name="omni-ui" linkPath="../_build/target-deps/omni-ui/">
17-
<package name="omni.ui" version="0731e3357092fe79" platforms="linux-x86_64"/>
18-
<package name="omni.ui" version="8023ee171a9c720f" platforms="windows-x86_64"/>
17+
<package name="omni.ui" version="8cfe2dbd9d3266b6" platforms="linux-x86_64 manylinux_2_35_x86_64"/>
18+
<package name="omni.ui" version="1fbb6da913c9dfa8" platforms="windows-x86_64"/>
1919
</dependency>
2020
<dependency name="omni-kit-renderer-imgui" linkPath="../_build/target-deps/omni-kit-renderer-imgui/">
21-
<package name="omni.kit.renderer.imgui" version="61a6e663a4d57772" platforms="linux-x86_64" />
22-
<package name="omni.kit.renderer.imgui" version="e78ad49422b0302a" platforms="windows-x86_64" />
21+
<package name="omni.kit.renderer.imgui" version="617e1ab163fd09a2" platforms="linux-x86_64 manylinux_2_35_x86_64" />
22+
<package name="omni.kit.renderer.imgui" version="9bfff9ba25aa72c2" platforms="windows-x86_64" />
2323
</dependency>
2424
</project>

0 commit comments

Comments
 (0)