diff --git a/CHANGES.md b/CHANGES.md index 23ade696..b26774a5 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,5 +1,10 @@ # Change Log +### v0.19.0 - 2024-04-01 + +* Added scrollbar to main window UI. +* Fixed issue when loading tilesets with Cesium ion Self-Hosted in developer mode. + ### v0.18.0 - 2024-03-01 * **Breaking change:** removed deprecated properties `projectDefaultIonAccessToken` and `projectDefaultIonAccessToken` from `CesiumDataPrim`. `CesiumIonServerPrim` should be used instead. diff --git a/CMakeLists.txt b/CMakeLists.txt index 281b1f0b..95c33d3d 100644 --- 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.18.0 + VERSION 0.19.0 DESCRIPTION "Cesium for Omniverse" LANGUAGES CXX C) diff --git a/apps/exts/cesium.performance.app/cesium/performance/app/extension.py b/apps/exts/cesium.performance.app/cesium/performance/app/extension.py index 16c703a4..59c9c4b3 100644 --- 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.eyJqdGkiOiI3NGE2ZmMwNy0xMWM1LTQ4ODAtODljMy01MmViZjc1OGI0MWYiLCJpZCI6MjU5LCJpYXQiOjE3MDkyNDQxMzF9.YPa8sXOQEXH9EIDviYFca4w_O4QCCKKXUWzPRM862vw" # noqa: E501 +ION_ACCESS_TOKEN = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJqdGkiOiI0Y2ZjNzY3NC04MWIyLTQyN2ItODg3Zi0zYzk3MmQxZWYxMmIiLCJpZCI6MjU5LCJpYXQiOjE3MTE5NzkyNzl9.GuvRiyuJO14zjA5_mIwgocOShmF4EUj2xbmikcCeXxs" # noqa: E501 GOOGLE_3D_TILES_ION_ID = 2275207 CESIUM_DATA_PRIM_PATH = "/Cesium" diff --git a/extern/cesium-native b/extern/cesium-native index 09c1eb76..e868c5c8 160000 --- a/extern/cesium-native +++ b/extern/cesium-native @@ -1 +1 @@ -Subproject commit 09c1eb76b4f3313ac8517b7c9dea70af6b5c8344 +Subproject commit e868c5c85b2de61ded38ff21a88e49f3c6617a95 diff --git a/exts/cesium.omniverse/config/extension.toml b/exts/cesium.omniverse/config/extension.toml index 00e5d80a..ff80b7c7 100644 --- a/exts/cesium.omniverse/config/extension.toml +++ b/exts/cesium.omniverse/config/extension.toml @@ -1,5 +1,5 @@ [package] -version = "0.18.0" +version = "0.19.0" category = "simulation" feature = false app = false diff --git a/src/core/include/cesium/omniverse/LoggerSink.h b/src/core/include/cesium/omniverse/LoggerSink.h index 56e68e4d..305239b2 100644 --- a/src/core/include/cesium/omniverse/LoggerSink.h +++ b/src/core/include/cesium/omniverse/LoggerSink.h @@ -1,5 +1,10 @@ #pragma once +// clang-format off +// Needs to go above Omniverse headers +#include +// clang-format on + #include #include #include diff --git a/src/core/src/GltfUtil.cpp b/src/core/src/GltfUtil.cpp index 49a92db5..2a6686ff 100644 --- a/src/core/src/GltfUtil.cpp +++ b/src/core/src/GltfUtil.cpp @@ -645,12 +645,27 @@ const CesiumGltf::ImageCesium* getFeatureIdTextureImage( return nullptr; } +#ifdef CESIUM_OMNI_GCC +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wreturn-local-addr" +#endif const auto featureIdTextureView = CesiumGltf::FeatureIdTextureView(model, pFeatureId->texture.value()); +#ifdef CESIUM_OMNI_GCC +#pragma GCC diagnostic pop +#endif + if (featureIdTextureView.status() != CesiumGltf::FeatureIdTextureViewStatus::Valid) { return nullptr; } +#ifdef CESIUM_OMNI_GCC +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wreturn-local-addr" +#endif return featureIdTextureView.getImage(); +#ifdef CESIUM_OMNI_GCC +#pragma GCC diagnostic pop +#endif } FabricMaterialInfo getMaterialInfo(const CesiumGltf::Model& model, const CesiumGltf::MeshPrimitive& primitive) {