Merge pull request #524 from CesiumGS/update-native

Update cesium-native to latest
CesiumGS · Nov 1, 2024 · ef010b3 · ef010b3
2 parents a023792 + 9598636
commit ef010b3
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 11 deletions.
diff --git a/native~/Editor/src/CesiumIonSessionImpl.cpp b/native~/Editor/src/CesiumIonSessionImpl.cpp
@@ -4,6 +4,7 @@
 #include "UnityExternals.h"
 #include "UnityTaskProcessor.h"
 
+#include <CesiumAsync/AsyncSystem.h>
 #include <CesiumUtility/Uri.h>
 
 #include <DotNet/CesiumForUnity/CesiumIonServer.h>

diff --git a/native~/Editor/src/UnityExternals.cpp b/native~/Editor/src/UnityExternals.cpp
@@ -3,6 +3,7 @@
 #include "UnityAssetAccessor.h"
 #include "UnityTaskProcessor.h"
 
+#include <CesiumAsync/AsyncSystem.h>
 #include <CesiumAsync/CachingAssetAccessor.h>
 #include <CesiumAsync/GunzipAssetAccessor.h>
 #include <CesiumAsync/SqliteCache.h>

diff --git a/native~/Runtime/src/TestGltfModelImpl.cpp b/native~/Runtime/src/TestGltfModelImpl.cpp
@@ -87,15 +87,15 @@ TestGltfModelImpl::AddFeatureIdTexture(
 
   // Copy feature IDs to texture.
   CesiumGltf::Image& image = this->_nativeModel.images.emplace_back();
-  image.pCesium.emplace();
-  image.pCesium->width = 2;
-  image.pCesium->height = 2;
-  image.pCesium->bytesPerChannel = 1;
-  image.pCesium->channels = 2;
-  image.pCesium->pixelData.resize(featureIdsLength * sizeof(std::uint16_t));
+  image.pAsset.emplace();
+  image.pAsset->width = 2;
+  image.pAsset->height = 2;
+  image.pAsset->bytesPerChannel = 1;
+  image.pAsset->channels = 2;
+  image.pAsset->pixelData.resize(featureIdsLength * sizeof(std::uint16_t));
 
   std::uint16_t* pFeatureId =
-      reinterpret_cast<std::uint16_t*>(image.pCesium->pixelData.data());
+      reinterpret_cast<std::uint16_t*>(image.pAsset->pixelData.data());
   for (int32_t i = 0; i < featureIdsLength; i++) {
     *pFeatureId = featureIds[i];
     pFeatureId++;

diff --git a/native~/Runtime/src/TextureLoader.cpp b/native~/Runtime/src/TextureLoader.cpp
@@ -144,7 +144,7 @@ UnityEngine::Texture TextureLoader::loadTexture(
     return UnityEngine::Texture(nullptr);
   }
 
-  const ImageAsset& imageCesium = *pImage->pCesium;
+  const ImageAsset& imageCesium = *pImage->pAsset;
   UnityEngine::Texture unityTexture = loadTexture(imageCesium, sRGB);
 
   const Sampler* pSampler = Model::getSafe(&model.samplers, texture.sampler);

diff --git a/native~/Runtime/src/UnityPrepareRendererResources.cpp b/native~/Runtime/src/UnityPrepareRendererResources.cpp
@@ -274,7 +274,7 @@ void generateMipMaps(
         case CesiumGltf::Sampler::MinFilter::LINEAR_MIPMAP_NEAREST:
         case CesiumGltf::Sampler::MinFilter::NEAREST_MIPMAP_LINEAR:
         case CesiumGltf::Sampler::MinFilter::NEAREST_MIPMAP_NEAREST:
-          CesiumGltfReader::GltfReader::generateMipMaps(*pImage->pCesium);
+          CesiumGltfReader::ImageDecoder::generateMipMaps(*pImage->pAsset);
         }
       }
     }
@@ -1724,7 +1724,7 @@ void UnityPrepareRendererResources::free(
 void* UnityPrepareRendererResources::prepareRasterInLoadThread(
     CesiumGltf::ImageAsset& image,
     const std::any& rendererOptions) {
-  CesiumGltfReader::GltfReader::generateMipMaps(image);
+  CesiumGltfReader::ImageDecoder::generateMipMaps(image);
   return nullptr;
 }
 

diff --git a/native~/Runtime/src/UnityTilesetExternals.cpp b/native~/Runtime/src/UnityTilesetExternals.cpp
@@ -4,6 +4,7 @@
 #include "UnityPrepareRendererResources.h"
 #include "UnityTaskProcessor.h"
 
+#include <CesiumAsync/AsyncSystem.h>
 #include <CesiumAsync/CachingAssetAccessor.h>
 #include <CesiumAsync/GunzipAssetAccessor.h>
 #include <CesiumAsync/SqliteCache.h>

diff --git a/native~/Shared/src/UnityAssetAccessor.cpp b/native~/Shared/src/UnityAssetAccessor.cpp
@@ -2,6 +2,7 @@
 
 #include "Cesium.h"
 
+#include <CesiumAsync/AsyncSystem.h>
 #include <CesiumAsync/IAssetResponse.h>
 #include <CesiumUtility/ScopeGuard.h>
 

diff --git a/native~/extern/cesium-native b/native~/extern/cesium-native