Merge branch 'master' of github.com:gwaldron/osgearth

gwaldron · Aug 2, 2024 · ecff31f · ecff31f
2 parents e9678bf + 73f2876
commit ecff31f
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/cmake/FindCesiumNative.cmake b/cmake/FindCesiumNative.cmake
@@ -91,14 +91,15 @@ 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)
 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/osgEarth/Color.cpp b/src/osgEarth/Color.cpp
@@ -231,7 +231,7 @@ Color::Color( const std::string& input, Format format )
             {
                 L = osgEarth::as<float>(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());
         }

diff --git 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;