Merge branch 'main' into kit-106-update

CesiumGS · Oct 1, 2024 · 0508a29 · 0508a29
2 parents ae23c3b + b4831ba
commit 0508a29
Show file tree

Hide file tree

Showing 24 changed files with 132 additions and 173 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -34,8 +34,8 @@ jobs:
               name: "Ubuntu - GCC",
               artifact: "linux-gcc.tar.xz",
               os: ubuntu-latest,
-              cc: "gcc-11",
-              cxx: "g++-11",
+              cc: "gcc-13",
+              cxx: "g++-13",
               build-type: "Release",
               build-code: "Ubuntu",
               cache-type: "Linux",
@@ -46,8 +46,8 @@ jobs:
               name: "AlmaLinux 8 - GCC",
               artifact: "linux-gcc.tar.xz",
               os: ubuntu-latest,
-              cc: "gcc-11",
-              cxx: "g++-11",
+              cc: "gcc-13",
+              cxx: "g++-13",
               build-type: "Release",
               build-code: "AlmaLinux8",
               cache-type: "Linux",
@@ -56,13 +56,6 @@ jobs:
             }
 
     steps:
-      - name: Removed unneeded packages to gain disk space (Unix)
-        if: runner.os != 'Windows'
-        run: |
-          df -h
-          sudo apt-get update
-          sudo apt remove google-chrome-stable x11-common xserver-common aspnetcore-runtime-6.0 aspnetcore-runtime-7.0 aspnetcore-runtime-8.0 aspnetcore-targeting-pack-6.0 aspnetcore-targeting-pack-7.0 aspnetcore-targeting-pack-8.0 dotnet-apphost-pack-6.0 dotnet-apphost-pack-7.0 dotnet-apphost-pack-8.0 dotnet-host dotnet-hostfxr-6.0 dotnet-hostfxr-7.0 dotnet-hostfxr-8.0 dotnet-runtime-6.0 dotnet-runtime-7.0 dotnet-runtime-8.0 dotnet-runtime-deps-6.0 dotnet-runtime-deps-7.0 dotnet-runtime-deps-8.0 dotnet-sdk-6.0 dotnet-sdk-7.0 dotnet-sdk-8.0 dotnet-targeting-pack-6.0 dotnet-targeting-pack-7.0 dotnet-targeting-pack-8.0 eatmydata emacsen-common firebird3.0-common-doc firebird3.0-common firefox kubectl mercurial-common mercurial microsoft-edge-stable mssql-tools mysql-client-8.0 mysql-client-core-8.0 mysql-client mysql-common mysql-server-8.0 php8.1 postgresql-14
-          df -h
       - uses: actions/checkout@v3
         with:
           submodules: recursive
@@ -94,7 +87,7 @@ jobs:
         uses: actions/cache@v3
         with:
           path: ${{ env.CONAN_USER_HOME }}/.conan
-          key: conan-${{ matrix.config.name }}-${{ hashFiles('cmake/AddConanDependencies.cmake') }}-v3
+          key: conan-${{ matrix.config.name }}-${{ hashFiles('cmake/AddConanDependencies.cmake') }}-v4
 
       # Tell ezvcpkg to look for or create its build folder (.ezvcpkg) in the repository's root directory
       # This is partly done to make the directory easily accessible to Docker builds
@@ -145,8 +138,8 @@ jobs:
         if: ${{ runner.os == 'Linux' && matrix.config.name != 'AlmaLinux 8 - GCC' }}
         run: |
           sudo apt update
-          sudo apt install -y doxygen clang-tidy-15 gcovr nvidia-driver-535
-          sudo pip3 install conan==1.63.0 black==23.1.0 flake8==6.0.0
+          sudo apt install -y doxygen clang-tidy-15 gcovr
+          sudo pip3 install conan==1.63.0 black==23.1.0 flake8==7.1.1 --break-system-packages --ignore-installed
 
       # Could not figure out how to add Chocolatey libraries to the PATH automatically with refreshenv, so
       # hardcoding their locations instead. Followed these instructions for adding to the PATH on PowerShell:
@@ -158,7 +151,7 @@ jobs:
         run: |
           choco install -y conan --version 1.63.0
           choco install -y llvm --version=15.0.7 --allow-downgrade
-          pip3 install black==23.1.0 flake8==6.0.0 requests
+          pip3 install black==23.1.0 flake8==7.1.1 requests
           echo "C:/Program Files/conan/conan" >> $env:GITHUB_PATH
 
       # Note: CMAKE_BUILD_TYPE is only used by Linux. It is ignored for Windows.

diff --git a/CHANGES.md b/CHANGES.md
@@ -1,9 +1,14 @@
 # Change Log
 
-### v0.23.0 - 2024-10-01
+### v0.24.0 - 2024-11-01
 
 * **Breaking change:** Cesium for Omniverse now requires Kit 106.0 or above (Isaac Sim 4.0.0 or above).
 
+### v0.23.0 - 2024-10-01
+
+* Fixed bug where tilesets and raster overlays were not being passed the correct custom ellipsoid.
+* Fixed rendering base color textures that contain an alpha channel.
+
 ### v0.22.0 - 2024-09-03
 
 * Cesium for Omniverse now supports using non-WGS84 ellipsoids.

diff --git a/CMakeLists.txt b/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.22.0
+    VERSION 0.23.0
     DESCRIPTION "Cesium for Omniverse"
     LANGUAGES CXX C)
 
@@ -197,6 +197,7 @@ if(CESIUM_OMNI_ENABLE_TRACING)
 endif()
 
 set(CESIUM_OMNI_CXX_DEFINES ${CESIUM_OMNI_CXX_DEFINES} CESIUM_OMNI_VERSION="${PROJECT_VERSION}")
+set(CESIUM_OMNI_CXX_DEFINES ${CESIUM_OMNI_CXX_DEFINES} CESIUM_DISABLE_DEFAULT_ELLIPSOID)
 
 # Add a define CESIUM_OMNI_GIT_HASH_ABBREVIATED
 execute_process(
@@ -571,12 +572,9 @@ execute_process(COMMAND "${Python3_EXECUTABLE}" "${SCRIPTS_DIRECTORY}/update_cer
 get_property(INSTALL_SEARCH_PATHS GLOBAL PROPERTY NVIDIA_ADDITIONAL_SEARCH_PATHS_PROPERTY)
 
 # Skip system libraries when running install
-set(INSTALL_PRE_EXCLUDE_REGEXES "api-ms-*" "ext-ms-*" "cuda")
+set(INSTALL_PRE_EXCLUDE_REGEXES "api-ms-*" "ext-ms-*")
 set(INSTALL_POST_EXCLUDE_REGEXES "system32" "^\/lib")
 
-# Skip all runtime dependencies except nvrtc when installing to exts/cesium-omniverse/bin
-set(INSTALL_PRE_INCLUDE_REGEXES "nvrtc")
-
 install(
     TARGETS CesiumUsdSchemas
     ARCHIVE DESTINATION ${KIT_PLUGIN_EXTENSION_BIN_PATH} COMPONENT install

diff --git a/apps/exts/cesium.performance.app/cesium/performance/app/extension.py b/apps/exts/cesium.performance.app/cesium/performance/app/extension.py
@@ -23,7 +23,7 @@
     Tokens as CesiumTokens,
 )
 
-ION_ACCESS_TOKEN = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJqdGkiOiIyNmQ3MzE5ZS0xOGIyLTQ2MWItYmYyOS1kZTQ4MzkyZGMxY2UiLCJpZCI6MjU5LCJpYXQiOjE3MjU0MTg4Mzh9.xCtqHsRWqUGoP94A5RYw53hniS9hflA5qy9whWWq1RU"  # noqa: E501
+ION_ACCESS_TOKEN = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJqdGkiOiJiNTNkYTkwNC0wNTY2LTQyZmEtYWI0Yi0zYWFiMjRiZTU2ZDUiLCJpZCI6MjU5LCJpYXQiOjE3Mjc3OTEyMTR9.So0Ir4rAmd5TPC5tEeLH1SthFiCkRpEvP_wzGFP2QCQ"  # noqa: E501
 GOOGLE_3D_TILES_ION_ID = 2275207
 
 CESIUM_DATA_PRIM_PATH = "/Cesium"

diff --git a/docker/AlmaLinux8.Dockerfile b/docker/AlmaLinux8.Dockerfile
@@ -3,9 +3,6 @@
 FROM almalinux:8
 
 RUN dnf upgrade -y --refresh
-RUN dnf install -y 'dnf-command(config-manager)'
-
-RUN dnf config-manager --add-repo=https://developer.download.nvidia.com/compute/cuda/repos/rhel8/x86_64/cuda-rhel8.repo
 
 # Extra repositories that have newer versions of some packages
 RUN dnf install -y -q epel-release
@@ -15,8 +12,8 @@ RUN dnf install -y -q \
     git \
     git-lfs \
     wget \
-    gcc-toolset-11 \
-    gcc-toolset-11-libubsan-devel \
+    gcc-toolset-13 \
+    gcc-toolset-13-libubsan-devel \
     make \
     doxygen \
     curl-devel \
@@ -30,13 +27,12 @@ RUN dnf install -y -q \
     libffi-devel \
     zlib-devel \
     sqlite-devel \
-    xz-devel
-
-# Install the nvidia driver.
-RUN dnf module install -y -q nvidia-driver:535-dkms
+    xz-devel \
+    zip \
+    unzip
 
-# Enables gcc 11 for use within the docker image.
-RUN echo "source /opt/rh/gcc-toolset-11/enable" >> /etc/bashrc
+# Enables gcc 13 for use within the docker image.
+RUN echo "source /opt/rh/gcc-toolset-13/enable" >> /etc/bashrc
 SHELL ["/bin/bash", "--login", "-c"]
 
 # Install newer version of Python

diff --git a/docker/CI.Dockerfile b/docker/CI.Dockerfile
@@ -1,4 +1,4 @@
-FROM cesiumgs/omniverse-almalinux8-build:2024-09-12
+FROM cesiumgs/omniverse-almalinux8-build:2024-10-01
 
 WORKDIR /var/app
 

diff --git a/docker/CentOS7.Dockerfile b/docker/CentOS7.Dockerfile
@@ -4,19 +4,16 @@ FROM centos:7
 
 RUN yum update -y -q
 
-# Add nvidia repository
-RUN yum-config-manager --add-repo https://developer.download.nvidia.com/compute/cuda/repos/rhel7/x86_64/cuda-rhel7.repo
-
 # Extra repositories that have newer versions of some packages
 RUN yum install -y -q \
     epel-release \
     centos-release-scl
 
 RUN yum install -y -q \
-    # for gcc-11
-    devtoolset-11-toolchain \
+    # for gcc-13
+    devtoolset-13-toolchain \
     # for ubsan
-    devtoolset-11-libubsan-devel \
+    devtoolset-13-libubsan-devel \
     # get a newer version of git and git-lfs
     # CentOS 7 comes with version 1.8.3.1 by default, which is from 2013!
     rh-git218 \
@@ -35,14 +32,15 @@ RUN yum install -y -q \
     zlib-devel \
     sqlite-devel \
     xz-devel \
-    nvidia-driver-branch-535.x86_64
+    zip \
+    unzip
 
 # Create links to some of the custom packages
-RUN update-alternatives --install /usr/bin/gcc gcc /opt/rh/devtoolset-11/root/usr/bin/gcc 100 && \
-    update-alternatives --install /usr/bin/g++ g++ /opt/rh/devtoolset-11/root/usr/bin/g++ 100 && \
-    update-alternatives --install /usr/bin/cc cc /opt/rh/devtoolset-11/root/usr/bin/gcc 100 && \
-    update-alternatives --install /usr/bin/c++ c++ /opt/rh/devtoolset-11/root/usr/bin/g++ 100 && \
-    update-alternatives --install /usr/bin/gcov gcov /opt/rh/devtoolset-11/root/usr/bin/gcov 100 && \
+RUN update-alternatives --install /usr/bin/gcc gcc /opt/rh/devtoolset-13/root/usr/bin/gcc 100 && \
+    update-alternatives --install /usr/bin/g++ g++ /opt/rh/devtoolset-13/root/usr/bin/g++ 100 && \
+    update-alternatives --install /usr/bin/cc cc /opt/rh/devtoolset-13/root/usr/bin/gcc 100 && \
+    update-alternatives --install /usr/bin/c++ c++ /opt/rh/devtoolset-13/root/usr/bin/g++ 100 && \
+    update-alternatives --install /usr/bin/gcov gcov /opt/rh/devtoolset-13/root/usr/bin/gcov 100 && \
     update-alternatives --install /usr/bin/git git /opt/rh/rh-git218/root/usr/bin/git 100 && \
     update-alternatives --install /usr/bin/git-lfs git-lfs /opt/rh/rh-git218/root/usr/bin/git-lfs 100
 

diff --git a/docs/developer-setup/README.md b/docs/developer-setup/README.md
@@ -64,7 +64,7 @@ See [Linux](#linux) or [Windows](#windows) for step-by-step installation instruc
   ```
 - Install `black` and `flake8`
   ```sh
-  pip3 install black==23.1.0 flake8==6.0.0
+  pip3 install black==23.1.0 flake8==7.1.1
   ```
 - Add symlinks the clang-15 tools so that the correct version is chosen when running `clang-format`, `clang-tidy`, etc
   ```sh
@@ -127,7 +127,7 @@ There are two ways to install prerequisites for Windows, [manually](#install-man
   ```
 - Install `black` and `flake8`
   ```sh
-  pip3 install black==23.1.0 flake8==6.0.0
+  pip3 install black==23.1.0 flake8==7.1.1
   ```
 - Install `colorama` to enable color diff support
   ```sh
@@ -181,7 +181,7 @@ There are two ways to install prerequisites for Windows, [manually](#install-man
   ```
 - Install `black` and `flake8`
   ```sh
-  pip3 install black==23.1.0 flake8==6.0.0
+  pip3 install black==23.1.0 flake8==7.1.1
   ```
 - Install `colorama` to enable color diff support
   ```sh

diff --git a/extern/CMakeLists.txt b/extern/CMakeLists.txt
@@ -220,7 +220,6 @@ set(KIT_SDK_ROOT "${NVIDIA_BUILD_DIR}/target-deps/kit-sdk")
 set(KIT_OMNI_UI_ROOT "${NVIDIA_BUILD_DIR}/target-deps/omni-ui")
 set(KIT_IMGUI_ROOT "${NVIDIA_BUILD_DIR}/target-deps/omni-kit-renderer-imgui")
 set(PYBIND11_ROOT "${NVIDIA_BUILD_DIR}/target-deps/pybind11")
-set(CUDA_ROOT "${NVIDIA_BUILD_DIR}/target-deps/cuda")
 
 set(NVIDIA_USD_LIBRARIES
     ar
@@ -384,101 +383,6 @@ add_prebuilt_project_header_only(
 )
 # cmake-format: on
 
-if(WIN32)
-    # cmake-format: off
-    add_prebuilt_project_import_library_only(
-        RELEASE_INCLUDE_DIR
-            "${CUDA_ROOT}"
-        DEBUG_INCLUDE_DIR
-            "${CUDA_ROOT}"
-        RELEASE_LIBRARY_DIR
-            "${CUDA_ROOT}/cuda/lib/x64"
-        DEBUG_LIBRARY_DIR
-            "${CUDA_ROOT}/cuda/lib/x64"
-        RELEASE_LIBRARIES
-            cuda
-        DEBUG_LIBRARIES
-            cuda
-        TARGET_NAMES
-            cuda
-    )
-    # cmake-format: on
-else()
-    # Find the directory containing libcuda.so, e.g. /usr/lib/x86_64-linux-gnu
-    find_library(
-        CUDA_DRIVER_LIB
-        cuda
-        REQUIRED
-        NO_CACHE)
-    get_filename_component(CUDA_DRIVER_DIR "${CUDA_DRIVER_LIB}" DIRECTORY)
-
-    # cmake-format: off
-    add_prebuilt_project(
-        RELEASE_INCLUDE_DIR
-            "${CUDA_ROOT}"
-        DEBUG_INCLUDE_DIR
-            "${CUDA_ROOT}"
-        RELEASE_LIBRARY_DIR
-            "${CUDA_DRIVER_DIR}"
-        DEBUG_LIBRARY_DIR
-            "${CUDA_DRIVER_DIR}"
-        RELEASE_LIBRARIES
-            cuda
-        DEBUG_LIBRARIES
-            cuda
-        TARGET_NAMES
-            cuda)
-    # cmake-format: on
-endif()
-
-if(WIN32)
-    # cmake-format: off
-    add_prebuilt_project(
-        RELEASE_INCLUDE_DIR
-            "${CUDA_ROOT}"
-        DEBUG_INCLUDE_DIR
-            "${CUDA_ROOT}"
-        RELEASE_LIBRARY_DIR
-            "${CUDA_ROOT}/cuda/lib/x64"
-        RELEASE_DLL_DIR
-            "${CUDA_ROOT}/cuda/bin"
-        DEBUG_LIBRARY_DIR
-            "${CUDA_ROOT}/cuda/lib/x64"
-        DEBUG_DLL_DIR
-            "${CUDA_ROOT}/cuda/bin"
-        RELEASE_LIBRARIES
-            nvrtc
-        DEBUG_LIBRARIES
-            nvrtc
-        RELEASE_DLL_LIBRARIES
-            nvrtc64_112_0
-        DEBUG_DLL_LIBRARIES
-            nvrtc64_112_0
-        TARGET_NAMES
-            nvrtc
-    )
-    # cmake-format: on
-else()
-    # cmake-format: off
-    add_prebuilt_project(
-        RELEASE_INCLUDE_DIR
-            "${CUDA_ROOT}"
-        DEBUG_INCLUDE_DIR
-            "${CUDA_ROOT}"
-        RELEASE_LIBRARY_DIR
-            "${CUDA_ROOT}/cuda/lib64"
-        DEBUG_LIBRARY_DIR
-            "${CUDA_ROOT}/cuda/lib64"
-        RELEASE_LIBRARIES
-            nvrtc
-        DEBUG_LIBRARIES
-            nvrtc
-        TARGET_NAMES
-            nvrtc
-    )
-    # cmake-format: on
-endif()
-
 # cmake-format: off
 # omni.ui gives us access to DynamicTextureProvider.h
 add_prebuilt_project(

diff --git a/extern/cesium-native b/extern/cesium-native
diff --git a/extern/nvidia/deps/target-deps.packman.xml b/extern/nvidia/deps/target-deps.packman.xml
@@ -5,12 +5,10 @@
     <filter include="nv_usd_py310_release"/>
     <filter include="carb_sdk_plugins"/>
     <filter include="pybind11"/>
-    <filter include="cuda"/>
   </import>
   <!-- Override the link paths to point to the correct locations. -->
   <dependency name="python" linkPath="../_build/target-deps/python"/>
   <dependency name="nv_usd_py310_release" linkPath="../_build/target-deps/usd/release"/>
   <dependency name="carb_sdk_plugins" linkPath="../_build/target-deps/carb_sdk_plugins"/>
   <dependency name="pybind11" linkPath="../_build/target-deps/pybind11/pybind11"/>
-  <dependency name="cuda" linkPath="../_build/target-deps/cuda/cuda"/>
 </project>
diff --git a/exts/cesium.omniverse/config/extension.toml b/exts/cesium.omniverse/config/extension.toml
@@ -1,5 +1,5 @@
 [package]
-version = "0.22.0"
+version = "0.23.0"
 category = "simulation"
 feature = false
 app = false