From c2fe4b01d0a9c86e0a129668a69ac34c97709188 Mon Sep 17 00:00:00 2001 From: Jason Beverage Date: Thu, 25 Jul 2024 16:23:31 -0400 Subject: [PATCH 1/2] Updated cesium ion to use the latest tag (v0.37.0) --- cmake/FindCesiumNative.cmake | 3 ++- src/osgEarthCesium/CesiumIon.cpp | 5 ++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/cmake/FindCesiumNative.cmake b/cmake/FindCesiumNative.cmake index 62c6f2c30f..307206f8e8 100644 --- a/cmake/FindCesiumNative.cmake +++ b/cmake/FindCesiumNative.cmake @@ -91,6 +91,7 @@ find_cesium_library(CESIUM_NATIVE_GLTF_READER CesiumGltfReader) find_cesium_library(CESIUM_NATIVE_ION_CLIENT CesiumIonClient) find_cesium_library(CESIUM_NATIVE_JSONREADER CesiumJsonReader) find_cesium_library(CESIUM_NATIVE_UTILITY CesiumUtility) +find_cesium_library(CESIUM_NATIVE_QUANTIZED_MESH_TERRAIN CesiumQuantizedMeshTerrain) find_cesium_library(CESIUM_NATIVE_RASTER_OVERLAYS CesiumRasterOverlays) find_cesium_library(CESIUM_NATIVE_3DTILES_CONTENT Cesium3DTilesContent) @@ -98,7 +99,7 @@ find_cesium_library(CESIUM_NATIVE_GLTF_CONTENT CesiumGltfContent) find_cesium_library(CESIUM_NATIVE_CSPRNG csprng) find_cesium_library(CESIUM_NATIVE_DRACO draco) -find_cesium_library(CESIUM_NATIVE_KTX_READ ktx_read) +find_cesium_library(CESIUM_NATIVE_KTX ktx) find_cesium_library(CESIUM_NATIVE_MODPB64 modp_b64) find_cesium_library(CESIUM_NATIVE_S2GEOMETRY s2geometry) find_cesium_library(CESIUM_NATIVE_SPDLOG spdlog) diff --git a/src/osgEarthCesium/CesiumIon.cpp b/src/osgEarthCesium/CesiumIon.cpp index e065b64a2b..59d11d7090 100644 --- a/src/osgEarthCesium/CesiumIon.cpp +++ b/src/osgEarthCesium/CesiumIon.cpp @@ -36,7 +36,10 @@ CesiumIon::CesiumIon() void CesiumIon::refresh() { - Connection connection(Context::instance().asyncSystem, Context::instance().assetAccessor, getCesiumIonKey()); + ApplicationData data; + data.authenticationMode = AuthenticationMode::SingleUser; + + Connection connection(Context::instance().asyncSystem, Context::instance().assetAccessor, getCesiumIonKey(), data); bool loaded = false; From 73f287672cfcd9133631a78566c8a542d06523ef Mon Sep 17 00:00:00 2001 From: Jason Beverage Date: Wed, 31 Jul 2024 11:24:34 -0400 Subject: [PATCH 2/2] Fixed hsl color parsing. Hue is in the range 0-360, not 0-255 --- src/osgEarth/Color.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/osgEarth/Color.cpp b/src/osgEarth/Color.cpp index ff87dbe47d..ffbed1a26a 100644 --- a/src/osgEarth/Color.cpp +++ b/src/osgEarth/Color.cpp @@ -231,7 +231,7 @@ Color::Color( const std::string& input, Format format ) { L = osgEarth::as(components[2], 0.0f); } - osg::Vec4 c(H / 255.0f, S / 100.0f, L / 100.0f, 1.0f); + osg::Vec4 c(H / 360.0f, S / 100.0f, L / 100.0f, 1.0f); hsl2rgb(c); set(c.r(), c.g(), c.b(), c.a()); }