Merge branch 'main' into kit-107-update-2

Author: lilleyse

.github/workflows/main.yml

@@ -138,7 +138,9 @@ jobs:
         if: ${{ runner.os == 'Linux' && matrix.config.name != 'AlmaLinux 8 - GCC' }}
         run: |
           sudo apt update
-          sudo apt install -y doxygen clang-tidy-15 gcovr
+          sudo apt install -y doxygen clang-tidy-15 clang-format-15 gcovr
+          sudo update-alternatives --install /usr/bin/clang-format clang-format /usr/bin/clang-format-15 100
+          sudo update-alternatives --set clang-format /usr/bin/clang-format-15
           sudo pip3 install conan==1.63.0 black==23.1.0 flake8==7.1.1 --ignore-installed
 
       # Could not figure out how to add Chocolatey libraries to the PATH automatically with refreshenv, so
@@ -151,6 +153,7 @@ jobs:
         run: |
           choco install -y conan --version 1.63.0
           choco install -y llvm --version=15.0.7 --allow-downgrade
+          echo "C:/Program Files/LLVM/bin" >> $env:GITHUB_PATH
           pip3 install black==23.1.0 flake8==7.1.1 requests
           echo "C:/Program Files/conan/conan" >> $env:GITHUB_PATH
 

CHANGES.md

@@ -1,6 +1,10 @@
 # Change Log
 
-### v0.25.0 - 2024-04-01
+### v0.25.0 - 2026-01-05
+
+* Fixed loading KTX2 textures with mipmaps.
+
+### v0.25.0 - 2025-04-01
 
 * **Breaking change:** Cesium for Omniverse now requires Kit 106.5 or above (Isaac Sim 4.5.0 or above).
 

CMakeLists.txt

@@ -9,7 +9,7 @@ endif()
 # Both CXX and C need to be given otherwise Conan may ignore the CMAKE_C_COMPILER flag
 project(
     CesiumOmniverse
-    VERSION 0.24.0
+    VERSION 0.26.0
     DESCRIPTION "Cesium for Omniverse"
     LANGUAGES CXX C)
 

apps/exts/cesium.performance.app/cesium/performance/app/extension.py

@@ -23,7 +23,7 @@
     Tokens as CesiumTokens,
 )
 
-ION_ACCESS_TOKEN = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJqdGkiOiJkZWI3NjA5Yy01Mjc1LTQzMmMtYTg5NS00NDU0NzI1ZWUzYTkiLCJpZCI6MjU5LCJpYXQiOjE3MzA0NjY1NDJ9.LAGLqUcOI1wUKYvpEYfgd0PfAbAB0pN9KsZjiMlyCks"  # noqa: E501
+ION_ACCESS_TOKEN = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJqdGkiOiIyYjg2NWRjMS1iM2EzLTQ0NmQtYTJlMi05MjEyMTcxYWI1YWMiLCJpZCI6MjU5LCJpYXQiOjE3Njc2Mjc1NTN9.bXYbdecWJWzddE_ZuYjIDtWS67bypgZUuXyDgEsukuo"  # noqa: E501
 GOOGLE_3D_TILES_ION_ID = 2275207
 
 CESIUM_DATA_PRIM_PATH = "/Cesium"

exts/cesium.omniverse/config/extension.toml

@@ -1,5 +1,5 @@
 [package]
-version = "0.24.0"
+version = "0.26.0"
 category = "simulation"
 feature = false
 app = false
@@ -33,7 +33,7 @@ python = false
 
 # Which extensions this extension depends on
 [dependencies]
-"cesium.usd.plugins" = { version = "0.6.0" }
+"cesium.usd.plugins" = { version = "0.7.0" }
 "usdrt.scenegraph" = {}
 "omni.ui" = {}
 "omni.usd" = {}

exts/cesium.omniverse/premake5.lua

@@ -8,3 +8,5 @@ repo_build.prebuild_link { "certs", ext.target_dir.."/certs" }
 repo_build.prebuild_link { "cesium", ext.target_dir.."/cesium" }
 repo_build.prebuild_link { "doc", ext.target_dir.."/doc" }
 repo_build.prebuild_link { "images", ext.target_dir.."/images" }
+repo_build.prebuild_link { "mdl", ext.target_dir.."/mdl" }
+repo_build.prebuild_link { "vendor", ext.target_dir.."/vendor" }

exts/cesium.usd.plugins/config/extension.toml

@@ -4,7 +4,7 @@
 order = -100
 
 [package]
-version = "0.6.0"
+version = "0.7.0"
 category = "simulation"
 feature = false
 app = false

src/core/src/FabricTexture.cpp

@@ -120,9 +120,15 @@ void FabricTexture::setImage(const CesiumGltf::ImageCesium& image, TransferFunct
     } else {
         // As of Kit 105.1, omni::ui::kAutoCalculateStride doesn't work for compressed textures. This value somehow works.
         const auto stride = isCompressed ? 4ULL * static_cast<uint64_t>(image.width) : omni::ui::kAutoCalculateStride;
-        const auto data = reinterpret_cast<const uint8_t*>(image.pixelData.data());
+        auto data = reinterpret_cast<const uint8_t*>(image.pixelData.data());
         const auto dimensions = carb::Uint2{static_cast<uint32_t>(image.width), static_cast<uint32_t>(image.height)};
 
+        if (!image.mipPositions.empty()) {
+            // Just set the first mip level for now
+            // Later, investigate using setMipMappedBytesData
+            data = data + image.mipPositions[0].byteOffset;
+        }
+
         _pTexture->setBytesData(data, dimensions, stride, imageFormat);
     }
 }

vcpkg/ports/ktx/portfile.cmake

@@ -1,7 +1,7 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO KhronosGroup/KTX-Software
-    REF "v${VERSION}"
+    REF "refs/tags/v${VERSION}"
     SHA512 5a89f8986464705ec36ac1becaddd0ff335e4c3c235468aaef0e963fcfeda4c0d669a086b91e61c16a3ae9e1fa5bf456dccf12cc65720e1a22e7cc0f30552541
     HEAD_REF master
     PATCHES